diff options
| author | Gabor Marton <martongabesz@gmail.com> | 2018-06-25 16:25:30 +0000 |
|---|---|---|
| committer | Gabor Marton <martongabesz@gmail.com> | 2018-06-25 16:25:30 +0000 |
| commit | 16023f43d7cff4fc772ca70c11a95f33506dd945 (patch) | |
| tree | fc42f1c175e5927179ef564bac8bd545e01ce6b3 /clang/test/ASTMerge | |
| parent | 8659d7da37a7cf93bd8128fa91e36496a3f07014 (diff) | |
Revert "[ASTImporter] Import the whole redecl chain of functions"
This reverts commit r335480.
Diffstat (limited to 'clang/test/ASTMerge')
| -rw-r--r-- | clang/test/ASTMerge/class/test.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clang/test/ASTMerge/class/test.cpp b/clang/test/ASTMerge/class/test.cpp index ba553af4072..99926b649bc 100644 --- a/clang/test/ASTMerge/class/test.cpp +++ b/clang/test/ASTMerge/class/test.cpp @@ -13,12 +13,12 @@ // CHECK: class1.cpp:19:3: note: enumerator 'b' with value 1 here // CHECK: class2.cpp:12:3: note: enumerator 'a' with value 0 here -// CHECK: class1.cpp:43:8: warning: type 'F3' has incompatible definitions in different translation units -// CHECK: class1.cpp:46:3: note: friend declared here -// CHECK: class2.cpp:36:8: note: no corresponding friend here - // CHECK: class1.cpp:36:8: warning: type 'F2' has incompatible definitions in different translation units // CHECK: class1.cpp:39:3: note: friend declared here // CHECK: class2.cpp:30:8: note: no corresponding friend here +// CHECK: class1.cpp:43:8: warning: type 'F3' has incompatible definitions in different translation units +// CHECK: class1.cpp:46:3: note: friend declared here +// CHECK: class2.cpp:36:8: note: no corresponding friend here + // CHECK: 4 warnings generated. |