diff options
author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:21:01 +0100 |
---|---|---|
committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:21:01 +0100 |
commit | 2e21fa6b925c4572d620248f1b149a5d652836b2 (patch) | |
tree | d0ff026bc848d7ee466c9b793f42fb9ec4f07f62 /dep/acelite/ace/Token.cpp | |
parent | 6ebc6b9a76d0a4576306d777b35ec1a37d3ec5da (diff) |
Core/Dependencies: Update ACE to v6.1.4 (Windows only)
Tested in multiple configurations
.diff with TC changes added
Diffstat (limited to 'dep/acelite/ace/Token.cpp')
-rw-r--r-- | dep/acelite/ace/Token.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dep/acelite/ace/Token.cpp b/dep/acelite/ace/Token.cpp index c63370fa534..909f14c16e3 100644 --- a/dep/acelite/ace/Token.cpp +++ b/dep/acelite/ace/Token.cpp @@ -1,4 +1,4 @@ -// $Id: Token.cpp 91286 2010-08-05 09:04:31Z johnnyw $ +// $Id: Token.cpp 96024 2012-08-09 19:42:19Z schmidt $ #include "ace/Token.h" @@ -204,9 +204,7 @@ ACE_Token::shared_acquire (void (*sleep_hook_func)(void *), return 0; } - // // Someone already holds the token. - // // Check if it is us. if (ACE_OS::thr_equal (thr_id, this->owner_)) @@ -536,7 +534,6 @@ ACE_Token::wakeup_next_waiter (void) // Wake up waiter and make it runable. queue->head_->runable_ = 1; queue->head_->signal (); - this->owner_ = queue->head_->thread_id_; } |