commit 497c0a418d6fbafea7317f01c700d7d210cf981c
author Sebastian Redl <sebastian.redl@getdesigned.at> Tue Jan 26 18:52:33 2010 +0000
committer Sebastian Redl <sebastian.redl@getdesigned.at> Tue Jan 26 18:52:33 2010 +0000
tree 9cd8df18b44598ebd2d02326b0aa55ba3a7f9130
parent a0f99ff2308e5d91d37562e04fd66fd1765843d3

Fix two redefinitions in test cases that weren't diagnosed yet, but will be soon.

llvm-svn: 94565

clang/test/CXX/basic/basic.lookup/basic.lookup.elab/templateid.cpp

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 76b6e2b..8126d28 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 @@
 }
 
 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 }}

clang/test/SemaCXX/nested-name-spec.cpp

diff --git a/clang/test/SemaCXX/nested-name-spec.cpp b/clang/test/SemaCXX/nested-name-spec.cpp
index 8618f03..dbbf1fe 100644
--- a/clang/test/SemaCXX/nested-name-spec.cpp
+++ b/clang/test/SemaCXX/nested-name-spec.cpp
@@ -212,7 +212,7 @@
 // non-lexical scope.
 namespace test2 {
   namespace ns {
-    int *count_ptr;
+    extern int *count_ptr;
   }
   namespace {
     int count = 0;