commit d4612ad0f3e443c2a0fb8cf57cdb4a03ba546a96
author Ed Maste <emaste@freebsd.org> Sun Apr 20 13:17:36 2014 +0000
committer Ed Maste <emaste@freebsd.org> Sun Apr 20 13:17:36 2014 +0000
tree a1bfee39ae65a095b95a0b2ccb70e80418fa173a
parent 3a3ee3e3762a4fe0dbc084a6a3790377cee641e1

Switch NULL to C++11 nullptr in source/Symbol and source/Utility

Patch by Robert Matusewicz

llvm-svn: 206713

lldb/source/Symbol/ClangASTImporter.cpp

diff --git a/lldb/source/Symbol/ClangASTImporter.cpp b/lldb/source/Symbol/ClangASTImporter.cpp
index 1bf35f3..debd053 100644
--- a/lldb/source/Symbol/ClangASTImporter.cpp
+++ b/lldb/source/Symbol/ClangASTImporter.cpp
@@ -106,7 +106,7 @@
         return result;
     }
     
-    return NULL;
+    return nullptr;
 }
 
 lldb::clang_type_t
@@ -117,7 +117,7 @@
     MinionSP minion_sp (GetMinion (dst_ctx, src_ctx));
     
     if (!minion_sp)
-        return NULL;
+        return nullptr;
     
     std::set<NamedDecl *> decls_to_deport;
     std::set<NamedDecl *> decls_already_deported;
@@ -130,7 +130,7 @@
     minion_sp->ExecuteDeportWorkQueues();
     
     if (!result)
-        return NULL;
+        return nullptr;
     
     return result;
 
@@ -152,7 +152,7 @@
     MinionSP minion_sp (GetMinion (dst_ctx, src_ctx));
 
     if (!minion_sp)
-        return NULL;
+        return nullptr;
 
     std::set<NamedDecl *> decls_to_deport;
     std::set<NamedDecl *> decls_already_deported;
@@ -165,7 +165,7 @@
     minion_sp->ExecuteDeportWorkQueues();
 
     if (!result)
-        return NULL;
+        return nullptr;
 
     if (log)
         log->Printf("    [ClangASTImporter] DeportDecl deported (%sDecl*)%p to (%sDecl*)%p",
@@ -501,8 +501,8 @@
         to_context_md->m_origins.erase(decl);
     }
     
-    m_decls_to_deport = NULL;
-    m_decls_already_deported = NULL;
+    m_decls_to_deport = nullptr;
+    m_decls_already_deported = nullptr;
 }
 
 void
@@ -716,12 +716,12 @@
     ASTContextMetadataSP to_context_md = m_master.GetContextMetadata(&To->getASTContext());
     
     if (!to_context_md)
-        return NULL;
+        return nullptr;
     
     OriginMap::iterator iter = to_context_md->m_origins.find(To);
     
     if (iter == to_context_md->m_origins.end())
-        return NULL;
+        return nullptr;
     
     return const_cast<clang::Decl*>(iter->second.decl);
 }