commit ec9c942e45eb2b794d88fd1d0405486416d63d6c
author phoglund@webrtc.org <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jan 02 08:45:03 2013 +0000
committer phoglund@webrtc.org <phoglund@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Wed Jan 02 08:45:03 2013 +0000
tree 5ad264eeb225ebaa76a214b4aa3ea20986dd213e
parent a19d04e7076f92883af602d1fc5802234711f73e

Reformatted thread and static_instance.

BUG=
TEST=Trybots.

Review URL: https://webrtc-codereview.appspot.com/1006005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3324 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/system_wrappers/interface/static_instance.h

diff --git a/webrtc/system_wrappers/interface/static_instance.h b/webrtc/system_wrappers/interface/static_instance.h
index b670f96..dad9c52 100644
--- a/webrtc/system_wrappers/interface/static_instance.h
+++ b/webrtc/system_wrappers/interface/static_instance.h
@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_STATICINSTANCETEMPLATE_H_
-#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_STATICINSTANCETEMPLATE_H_
+#ifndef WEBRTC_SYSTEM_WRAPPERS_INTERFACE_STATIC_INSTANCE_H_
+#define WEBRTC_SYSTEM_WRAPPERS_INTERFACE_STATIC_INSTANCE_H_
 
 #include <assert.h>
 
-#include "critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #ifdef _WIN32
-#include "fix_interlocked_exchange_pointer_win.h"
+#include "webrtc/system_wrappers/interface/fix_interlocked_exchange_pointer_win.h"
 #endif
 
 namespace webrtc {
@@ -46,7 +46,7 @@
   // reclaimed by the OS and memory leak tools will not recognize memory
   // reachable from statics leaked so no noise is added by doing this.
   static CriticalSectionWrapper* crit_sect(
-      CriticalSectionWrapper::CreateCriticalSection());
+    CriticalSectionWrapper::CreateCriticalSection());
   CriticalSectionScoped lock(crit_sect);
 
   if (count_operation ==
@@ -116,8 +116,8 @@
       }
     }
   } else {
-    int newValue = InterlockedDecrement(&instance_count);
-    if (newValue == 0) {
+    int new_value = InterlockedDecrement(&instance_count);
+    if (new_value == 0) {
       state = kDestroy;
     }
   }
@@ -128,7 +128,7 @@
     // local copy.
     T* new_instance = T::CreateInstance();
     if (1 == InterlockedIncrement(&instance_count)) {
-      InterlockedExchangePointer(reinterpret_cast<void* volatile*>(&instance),
+      InterlockedExchangePointer(reinterpret_cast<void * volatile*>(&instance),
                                  new_instance);
     } else {
       InterlockedDecrement(&instance_count);
@@ -137,8 +137,8 @@
       }
     }
   } else if (state == kDestroy) {
-    T* old_value = static_cast<T*> (InterlockedExchangePointer(
-        reinterpret_cast<void* volatile*>(&instance), NULL));
+    T* old_value = static_cast<T*>(InterlockedExchangePointer(
+        reinterpret_cast<void * volatile*>(&instance), NULL));
     if (old_value) {
       delete static_cast<T*>(old_value);
     }
@@ -150,4 +150,4 @@
 
 }  // namspace webrtc
 
-#endif  // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_STATICINSTANCETEMPLATE_H_
+#endif  // WEBRTC_SYSTEM_WRAPPERS_INTERFACE_STATIC_INSTANCE_H_