Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Unified Diff: tools/gn/import_manager.cc

Issue 798333005: tools/gn: Pass clang-modernize -use-nullptr over it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address Brett's review - revert some clang-format changes Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/gn/functions_unittest.cc ('k') | tools/gn/input_conversion_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/import_manager.cc
diff --git a/tools/gn/import_manager.cc b/tools/gn/import_manager.cc
index 842577cfb7ac87ab5f9fbbbaa02a9f01ed20324a..fa38de6891515385a5cfe393240a217f34ddf35e 100644
--- a/tools/gn/import_manager.cc
+++ b/tools/gn/import_manager.cc
@@ -20,7 +20,7 @@ Scope* UncachedImport(const Settings* settings,
const ParseNode* node = g_scheduler->input_file_manager()->SyncLoadFile(
node_for_err->GetRange(), settings->build_settings(), file, err);
if (!node)
- return NULL;
+ return nullptr;
const BlockNode* block = node->AsBlock();
CHECK(block);
@@ -35,7 +35,7 @@ Scope* UncachedImport(const Settings* settings,
scope->SetProcessingImport();
block->ExecuteBlockInScope(scope.get(), err);
if (err->has_error())
- return NULL;
+ return nullptr;
scope->ClearProcessingImport();
return scope.release();
@@ -56,7 +56,7 @@ bool ImportManager::DoImport(const SourceFile& file,
Err* err) {
// See if we have a cached import, but be careful to actually do the scope
// copying outside of the lock.
- const Scope* imported_scope = NULL;
+ const Scope* imported_scope = nullptr;
{
base::AutoLock lock(lock_);
ImportMap::const_iterator found = imports_.find(file);
« no previous file with comments | « tools/gn/functions_unittest.cc ('k') | tools/gn/input_conversion_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698