diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 16:52:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-30 16:52:09 +0000 |
| commit | 444b8a3c2cb9f74a280eb370abd8792d51870dcb (patch) | |
| tree | 37be62fef7f7a45a1e93dee5e898e5d25aa40962 /base/tracked_objects.cc | |
| parent | 0d4cd065a9b3e28de6ae1e332e1b5fe1d38d6cb6 (diff) | |
| download | chromium_src-444b8a3c2cb9f74a280eb370abd8792d51870dcb.zip chromium_src-444b8a3c2cb9f74a280eb370abd8792d51870dcb.tar.gz chromium_src-444b8a3c2cb9f74a280eb370abd8792d51870dcb.tar.bz2 | |
Make it possible to use ThreadLocalStorage::Slot as a static without
introducing static initializers.
Member variables can stay TLS::Slots and their behavior doesn't change.
Static instances use TLS::StaticSlot instead.
Kind of like http://codereview.chromium.org/8491043 but for TLS.
BUG=none
TEST=none
TBR=agl
Review URL: https://chromiumcodereview.appspot.com/9297010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119679 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked_objects.cc')
| -rw-r--r-- | base/tracked_objects.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc index 71b3bc6..e7d7bd1 100644 --- a/base/tracked_objects.cc +++ b/base/tracked_objects.cc @@ -180,7 +180,7 @@ void Births::Clear() { birth_count_ = 0; } // do a fake initialization here (zeroing out data), and then the real in-place // construction happens when we call tls_index_.Initialize(). // static -base::ThreadLocalStorage::Slot ThreadData::tls_index_(base::LINKER_INITIALIZED); +base::ThreadLocalStorage::StaticSlot ThreadData::tls_index_ = TLS_INITIALIZER; // static int ThreadData::worker_thread_data_creation_count_ = 0; |