Make some global pointers const void* const.

tools/gn/loader.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "tools/gn/loader.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "tools/gn/build_settings.h"
@@ skipping 61 matching lines @@
   Settings settings;
 
   bool is_toolchain_loaded;
   bool is_config_loaded;
 
   std::vector<SourceFileAndOrigin> waiting_on_me;
 };
 
 // -----------------------------------------------------------------------------
 
-const void* Loader::kDefaultToolchainKey = &kDefaultToolchainKey;
+const void* const Loader::kDefaultToolchainKey = &kDefaultToolchainKey;
 
 Loader::Loader() {
 }
 
 Loader::~Loader() {
 }
 
 void Loader::Load(const Label& label, const LocationRange& origin) {
   Load(BuildFileForLabel(label), origin, label.GetToolchainLabel());
 }
@@ skipping 250 matching lines @@
   // Do not return early, we must call DecrementPendingLoads() at the bottom.
 
   ToolchainRecordMap::iterator found_toolchain = toolchain_records_.find(label);
   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.
     //
     // In this case, we should have exactly one entry in the map with an empty
     // label. We now need to fix up the naming so it refers to the "real" one.
-    CHECK(toolchain_records_.size() == 1);
+    CHECK_EQ(1U, toolchain_records_.size());
     ToolchainRecordMap::iterator empty_label = toolchain_records_.find(Label());
     CHECK(empty_label != toolchain_records_.end());
 
     // Fix up the toolchain record.
     record = empty_label->second;
     toolchain_records_[label] = record;
     toolchain_records_.erase(empty_label);
 
     // Save the default toolchain label.
     default_toolchain_label_ = label;
@@ skipping 27 matching lines @@
 
   // Schedule all waiting file loads.
   for (const auto& waiting : record->waiting_on_me)
     ScheduleLoadFile(&record->settings, waiting.origin, waiting.file);
   record->waiting_on_me.clear();
 
   DecrementPendingLoads();
 }
 
 void LoaderImpl::DecrementPendingLoads() {
-  DCHECK(pending_loads_ > 0);
+  DCHECK_GT(pending_loads_, 0);
   pending_loads_--;
   if (pending_loads_ == 0 && !complete_callback_.is_null())
     complete_callback_.Run();
 }
 
 bool LoaderImpl::AsyncLoadFile(
     const LocationRange& origin,
     const BuildSettings* build_settings,
     const SourceFile& file_name,
     const base::Callback<void(const ParseNode*)>& callback,
     Err* err) {
   if (async_load_file_.is_null()) {
     return g_scheduler->input_file_manager()->AsyncLoadFile(
         origin, build_settings, file_name, callback, err);
   }
   return async_load_file_.Run(
       origin, build_settings, file_name, callback, err);
 }