From 61e29aafa7a4609d53be92c258749377c5439320 Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Tue, 31 Jan 2017 08:24:40 +0000 Subject: Revert r293585 "Add better ODR checking for modules." We're seeing what we believe are false positives. (It's hard to tell with the available diagnostics, and I'm not sure how to reduce them yet). I'll send Richard reproduction details offline. djasper/chandlerc suggested this should be a warning for now, to make rolling it out feasible. llvm-svn: 293611 --- clang/test/Modules/merge-using-decls.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'clang/test/Modules/merge-using-decls.cpp') 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(); // 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' in module 'A'}} -// expected-error@b.h:* {{'D::value' from module 'B' is not present in definition of 'D' in module 'A'}} - - // expected-error@b.h:* {{'E::value' from module 'B' is not present in definition of 'E' in module 'A'}} // expected-error@b.h:* {{'E::v' from module 'B' is not present in definition of 'E' in module 'A'}} -- cgit v1.2.3