r232623 - Fix gcc ambiguity error (Visual C++ was OK with these).

Yaron Keren yaron.keren at gmail.com
Wed Mar 18 03:26:22 PDT 2015


Author: yrnkrn
Date: Wed Mar 18 05:26:22 2015
New Revision: 232623

URL: http://llvm.org/viewvc/llvm-project?rev=232623&view=rev
Log:
Fix gcc ambiguity error (Visual C++ was OK with these).


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

Modified: cfe/trunk/lib/Sema/SemaStmt.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaStmt.cpp?rev=232623&r1=232622&r2=232623&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaStmt.cpp (original)
+++ cfe/trunk/lib/Sema/SemaStmt.cpp Wed Mar 18 05:26:22 2015
@@ -906,12 +906,12 @@ Sema::ActOnFinishSwitchStmt(SourceLocati
           if (PrevString == CurrString)
             Diag(CaseVals[i].second->getLHS()->getLocStart(),
                  diag::err_duplicate_case) <<
-                 (PrevString.empty() ? CaseValStr : PrevString);
+                 (PrevString.empty() ? StringRef(CaseValStr) : PrevString);
           else
             Diag(CaseVals[i].second->getLHS()->getLocStart(),
                  diag::err_duplicate_case_differing_expr) <<
-                 (PrevString.empty() ? CaseValStr : PrevString) <<
-                 (CurrString.empty() ? CaseValStr : CurrString) <<
+                 (PrevString.empty() ? StringRef(CaseValStr) : PrevString) <<
+                 (CurrString.empty() ? StringRef(CaseValStr) : CurrString) <<
                  CaseValStr;
 
           Diag(CaseVals[i-1].second->getLHS()->getLocStart(),





More information about the cfe-commits mailing list