diff options
author | Richard Trieu <rtrieu@google.com> | 2017-06-09 23:03:40 +0000 |
---|---|---|
committer | Richard Trieu <rtrieu@google.com> | 2017-06-09 23:03:40 +0000 |
commit | 4bd0ca0a2f7ed432d3135a37dbb89e67bf4beb78 (patch) | |
tree | 82b0f3ee9c80cdcaaedbd94ffd0e211a87fb435c /test/Modules | |
parent | 6feeb00acd06ed4183dc89e1264124d5daff6f94 (diff) |
Revert r305110 to fix buildbot
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@305130 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Modules')
-rw-r--r-- | test/Modules/odr_hash.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/test/Modules/odr_hash.cpp b/test/Modules/odr_hash.cpp index fb7005be25..a6a0b74743 100644 --- a/test/Modules/odr_hash.cpp +++ b/test/Modules/odr_hash.cpp @@ -900,24 +900,6 @@ S2 s2; #endif } -namespace TemplateArgument { -#if defined(FIRST) -template<typename> struct U1 {}; -struct S1 { - U1<int> u; -}; -#elif defined(SECOND) -template<typename> struct U1 {}; -struct S1 { - U1<double> u; -}; -#else -S1 s1; -// expected-error@first.h:* {{'TemplateArgument::S1::u' from module 'FirstModule' is not present in definition of 'TemplateArgument::S1' in module 'SecondModule'}} -// expected-note@second.h:* {{declaration of 'u' does not match}} -#endif -} - // Interesting cases that should not cause errors. struct S should not error // while struct T should error at the access specifier mismatch at the end. namespace AllDecls { |