summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2008-08-17 07:19:51 +0000
committerChris Lattner <sabre@nondot.org>2008-08-17 07:19:51 +0000
commit5d1cfa12296b0620ddf9ff259e3aa7a0b87ecfa9 (patch)
tree2c9a68c7398b49205b608dd5c6aebb1497b6e89c /clang/lib/Lex
parent17f7165f849c17004b37b6db02b91d80cecb1855 (diff)
downloadbcm5719-llvm-5d1cfa12296b0620ddf9ff259e3aa7a0b87ecfa9.tar.gz
bcm5719-llvm-5d1cfa12296b0620ddf9ff259e3aa7a0b87ecfa9.zip
various updates to match r54873 on mainline.
llvm-svn: 54874
Diffstat (limited to 'clang/lib/Lex')
-rw-r--r--clang/lib/Lex/PPExpressions.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/lib/Lex/PPExpressions.cpp b/clang/lib/Lex/PPExpressions.cpp
index c0499fac141..4042604391c 100644
--- a/clang/lib/Lex/PPExpressions.cpp
+++ b/clang/lib/Lex/PPExpressions.cpp
@@ -470,11 +470,13 @@ static bool EvaluateDirectiveSubExpr(PPValue &LHS, unsigned MinPrec,
if (ValueLive && Res.isUnsigned()) {
if (!LHS.isUnsigned() && LHS.Val.isNegative())
PP.Diag(OpLoc, diag::warn_pp_convert_lhs_to_positive,
- LHS.Val.toStringSigned() + " to "+LHS.Val.toStringUnsigned(),
+ LHS.Val.toString(10, true) + " to " +
+ LHS.Val.toString(10, false),
LHS.getRange(), RHS.getRange());
if (!RHS.isUnsigned() && RHS.Val.isNegative())
PP.Diag(OpLoc, diag::warn_pp_convert_rhs_to_positive,
- RHS.Val.toStringSigned() + " to "+RHS.Val.toStringUnsigned(),
+ RHS.Val.toString(10, true) + " to " +
+ RHS.Val.toString(10, false),
LHS.getRange(), RHS.getRange());
}
LHS.Val.setIsUnsigned(Res.isUnsigned());
OpenPOWER on IntegriCloud