Fix confusing naming of static class variables

webrtc/base/optional_unittest.cc

 /*
  *  Copyright 2015 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 10 matching lines @@
 namespace {
 
 // Class whose instances logs various method calls (constructor, destructor,
 // etc.). Each instance has a unique ID (a simple global sequence number) and
 // an origin ID. When a copy is made, the new object gets a fresh ID but copies
 // the origin ID from the original. When a new Logger is created from scratch,
 // it gets a fresh ID, and the origin ID is the same as the ID (default
 // constructor) or given as an argument (explicit constructor).
 class Logger {
  public:
-  Logger() : id_(next_id_++), origin_(id_) { Log("default constructor"); }
-  explicit Logger(int origin) : id_(next_id_++), origin_(origin) {
+  Logger() : id_(g_next_id++), origin_(id_) { Log("default constructor"); }
+  explicit Logger(int origin) : id_(g_next_id++), origin_(origin) {
     Log("explicit constructor");
   }
-  Logger(const Logger& other) : id_(next_id_++), origin_(other.origin_) {
+  Logger(const Logger& other) : id_(g_next_id++), origin_(other.origin_) {
     LogFrom("copy constructor", other);
   }
-  Logger(Logger&& other) : id_(next_id_++), origin_(other.origin_) {
+  Logger(Logger&& other) : id_(g_next_id++), origin_(other.origin_) {
     LogFrom("move constructor", other);
   }
   ~Logger() { Log("destructor"); }
   Logger& operator=(const Logger& other) {
     origin_ = other.origin_;
     LogFrom("operator= copy", other);
     return *this;
   }
   Logger& operator=(Logger&& other) {
     origin_ = other.origin_;
@@ skipping 10 matching lines @@
     return a.origin_ == b.origin_;
   }
   friend bool operator!=(const Logger& a, const Logger& b) {
     Log2("operator!=", a, b);
     return a.origin_ != b.origin_;
   }
   void Foo() { Log("Foo()"); }
   void Foo() const { Log("Foo() const"); }
   static rtc::scoped_ptr<std::vector<std::string>> Setup() {
     auto s = rtc_make_scoped_ptr(new std::vector<std::string>);
-    Logger::log_ = s.get();
-    Logger::next_id_ = 0;
+    g_log = s.get();
+    g_next_id = 0;
     return s;
   }
 
  private:
   int id_;
   int origin_;
-  static std::vector<std::string>* log_;
-  static int next_id_;
+  static std::vector<std::string>* g_log;
+  static int g_next_id;
   void Log(const char* msg) const {
     std::ostringstream oss;
     oss << id_ << ':' << origin_ << ". " << msg;
-    log_->push_back(oss.str());
+    g_log->push_back(oss.str());
   }
   void LogFrom(const char* msg, const Logger& other) const {
     std::ostringstream oss;
     oss << id_ << ':' << origin_ << ". " << msg << " (from " << other.id_ << ':'
         << other.origin_ << ")";
-    log_->push_back(oss.str());
+    g_log->push_back(oss.str());
   }
   static void Log2(const char* msg, const Logger& a, const Logger& b) {
     std::ostringstream oss;
     oss << msg << ' ' << a.id_ << ':' << a.origin_ << ", " << b.id_ << ':'
         << b.origin_;
-    log_->push_back(oss.str());
+    g_log->push_back(oss.str());
   }
 };
 
-std::vector<std::string>* Logger::log_ = nullptr;
-int Logger::next_id_ = 0;
+std::vector<std::string>* Logger::g_log = nullptr;
+int Logger::g_next_id = 0;
 
 // Append all the other args to the vector pointed to by the first arg.
 template <typename T>
 void VectorAppend(std::vector<T>* v) {}
 template <typename T, typename... Ts>
 void VectorAppend(std::vector<T>* v, const T& e, Ts... es) {
   v->push_back(e);
   VectorAppend(v, es...);
 }
 
@@ skipping 370 matching lines @@
               "4:17. copy constructor (from 0:17)", "5:5. default constructor",
               "6:6. default constructor", "7:7. default constructor", "---",
               "swap 2:42, 3:17", "swap 4:5, 5:17", "swap 6:7, 7:6", "---",
               "7:6. destructor", "6:7. destructor", "5:17. destructor",
               "4:5. destructor", "3:17. destructor", "2:42. destructor",
               "1:42. destructor", "0:17. destructor"),
             *log);
 }
 
 }  // namespace rtc