summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorYaron Keren <yaron.keren@gmail.com>2015-03-18 10:26:22 +0000
committerYaron Keren <yaron.keren@gmail.com>2015-03-18 10:26:22 +0000
commit49c63695c09b25de00a8b18f106a04487a2c5661 (patch)
treeadbdb16d836433b63921bdbb6ba8c0bdf1a9e47b /clang/lib
parent92e1b62d45aa5a3cbd67eaf5903165d7d8efeada (diff)
downloadbcm5719-llvm-49c63695c09b25de00a8b18f106a04487a2c5661.tar.gz
bcm5719-llvm-49c63695c09b25de00a8b18f106a04487a2c5661.zip
Fix gcc ambiguity error (Visual C++ was OK with these).
llvm-svn: 232623
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/SemaStmt.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Sema/SemaStmt.cpp b/clang/lib/Sema/SemaStmt.cpp
index 3140090c7be..f923f61ce61 100644
--- a/clang/lib/Sema/SemaStmt.cpp
+++ b/clang/lib/Sema/SemaStmt.cpp
@@ -906,12 +906,12 @@ Sema::ActOnFinishSwitchStmt(SourceLocation SwitchLoc, Stmt *Switch,
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(),
OpenPOWER on IntegriCloud