| 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.
|
|
|