summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/FormatToken.cpp
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2014-05-09 08:15:10 +0000
committerCraig Topper <craig.topper@gmail.com>2014-05-09 08:15:10 +0000
commit2145bc02291df82c182dedf38293c355c99ed869 (patch)
treed06e3d6ed185ee90afd7331f9a717fa48c28718b /clang/lib/Format/FormatToken.cpp
parent2fc43a38213ed8dce70ccf16244c9800e38eae41 (diff)
downloadbcm5719-llvm-2145bc02291df82c182dedf38293c355c99ed869.tar.gz
bcm5719-llvm-2145bc02291df82c182dedf38293c355c99ed869.zip
[C++11] Use 'nullptr'.
llvm-svn: 208392
Diffstat (limited to 'clang/lib/Format/FormatToken.cpp')
-rw-r--r--clang/lib/Format/FormatToken.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Format/FormatToken.cpp b/clang/lib/Format/FormatToken.cpp
index a7c003bc18a..5bc5acaebea 100644
--- a/clang/lib/Format/FormatToken.cpp
+++ b/clang/lib/Format/FormatToken.cpp
@@ -152,7 +152,7 @@ void CommaSeparatedList::precomputeFormattingInfos(const FormatToken *Token) {
MustBreakBeforeItem.push_back(ItemBegin->MustBreakBefore);
if (ItemBegin->is(tok::l_brace))
HasNestedBracedList = true;
- const FormatToken *ItemEnd = NULL;
+ const FormatToken *ItemEnd = nullptr;
if (i == Commas.size()) {
ItemEnd = Token->MatchingParen;
const FormatToken *NonCommentEnd = ItemEnd->getPreviousNonComment();
@@ -232,7 +232,7 @@ void CommaSeparatedList::precomputeFormattingInfos(const FormatToken *Token) {
const CommaSeparatedList::ColumnFormat *
CommaSeparatedList::getColumnFormat(unsigned RemainingCharacters) const {
- const ColumnFormat *BestFormat = NULL;
+ const ColumnFormat *BestFormat = nullptr;
for (SmallVector<ColumnFormat, 4>::const_reverse_iterator
I = Formats.rbegin(),
E = Formats.rend();
OpenPOWER on IntegriCloud