diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 22:18:56 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-30 22:18:56 +0000 |
| commit | 1357c32474af4190d22ccca26bf414443252784b (patch) | |
| tree | 620927f5a079c5850e59d9774f4747b76d60ed11 /base/tracked_objects.h | |
| parent | b99603ceb9cbec4a3b1ca9ac535f6b1cbc951bb8 (diff) | |
| download | chromium_src-1357c32474af4190d22ccca26bf414443252784b.zip chromium_src-1357c32474af4190d22ccca26bf414443252784b.tar.gz chromium_src-1357c32474af4190d22ccca26bf414443252784b.tar.bz2 | |
Move thread local stuff from base to base/threading and consistently use the
base namespace. This also fixes references to TLSSlot to
base::ThreadLocalStorage::Slot.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/5986012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/tracked_objects.h')
| -rw-r--r-- | base/tracked_objects.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/tracked_objects.h b/base/tracked_objects.h index 8590a8c..3fe2837 100644 --- a/base/tracked_objects.h +++ b/base/tracked_objects.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -11,8 +11,8 @@ #include <vector> #include "base/lock.h" -#include "base/thread_local_storage.h" #include "base/tracked.h" +#include "base/threading/thread_local_storage.h" // TrackedObjects provides a database of stats about objects (generally Tasks) // that are tracked. Tracking means their birth, death, duration, birth thread, @@ -571,7 +571,7 @@ class ThreadData { static void ShutdownDisablingFurtherTracking(); // We use thread local store to identify which ThreadData to interact with. - static TLSSlot tls_index_; + static base::ThreadLocalStorage::Slot tls_index_; // Link to the most recently created instance (starts a null terminated list). static ThreadData* first_; |