aboutsummaryrefslogtreecommitdiff
path: root/test/ASTMerge/Inputs/class1.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2012-12-20 02:22:15 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2012-12-20 02:22:15 +0000
commit5b9268f26ac53a74d2c504279fe577d988d5615d (patch)
tree5e408834de6e2933211c24bba04b91aacca2a551 /test/ASTMerge/Inputs/class1.cpp
parent88d158c631c4c08831855f601990f36f2234f975 (diff)
Fix code that attempted to produce a diagnostic with one DiagnosticEngine, then
produce a note for that diagnostic either with a different DiagnosticEngine or after calling DiagnosticEngine::Reset(). That didn't make any sense, and did the wrong thing if the original diagnostic was suppressed. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170636 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/ASTMerge/Inputs/class1.cpp')
-rw-r--r--test/ASTMerge/Inputs/class1.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/ASTMerge/Inputs/class1.cpp b/test/ASTMerge/Inputs/class1.cpp
index b600cdb1fc..0cd6565f1a 100644
--- a/test/ASTMerge/Inputs/class1.cpp
+++ b/test/ASTMerge/Inputs/class1.cpp
@@ -13,3 +13,7 @@ struct C {
C &operator=(C&);
~C();
};
+
+enum E {
+ b = 1
+};