diff options
author | Craig Topper <craig.topper@gmail.com> | 2014-05-26 06:21:51 +0000 |
---|---|---|
committer | Craig Topper <craig.topper@gmail.com> | 2014-05-26 06:21:51 +0000 |
commit | 236bde3d6f589dd7011d052aea4d98f610efb419 (patch) | |
tree | 6a248cd452e96b3ebb6aa60d59f9f97dae5eba8c /clang/lib/Index | |
parent | ab53c91010dc8056986ad7f53e6c9dff037f4e8f (diff) | |
download | bcm5719-llvm-236bde3d6f589dd7011d052aea4d98f610efb419.tar.gz bcm5719-llvm-236bde3d6f589dd7011d052aea4d98f610efb419.zip |
[C++11] Use 'nullptr'.
llvm-svn: 209612
Diffstat (limited to 'clang/lib/Index')
-rw-r--r-- | clang/lib/Index/CommentToXML.cpp | 4 | ||||
-rw-r--r-- | clang/lib/Index/SimpleFormatContext.h | 2 | ||||
-rw-r--r-- | clang/lib/Index/USRGeneration.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Index/CommentToXML.cpp b/clang/lib/Index/CommentToXML.cpp index 891ce8109f9..a67c806550d 100644 --- a/clang/lib/Index/CommentToXML.cpp +++ b/clang/lib/Index/CommentToXML.cpp @@ -97,7 +97,7 @@ struct FullCommentParts { FullCommentParts::FullCommentParts(const FullComment *C, const CommandTraits &Traits) : - Brief(NULL), Headerfile(NULL), FirstParagraph(NULL) { + Brief(nullptr), Headerfile(nullptr), FirstParagraph(nullptr) { for (Comment::child_iterator I = C->child_begin(), E = C->child_end(); I != E; ++I) { const Comment *Child = *I; @@ -1150,7 +1150,7 @@ void CommentToXMLConverter::convertCommentToHTML(const FullComment *FC, void CommentToXMLConverter::convertHTMLTagNodeToText( const comments::HTMLTagComment *HTC, SmallVectorImpl<char> &Text, const ASTContext &Context) { - CommentASTToHTMLConverter Converter(0, Text, + CommentASTToHTMLConverter Converter(nullptr, Text, Context.getCommentCommandTraits()); Converter.visit(HTC); } diff --git a/clang/lib/Index/SimpleFormatContext.h b/clang/lib/Index/SimpleFormatContext.h index 99d0d9a1cee..147323a7105 100644 --- a/clang/lib/Index/SimpleFormatContext.h +++ b/clang/lib/Index/SimpleFormatContext.h @@ -52,7 +52,7 @@ public: const FileEntry *Entry = Files.getVirtualFile(Name, Source->getBufferSize(), 0); Sources.overrideFileContents(Entry, Source); - assert(Entry != NULL); + assert(Entry != nullptr); return Sources.createFileID(Entry, SourceLocation(), SrcMgr::C_User); } diff --git a/clang/lib/Index/USRGeneration.cpp b/clang/lib/Index/USRGeneration.cpp index 15aa87555e0..7554bc65b2f 100644 --- a/clang/lib/Index/USRGeneration.cpp +++ b/clang/lib/Index/USRGeneration.cpp @@ -109,7 +109,7 @@ public: bool ShouldGenerateLocation(const NamedDecl *D); bool isLocal(const NamedDecl *D) { - return D->getParentFunctionOrMethod() != 0; + return D->getParentFunctionOrMethod() != nullptr; } /// Generate the string component containing the location of the |