diff options
| author | click <none@none> | 2010-11-04 05:30:29 +0100 |
|---|---|---|
| committer | click <none@none> | 2010-11-04 05:30:29 +0100 |
| commit | 9b16ee203f3f8e6e21c4864bd3308bf58c7b6800 (patch) | |
| tree | 14950af01860fc520bbbd320c7ad81ef0281cbf3 /dep/acelite/ace/Service_Config.cpp | |
| parent | 2604250c3c4efd93e9977f2eb72d6398a7a7bcb2 (diff) | |
Dep/ACE: Upgrade ACE -library to 5.8.3
--HG--
branch : trunk
Diffstat (limited to 'dep/acelite/ace/Service_Config.cpp')
| -rw-r--r-- | dep/acelite/ace/Service_Config.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/dep/acelite/ace/Service_Config.cpp b/dep/acelite/ace/Service_Config.cpp index b1ec0329eb5..d63f46c1b86 100644 --- a/dep/acelite/ace/Service_Config.cpp +++ b/dep/acelite/ace/Service_Config.cpp @@ -1,4 +1,4 @@ -// $Id: Service_Config.cpp 84619 2009-02-26 12:26:16Z johnnyw $ +// $Id: Service_Config.cpp 91693 2010-09-09 12:57:54Z johnnyw $ #include "ace/Service_Config.h" @@ -24,26 +24,23 @@ #include "ace/Log_Msg.h" #include "ace/ACE.h" -ACE_RCSID (ace, - Service_Config, - "$Id: Service_Config.cpp 84619 2009-02-26 12:26:16Z johnnyw $") ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Threading_Helper<ACE_Thread_Mutex>::~ACE_Threading_Helper () +ACE_Threading_Helper<ACE_Thread_Mutex>::~ACE_Threading_Helper (void) { - ACE_OS::thr_key_detach (this->key_, 0); + ACE_OS::thr_key_detach (this->key_); ACE_OS::thr_keyfree (this->key_); } -ACE_Threading_Helper<ACE_Thread_Mutex>::ACE_Threading_Helper () +ACE_Threading_Helper<ACE_Thread_Mutex>::ACE_Threading_Helper (void) : key_ (ACE_OS::NULL_key) { # if defined (ACE_HAS_TSS_EMULATION) ACE_Object_Manager::init_tss (); # endif - if (ACE_Thread::keycreate (&key_, 0, 0) == -1) + if (ACE_Thread::keycreate (&key_, 0) == -1) { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) Failed to create thread key: %p\n"), |