diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-10 11:14:56 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-10 11:14:56 +0000 |
| commit | 2b89d22b2b66824e5d8edeb2a713295996416a28 (patch) | |
| tree | 1e79e164cb5dbafb4344a1581de6af4578ec7008 /base/message_loop.cc | |
| parent | f886b7bf801cbdd2d9e4b31a8f74bc7490922cd4 (diff) | |
| download | chromium_src-2b89d22b2b66824e5d8edeb2a713295996416a28.zip chromium_src-2b89d22b2b66824e5d8edeb2a713295996416a28.tar.gz chromium_src-2b89d22b2b66824e5d8edeb2a713295996416a28.tar.bz2 | |
Fix a mis-merge in TLS changes.
Review URL: http://codereview.chromium.org/1699
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index 3abf0c8..4b95532 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -90,9 +90,6 @@ MessageLoop::~MessageLoop() { FOR_EACH_OBSERVER(DestructionObserver, destruction_observers_, WillDestroyCurrentMessageLoop()); - // OK, now make it so that no one can find us. - lazy_tls_ptr.Pointer()->Set(NULL); - DCHECK(!state_); // Clean up any unprocessed tasks, but take care: deleting a task could @@ -113,7 +110,7 @@ MessageLoop::~MessageLoop() { DCHECK(!did_work); // OK, now make it so that no one can find us. - tls_index_.Set(NULL); + lazy_tls_ptr.Pointer()->Set(NULL); } void MessageLoop::AddDestructionObserver(DestructionObserver *obs) { |