diff options
| author | Richard Trieu <rtrieu@google.com> | 2017-02-16 07:09:18 +0000 |
|---|---|---|
| committer | Richard Trieu <rtrieu@google.com> | 2017-02-16 07:09:18 +0000 |
| commit | e55fb7f6f1a926a4631e4c67d81d85dfc6f03e51 (patch) | |
| tree | 46a47832bd26f91057103ed443245f0718d61280 /clang/test/Modules/merge-using-decls.cpp | |
| parent | 4eb07e481eef6e36869d47d0ae5ba8f91f1879e1 (diff) | |
| download | bcm5719-llvm-e55fb7f6f1a926a4631e4c67d81d85dfc6f03e51.tar.gz bcm5719-llvm-e55fb7f6f1a926a4631e4c67d81d85dfc6f03e51.zip | |
Revert r295284: Add better ODR checking for modules.
Fix modules build bot.
llvm-svn: 295293
Diffstat (limited to 'clang/test/Modules/merge-using-decls.cpp')
| -rw-r--r-- | clang/test/Modules/merge-using-decls.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/clang/test/Modules/merge-using-decls.cpp b/clang/test/Modules/merge-using-decls.cpp index 4153d14207c..98989d12f98 100644 --- a/clang/test/Modules/merge-using-decls.cpp +++ b/clang/test/Modules/merge-using-decls.cpp @@ -37,10 +37,6 @@ template int UseAll<Y>(); // Here, we're instantiating the definition from 'A' and merging the definition // from 'B' into it. -// expected-error@b.h:* {{'D::type' from module 'B' is not present in definition of 'D<T>' in module 'A'}} -// expected-error@b.h:* {{'D::value' from module 'B' is not present in definition of 'D<T>' in module 'A'}} - - // expected-error@b.h:* {{'E::value' from module 'B' is not present in definition of 'E<T>' in module 'A'}} // expected-error@b.h:* {{'E::v' from module 'B' is not present in definition of 'E<T>' in module 'A'}} |
