Small style changes.

googletest/src/gtest-port.cc

@@ -306,7 +306,7 @@ namespace {
 //
 class MemoryIsNotDeallocated
 {
-public:
+ public:
   MemoryIsNotDeallocated() : old_crtdbg_flag_(0) {
 #ifdef _MSC_VER
     old_crtdbg_flag_ = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
@@ -323,7 +323,7 @@ public:
 #endif  //  _MSC_VER
   }
 
-private:
+ private:
   int old_crtdbg_flag_;
 
   GTEST_DISALLOW_COPY_AND_ASSIGN_(MemoryIsNotDeallocated);
@@ -584,17 +584,11 @@ class ThreadLocalRegistryImpl {
     return 0;
   }
 
-  // Return a newly constructed ThreadIdToThreadLocals that's intentionally never deleted
-  static ThreadIdToThreadLocals* NewThreadIdToThreadLocals() {
-    // Use RAII to flag that following mem alloc is never deallocated.
-    MemoryIsNotDeallocated memory_is_not_deallocated;
-    return new ThreadIdToThreadLocals;
-  }
-
   // Returns map of thread local instances.
   static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() {
     mutex_.AssertHeld();
-    static ThreadIdToThreadLocals* map = NewThreadIdToThreadLocals();
+    MemoryIsNotDeallocated memory_is_not_deallocated;
+    static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals();
     return map;
   }