diff options
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/ASTMerge/Inputs/class1.cpp | 3 | ||||
| -rw-r--r-- | clang/test/ASTMerge/Inputs/class2.cpp | 3 | ||||
| -rw-r--r-- | clang/test/ASTMerge/class.cpp | 12 |
3 files changed, 10 insertions, 8 deletions
diff --git a/clang/test/ASTMerge/Inputs/class1.cpp b/clang/test/ASTMerge/Inputs/class1.cpp index 0cd6565f1a9..b0a7645cfe6 100644 --- a/clang/test/ASTMerge/Inputs/class1.cpp +++ b/clang/test/ASTMerge/Inputs/class1.cpp @@ -1,5 +1,6 @@ struct A { - int x; + public: + int x; }; struct B : A { diff --git a/clang/test/ASTMerge/Inputs/class2.cpp b/clang/test/ASTMerge/Inputs/class2.cpp index 5d5d9ca2333..2bed6d775bc 100644 --- a/clang/test/ASTMerge/Inputs/class2.cpp +++ b/clang/test/ASTMerge/Inputs/class2.cpp @@ -1,5 +1,6 @@ struct A { - int x; + public: + int x; }; struct B : A { diff --git a/clang/test/ASTMerge/class.cpp b/clang/test/ASTMerge/class.cpp index 7b31187c469..a68a2d1d769 100644 --- a/clang/test/ASTMerge/class.cpp +++ b/clang/test/ASTMerge/class.cpp @@ -3,12 +3,12 @@ // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 | FileCheck %s // RUN: %clang_cc1 -ast-merge %t.1.ast -ast-merge %t.2.ast -fsyntax-only %s 2>&1 -Wno-odr -Werror -// CHECK: class1.cpp:5:8: warning: type 'B' has incompatible definitions in different translation units -// CHECK: class1.cpp:6:9: note: field 'y' has type 'float' here -// CHECK: class2.cpp:6:7: note: field 'y' has type 'int' here +// CHECK: class1.cpp:6:8: warning: type 'B' has incompatible definitions in different translation units +// CHECK: class1.cpp:7:9: note: field 'y' has type 'float' here +// CHECK: class2.cpp:7:7: note: field 'y' has type 'int' here // FIXME: we should also complain about mismatched types on the method -// CHECK: class1.cpp:17:6: warning: type 'E' has incompatible definitions in different translation units -// CHECK: class1.cpp:18:3: note: enumerator 'b' with value 1 here -// CHECK: class2.cpp:11:3: note: enumerator 'a' with value 0 here +// CHECK: class1.cpp:18:6: warning: type 'E' has incompatible definitions in different translation units +// CHECK: class1.cpp:19:3: note: enumerator 'b' with value 1 here +// CHECK: class2.cpp:12:3: note: enumerator 'a' with value 0 here |
