summaryrefslogtreecommitdiff
path: root/test/SemaCXX/namespace-alias.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2014-09-03 23:11:22 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2014-09-03 23:11:22 +0000
commitc8c799318ef2bc679174eca23d34bcfe4aabe63d (patch)
treecd67455431c19cd3389f7c8055710df42c11a843 /test/SemaCXX/namespace-alias.cpp
parentbf6d49bed14689730ea752c8926bd65321cb5561 (diff)
downloadclang-c8c799318ef2bc679174eca23d34bcfe4aabe63d.tar.gz
[modules] Make NamespaceAliasDecl redeclarable, as it should be. This fixes
merging of namespace aliases across modules and improves source fidelity. Incidentally also fixes PR20816. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@217103 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/SemaCXX/namespace-alias.cpp')
-rw-r--r--test/SemaCXX/namespace-alias.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/SemaCXX/namespace-alias.cpp b/test/SemaCXX/namespace-alias.cpp
index e18b58b4d4..63615ecbd3 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 {