aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Redl <sebastian.redl@getdesigned.at>2010-01-26 18:52:33 +0000
committerSebastian Redl <sebastian.redl@getdesigned.at>2010-01-26 18:52:33 +0000
commit78a527af9995e936c0fc7dc01a061810cabf4c31 (patch)
tree9dfba40e39c7a6020dd240ce960690b71b6dfec3
parent4da244c23d6093adbbbc41654aa5c5111b38f431 (diff)
Fix two redefinitions in test cases that weren't diagnosed yet, but will be soon.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@94565 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp2
-rw-r--r--test/SemaCXX/nested-name-spec.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp b/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp
index 76b6e2b574..8126d28562 100644
--- a/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp
+++ b/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp
@@ -15,4 +15,4 @@ namespace A {
}
class Ident<int> GlobalIdent;
-union Ident<int> GlobalIdent; // expected-error {{ tag type that does not match }}
+union Ident<int> GlobalIdent2; // expected-error {{ tag type that does not match }}
diff --git a/test/SemaCXX/nested-name-spec.cpp b/test/SemaCXX/nested-name-spec.cpp
index 8618f0339b..dbbf1fecc9 100644
--- a/test/SemaCXX/nested-name-spec.cpp
+++ b/test/SemaCXX/nested-name-spec.cpp
@@ -212,7 +212,7 @@ namespace test1 {
// non-lexical scope.
namespace test2 {
namespace ns {
- int *count_ptr;
+ extern int *count_ptr;
}
namespace {
int count = 0;