[cfe-commits] r130010 - /cfe/trunk/lib/Sema/SemaDecl.cpp

[Francois Pichet]

Author: fpichet
Date: Fri Apr 22 14:50:06 2011
New Revision: 130010

URL: http://llvm.org/viewvc/llvm-project?rev=130010&view=rev
Log:
Do not return true from MergeFunctionDecl for a warn_static_non_static warning in Microsoft mode.

Modified:
    cfe/trunk/lib/Sema/SemaDecl.cpp

Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=130010&r1=130009&r2=130010&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Fri Apr 22 14:50:06 2011
@@ -1258,12 +1258,14 @@
       New->getStorageClass() == SC_Static &&
       Old->getStorageClass() != SC_Static &&
       !canRedefineFunction(Old, getLangOptions())) {
-    unsigned DiagID = diag::err_static_non_static;
-    if (getLangOptions().Microsoft)
-      DiagID = diag::warn_static_non_static;
-    Diag(New->getLocation(), DiagID) << New;
-    Diag(Old->getLocation(), PrevDiag);
-    return true;
+    if (getLangOptions().Microsoft) {
+      Diag(New->getLocation(), diag::warn_static_non_static) << New;
+      Diag(Old->getLocation(), PrevDiag);
+    } else {
+      Diag(New->getLocation(), diag::err_static_non_static) << New;
+      Diag(Old->getLocation(), PrevDiag);
+      return true;
+    }
   }
 
   // If a function is first declared with a calling convention, but is