summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex/PPExpressions.cpp
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2014-05-17 23:10:59 +0000
committerCraig Topper <craig.topper@gmail.com>2014-05-17 23:10:59 +0000
commitd2d442ca7385fe5c50f43c2731710ab1ac564ddb (patch)
treec942d260a048a2c5df5cc9f8ee62b2d34769d1c2 /clang/lib/Lex/PPExpressions.cpp
parentf3a5a5c54698150c264ddda39cb61a219184e5ae (diff)
downloadbcm5719-llvm-d2d442ca7385fe5c50f43c2731710ab1ac564ddb.tar.gz
bcm5719-llvm-d2d442ca7385fe5c50f43c2731710ab1ac564ddb.zip
[C++11] Use 'nullptr'. Lex edition.
llvm-svn: 209083
Diffstat (limited to 'clang/lib/Lex/PPExpressions.cpp')
-rw-r--r--clang/lib/Lex/PPExpressions.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/PPExpressions.cpp b/clang/lib/Lex/PPExpressions.cpp
index 6975d31baba..8be7a54f827 100644
--- a/clang/lib/Lex/PPExpressions.cpp
+++ b/clang/lib/Lex/PPExpressions.cpp
@@ -104,7 +104,7 @@ static bool EvaluateDefined(PPValue &Result, Token &PeekTok, DefinedTracker &DT,
}
// If we don't have a pp-identifier now, this is an error.
- if ((II = PeekTok.getIdentifierInfo()) == 0) {
+ if ((II = PeekTok.getIdentifierInfo()) == nullptr) {
PP.Diag(PeekTok, diag::err_pp_defined_requires_identifier);
return true;
}
@@ -113,7 +113,7 @@ static bool EvaluateDefined(PPValue &Result, Token &PeekTok, DefinedTracker &DT,
Result.Val = II->hasMacroDefinition();
Result.Val.setIsUnsigned(false); // Result is signed intmax_t.
- MacroDirective *Macro = 0;
+ MacroDirective *Macro = nullptr;
// If there is a macro, mark it used.
if (Result.Val != 0 && ValueLive) {
Macro = PP.getMacroDirective(II);
OpenPOWER on IntegriCloud