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

Unified Diff: tools/gn/input_file_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/input_conversion_unittest.cc ('k') | tools/gn/item.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/input_file_manager.cc
diff --git a/tools/gn/input_file_manager.cc b/tools/gn/input_file_manager.cc
index c9e03f69bed55435e98c9463727e261e79c6d968..b90a9f1bb2f38224423dbabb57c760f6810491d0 100644
--- a/tools/gn/input_file_manager.cc
+++ b/tools/gn/input_file_manager.cc
@@ -161,7 +161,7 @@ const ParseNode* InputFileManager::SyncLoadFile(
Err* err) {
base::AutoLock lock(lock_);
- InputFileData* data = NULL;
+ InputFileData* data = nullptr;
InputFileMap::iterator found = input_files_.find(file_name);
if (found == input_files_.end()) {
// Haven't seen this file yet, start loading right now.
@@ -171,7 +171,7 @@ const ParseNode* InputFileManager::SyncLoadFile(
base::AutoUnlock unlock(lock_);
if (!LoadFile(origin, build_settings, file_name, &data->file, err))
- return NULL;
+ return nullptr;
} else {
// This file has either been loaded or is pending loading.
data = found->second;
@@ -198,7 +198,7 @@ const ParseNode* InputFileManager::SyncLoadFile(
"synchronously.\nThis is a class 2 misdemeanor: a single input file "
"must be loaded the same way\neach time to avoid blowing my tiny, "
"tiny mind.");
- return NULL;
+ return nullptr;
}
if (!data->loaded) {
« no previous file with comments | « tools/gn/input_conversion_unittest.cc ('k') | tools/gn/item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698