summaryrefslogtreecommitdiffstats
path: root/clang
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
commit497c0a418d6fbafea7317f01c700d7d210cf981c (patch)
tree9cd8df18b44598ebd2d02326b0aa55ba3a7f9130 /clang
parenta0f99ff2308e5d91d37562e04fd66fd1765843d3 (diff)
downloadbcm5719-llvm-497c0a418d6fbafea7317f01c700d7d210cf981c.tar.gz
bcm5719-llvm-497c0a418d6fbafea7317f01c700d7d210cf981c.zip
Fix two redefinitions in test cases that weren't diagnosed yet, but will be soon.
llvm-svn: 94565
Diffstat (limited to 'clang')
-rw-r--r--clang/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp2
-rw-r--r--clang/test/SemaCXX/nested-name-spec.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp b/clang/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp
index 76b6e2b5746..8126d28562a 100644
--- a/clang/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp
+++ b/clang/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/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp
index 8618f0339bc..dbbf1fecc9f 100644
--- a/clang/test/SemaCXX/nested-name-spec.cpp
+++ b/clang/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;
OpenPOWER on IntegriCloud