diff options
author | Craig Topper <craig.topper@gmail.com> | 2014-05-08 06:41:40 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2014-05-08 06:41:40 +0000 |
commit | f1186c5a8f504efce819a38cec02ba3b12fe5df0 (patch) | |
tree | ee4a75d711caeefe426501affec89172f4d40c00 /clang/lib/Basic/Diagnostic.cpp | |
parent | 0120ce8c9f8511733e68092861e23b6a51bdfb3a (diff) | |
download | bcm5719-llvm-f1186c5a8f504efce819a38cec02ba3b12fe5df0.tar.gz bcm5719-llvm-f1186c5a8f504efce819a38cec02ba3b12fe5df0.zip |
[C++11] Use 'nullptr'.
llvm-svn: 208280
Diffstat (limited to 'clang/lib/Basic/Diagnostic.cpp')
-rw-r--r-- | clang/lib/Basic/Diagnostic.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Basic/Diagnostic.cpp b/clang/lib/Basic/Diagnostic.cpp index f50754830fd..8cef9d5b19a 100644 --- a/clang/lib/Basic/Diagnostic.cpp +++ b/clang/lib/Basic/Diagnostic.cpp @@ -41,9 +41,9 @@ DiagnosticsEngine::DiagnosticsEngine( DiagnosticOptions *DiagOpts, DiagnosticConsumer *client, bool ShouldOwnClient) : Diags(diags), DiagOpts(DiagOpts), Client(client), - OwnsDiagClient(ShouldOwnClient), SourceMgr(0) { + OwnsDiagClient(ShouldOwnClient), SourceMgr(nullptr) { ArgToStringFn = DummyArgToStringFn; - ArgToStringCookie = 0; + ArgToStringCookie = nullptr; AllExtensionsSilenced = 0; IgnoreAllWarnings = false; @@ -157,7 +157,7 @@ DiagnosticsEngine::GetDiagStatePointForLoc(SourceLocation L) const { if (LastStateChangePos.isValid() && Loc.isBeforeInTranslationUnitThan(LastStateChangePos)) Pos = std::upper_bound(DiagStatePoints.begin(), DiagStatePoints.end(), - DiagStatePoint(0, Loc)); + DiagStatePoint(nullptr, Loc)); --Pos; return Pos; } @@ -612,7 +612,7 @@ static const char *getTokenDescForDiagnostic(tok::TokenKind Kind) { case tok::identifier: return "identifier"; default: - return 0; + return nullptr; } } @@ -672,7 +672,7 @@ FormatDiagnostic(const char *DiagStr, const char *DiagEnd, // The digit is a number from 0-9 indicating which argument this comes from. // The modifier is a string of digits from the set [-a-z]+, arguments is a // brace enclosed string. - const char *Modifier = 0, *Argument = 0; + const char *Modifier = nullptr, *Argument = nullptr; unsigned ModifierLen = 0, ArgumentLen = 0; // Check to see if we have a modifier. If so eat it. |