Vendor import of clang trunk r178860:

http://llvm.org/svn/llvm-project/cfe/trunk@178860

2 files changed, 8 insertions, 0 deletions

diff --git a/test/ASTMerge/Inputs/class1.cpp b/test/ASTMerge/Inputs/class1.cpp
index b600cdb..0cd6565 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
+};
diff --git a/test/ASTMerge/Inputs/class2.cpp b/test/ASTMerge/Inputs/class2.cpp
index fa38916..5d5d9ca 100644
--- a/test/ASTMerge/Inputs/class2.cpp
+++ b/test/ASTMerge/Inputs/class2.cpp
@@ -7,3 +7,7 @@ struct B : A {
   int foo();
 };
 
+enum E {
+  a = 0,
+  b = 1
+};