Index: base/threading/thread_local_storage_win.cc |
diff --git a/base/threading/thread_local_storage_win.cc b/base/threading/thread_local_storage_win.cc |
index badadb8e5fcdeee9e79ca2c41f617da6308b58fd..960b706e8c856dbcb52649e1dfd24b6e6c194568 100644 |
--- a/base/threading/thread_local_storage_win.cc |
+++ b/base/threading/thread_local_storage_win.cc |
@@ -86,13 +86,13 @@ void** ThreadLocalStorage::Initialize() { |
return tls_data; |
} |
-ThreadLocalStorage::Slot::Slot(TLSDestructorFunc destructor) |
- : initialized_(false), |
- slot_(0) { |
+ThreadLocalStorage::Slot::Slot(TLSDestructorFunc destructor) { |
+ initialized_ = false; |
+ slot_ = 0; |
Initialize(destructor); |
} |
-bool ThreadLocalStorage::Slot::Initialize(TLSDestructorFunc destructor) { |
+bool ThreadLocalStorage::StaticSlot::Initialize(TLSDestructorFunc destructor) { |
if (tls_key_ == TLS_OUT_OF_INDEXES || !TlsGetValue(tls_key_)) |
ThreadLocalStorage::Initialize(); |
@@ -110,7 +110,7 @@ bool ThreadLocalStorage::Slot::Initialize(TLSDestructorFunc destructor) { |
return true; |
} |
-void ThreadLocalStorage::Slot::Free() { |
+void ThreadLocalStorage::StaticSlot::Free() { |
// At this time, we don't reclaim old indices for TLS slots. |
// So all we need to do is wipe the destructor. |
DCHECK_GT(slot_, 0); |
@@ -120,7 +120,7 @@ void ThreadLocalStorage::Slot::Free() { |
initialized_ = false; |
} |
-void* ThreadLocalStorage::Slot::Get() const { |
+void* ThreadLocalStorage::StaticSlot::Get() const { |
void** tls_data = static_cast<void**>(TlsGetValue(tls_key_)); |
if (!tls_data) |
tls_data = ThreadLocalStorage::Initialize(); |
@@ -129,7 +129,7 @@ void* ThreadLocalStorage::Slot::Get() const { |
return tls_data[slot_]; |
} |
-void ThreadLocalStorage::Slot::Set(void* value) { |
+void ThreadLocalStorage::StaticSlot::Set(void* value) { |
void** tls_data = static_cast<void**>(TlsGetValue(tls_key_)); |
if (!tls_data) |
tls_data = ThreadLocalStorage::Initialize(); |