commit 822698412b63ad76242a4a3db6403212b56c9b23
author Richard Smith <richard-llvm@metafoo.co.uk> Fri Apr 13 04:07:40 2012 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Fri Apr 13 04:07:40 2012 +0000
tree 31febf1aebe112be667208134a275385a6fa5cb7
parent e83c731cad3009ba20d0d0d990789ab5de38d192

PR12500: Improve the wording of the diagnostic for a redefinition of a name
in the wrong namespace scope. Patch by Jonathan Sauer!

llvm-svn: 154656

clang/lib/Sema/SemaDecl.cpp

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index f54f0fd..8b314b5 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -3307,7 +3307,7 @@
         << Name << SS.getRange();
     else
       Diag(Loc, diag::err_invalid_declarator_scope)
-      << Name << cast<NamedDecl>(DC) << SS.getRange();
+      << Name << cast<NamedDecl>(Cur) << cast<NamedDecl>(DC) << SS.getRange();
     
     return true;
   }