commit 49c63695c09b25de00a8b18f106a04487a2c5661
author Yaron Keren <yaron.keren@gmail.com> Wed Mar 18 10:26:22 2015 +0000
committer Yaron Keren <yaron.keren@gmail.com> Wed Mar 18 10:26:22 2015 +0000
tree adbdb16d836433b63921bdbb6ba8c0bdf1a9e47b
parent 92e1b62d45aa5a3cbd67eaf5903165d7d8efeada

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

llvm-svn: 232623

clang/lib/Sema/SemaStmt.cpp

diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 3140090..f923f61 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -906,12 +906,12 @@
           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(),