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

Unified Diff: tools/gn/loader.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/label_unittest.cc ('k') | tools/gn/location.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/gn/loader.cc
diff --git a/tools/gn/loader.cc b/tools/gn/loader.cc
index 628a08e719745f63176c8030c2aa0257c5b0cd17..847c27259deceeaa2a6105a9ef3df508e87eea27 100644
--- a/tools/gn/loader.cc
+++ b/tools/gn/loader.cc
@@ -191,14 +191,14 @@ const Settings* LoaderImpl::GetToolchainSettings(const Label& label) const {
ToolchainRecordMap::const_iterator found_toolchain;
if (label.is_null()) {
if (default_toolchain_label_.is_null())
- return NULL;
+ return nullptr;
found_toolchain = toolchain_records_.find(default_toolchain_label_);
} else {
found_toolchain = toolchain_records_.find(label);
}
if (found_toolchain == toolchain_records_.end())
- return NULL;
+ return nullptr;
return &found_toolchain->second->settings;
}
@@ -344,7 +344,7 @@ void LoaderImpl::DidLoadBuildConfig(const Label& label) {
// Do not return early, we must call DecrementPendingLoads() at the bottom.
ToolchainRecordMap::iterator found_toolchain = toolchain_records_.find(label);
- ToolchainRecord* record = NULL;
+ ToolchainRecord* record = nullptr;
if (found_toolchain == toolchain_records_.end()) {
// When loading the default build config, we'll insert it into the record
// map with an empty label since we don't yet know what to call it.
« no previous file with comments | « tools/gn/label_unittest.cc ('k') | tools/gn/location.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698