From c86b984ea8ecb3e944dc3de48539f4c1f65851ea Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 18 Jan 2015 16:23:48 +0000 Subject: Vendor import of clang RELEASE_360/rc1 tag r226102 (effectively, 3.6.0 RC1): https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc1@226102 --- test/SemaCXX/namespace-alias.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/SemaCXX/namespace-alias.cpp') diff --git a/test/SemaCXX/namespace-alias.cpp b/test/SemaCXX/namespace-alias.cpp index e18b58b..63615ec 100644 --- a/test/SemaCXX/namespace-alias.cpp +++ b/test/SemaCXX/namespace-alias.cpp @@ -35,12 +35,12 @@ namespace H { namespace A2 { } // These all point to A1. - namespace B = A1; // expected-note {{previous definition is here}} + namespace B = A1; namespace B = A1; namespace C = B; - namespace B = C; + namespace B = C; // expected-note {{previously defined as an alias for 'A1'}} - namespace B = A2; // expected-error {{redefinition of 'B' as different kind of symbol}} + namespace B = A2; // expected-error {{redefinition of 'B' as an alias for a different namespace}} } namespace I { -- cgit v1.1