diff options
author | Richard Trieu <rtrieu@google.com> | 2017-02-17 07:19:24 +0000 |
---|---|---|
committer | Richard Trieu <rtrieu@google.com> | 2017-02-17 07:19:24 +0000 |
commit | dc4cb02470d9046d9f11129c0e09fbf18a8b34ad (patch) | |
tree | 427b82b3ae548cb640e3945840f6b835a835d52b /clang/test/Modules/merge-using-decls.cpp | |
parent | cbd1b60e424454320f695adc48099a246cf556bc (diff) | |
download | bcm5719-llvm-dc4cb02470d9046d9f11129c0e09fbf18a8b34ad.tar.gz bcm5719-llvm-dc4cb02470d9046d9f11129c0e09fbf18a8b34ad.zip |
Revert r295421, new ODR checker for modules, to fix build bot.
llvm-svn: 295427
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'}} |