<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Feb 14, 2014 at 2:12 PM, David Blaikie <span dir="ltr"><<a href="mailto:dblaikie@gmail.com" target="_blank">dblaikie@gmail.com</a>></span> wrote:<br>

<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dblaikie<br>
Date: Fri Feb 14 16:12:54 2014<br>
New Revision: 201437<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=201437&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=201437&view=rev</a><br>
Log:<br>
Consistently print anonymous namespace names as "<anonymous namespace>"<br>
<br>
For some reason we have two bits of code handling this printing:<br>
<br>
lib/AST/Decl.cpp:        OS << "<anonymous namespace>";<br>
lib/AST/TypePrinter.cpp:      OS << "<anonymous namespace>::";<br>
<br>
it would be nice if we only had one...<br></blockquote><div><br></div><div>Sorry - forgot to squash this and the previous commit (r201436 to TypePrinter.cpp) into one before committing.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

<br>
Modified:<br>
    cfe/trunk/test/Modules/namespaces.cpp<br>
    cfe/trunk/test/SemaCXX/undefined-internal.cpp<br>
    cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp<br>
<br>
Modified: cfe/trunk/test/Modules/namespaces.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/namespaces.cpp?rev=201437&r1=201436&r2=201437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/namespaces.cpp?rev=201437&r1=201436&r2=201437&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/test/Modules/namespaces.cpp (original)<br>
+++ cfe/trunk/test/Modules/namespaces.cpp Fri Feb 14 16:12:54 2014<br>
@@ -69,8 +69,8 @@ void testMergedMerged() {<br>
 // Test merging when using anonymous namespaces, which does not<br>
 // actually perform any merging.<br>
 void testAnonymousNotMerged() {<br>
-  N11::consumeFoo(N11::getFoo()); // expected-error{{cannot initialize a parameter of type 'N11::<anonymous>::Foo *' with an rvalue of type 'N11::<anonymous>::Foo *'}}<br>
-  N12::consumeFoo(N12::getFoo()); // expected-error{{cannot initialize a parameter of type 'N12::<anonymous>::Foo *' with an rvalue of type 'N12::<anonymous>::Foo *'}}<br>
+  N11::consumeFoo(N11::getFoo()); // expected-error{{cannot initialize a parameter of type 'N11::<anonymous namespace>::Foo *' with an rvalue of type 'N11::<anonymous namespace>::Foo *'}}<br>


+  N12::consumeFoo(N12::getFoo()); // expected-error{{cannot initialize a parameter of type 'N12::<anonymous namespace>::Foo *' with an rvalue of type 'N12::<anonymous namespace>::Foo *'}}<br>


 }<br>
<br>
 // expected-note@Inputs/namespaces-right.h:60 {{passing argument to parameter here}}<br>
<br>
Modified: cfe/trunk/test/SemaCXX/undefined-internal.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/undefined-internal.cpp?rev=201437&r1=201436&r2=201437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/undefined-internal.cpp?rev=201437&r1=201436&r2=201437&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/test/SemaCXX/undefined-internal.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/undefined-internal.cpp Fri Feb 14 16:12:54 2014<br>
@@ -78,8 +78,8 @@ namespace test5 {<br>
   }<br>
<br>
   template <class N> struct B {<br>
-    static int var; // expected-warning {{variable 'test5::B<test5::<anonymous>::A>::var' has internal linkage but is not defined}}<br>
-    static void foo(); // expected-warning {{function 'test5::B<test5::<anonymous>::A>::foo' has internal linkage but is not defined}}<br>
+    static int var; // expected-warning {{variable 'test5::B<test5::<anonymous namespace>::A>::var' has internal linkage but is not defined}}<br>
+    static void foo(); // expected-warning {{function 'test5::B<test5::<anonymous namespace>::A>::foo' has internal linkage but is not defined}}<br>
   };<br>
<br>
   void test() {<br>
<br>
Modified: cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp?rev=201437&r1=201436&r2=201437&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp?rev=201437&r1=201436&r2=201437&view=diff</a><br>


==============================================================================<br>
--- cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp (original)<br>
+++ cfe/trunk/unittests/ASTMatchers/ASTMatchersTest.cpp Fri Feb 14 16:12:54 2014<br>
@@ -1038,7 +1038,7 @@ TEST(HasType, MatchesAsString) {<br>
   EXPECT_TRUE(matches("namespace ns { struct A {}; }  struct B { ns::A a; };",<br>
       fieldDecl(hasType(asString("ns::A")))));<br>
   EXPECT_TRUE(matches("namespace { struct A {}; }  struct B { A a; };",<br>
-      fieldDecl(hasType(asString("struct <anonymous>::A")))));<br>
+      fieldDecl(hasType(asString("struct <anonymous namespace>::A")))));<br>
 }<br>
<br>
 TEST(Matcher, OverloadedOperatorCall) {<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>