summaryrefslogtreecommitdiffstats
path: root/clang/test/Modules/Inputs/merge-decl-context
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-10-31 23:07:15 +0000
committerEric Fiselier <eric@efcs.ca>2016-10-31 23:07:15 +0000
commit525a3514479692be9704210f18f7ef9fa58758d9 (patch)
treeca165f53be155979863313cbac5d0adcd7e41da6 /clang/test/Modules/Inputs/merge-decl-context
parent51cbe13a3ff507a14ab8d27a0505c30b33af7073 (diff)
downloadbcm5719-llvm-525a3514479692be9704210f18f7ef9fa58758d9.tar.gz
bcm5719-llvm-525a3514479692be9704210f18f7ef9fa58758d9.zip
[modules] Mark deleted functions as implicitly inline to allow merging
Summary: When merging definitions with ModulesLocalVisibility enabled it's important to make deleted definitions implicitly inline, otherwise they'll be diagnosed as a redefinition. Reviewers: silvas, manmanren, rsmith Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D26143 llvm-svn: 285655
Diffstat (limited to 'clang/test/Modules/Inputs/merge-decl-context')
-rw-r--r--clang/test/Modules/Inputs/merge-decl-context/a.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/merge-decl-context/a.h b/clang/test/Modules/Inputs/merge-decl-context/a.h
index 7be90b1535d..a0b58a7d6dd 100644
--- a/clang/test/Modules/Inputs/merge-decl-context/a.h
+++ b/clang/test/Modules/Inputs/merge-decl-context/a.h
@@ -24,5 +24,6 @@ inline A<int> ff(int i) {
struct Aggregate {
int member;
};
+bool operator==(Aggregate, Aggregate) = delete;
#endif
OpenPOWER on IntegriCloud