diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 12:57:54 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-09-09 12:57:54 +0000 |
| commit | f6fcfdcba31b21582fc14332e61365e44daf9cc5 (patch) | |
| tree | 61745bf42d9ac623456d795d8e0b4da7de98b714 /ACE/ace/TSS_T.cpp | |
| parent | 3c0758485315a3a3522f4eb1d418a2bf0b5b5c04 (diff) | |
| download | ATCD-f6fcfdcba31b21582fc14332e61365e44daf9cc5.tar.gz | |
Thu Sep 9 12:53:39 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/Asynch_Acceptor.h:
* ace/Asynch_Acceptor.cpp:
* ace/Hash_Multi_Map_Manager_T.h:
* ace/OS_NS_Thread.h:
* ace/OS_NS_Thread.cpp:
* ace/Service_Config.cpp:
* ace/TSS_T.cpp:
* ace/Thread.h:
* ace/Thread.inl:
* ace/config-macosx-snowleopard.h:
* ace/config-macosx-tiger.h:
* ace/config-macosx.h:
* tests/Hash_Multi_Map_Manager_Test.cpp:
Removed deprecated methods and arguments
* docs/FAQ:
* FAQ:
Moved to docs
Diffstat (limited to 'ACE/ace/TSS_T.cpp')
| -rw-r--r-- | ACE/ace/TSS_T.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp index 5d081e2a17a..79e88a3ae9b 100644 --- a/ACE/ace/TSS_T.cpp +++ b/ACE/ace/TSS_T.cpp @@ -28,7 +28,7 @@ ACE_ALLOC_HOOK_DEFINE(ACE_TSS) #if defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) # if defined (ACE_HAS_THR_C_DEST) -extern "C" void ACE_TSS_C_cleanup (void *); +extern "C" void ACE_TSS_C_cleanup (void *); # endif /* ACE_HAS_THR_C_DEST */ #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) */ @@ -48,7 +48,7 @@ ACE_TSS<TYPE>::~ACE_TSS (void) ACE_TSS<TYPE>::cleanup (ts_obj); # endif /* ACE_HAS_THR_C_DEST */ - ACE_OS::thr_key_detach (this->key_, this); + ACE_OS::thr_key_detach (this->key_); ACE_OS::thr_keyfree (this->key_); } #else // defined (ACE_HAS_THREADS) && (defined (ACE_HAS_THREAD_SPECIFIC_STORAGE) || defined (ACE_HAS_TSS_EMULATION)) @@ -114,11 +114,11 @@ ACE_TSS<TYPE>::ts_init (void) { if (ACE_Thread::keycreate (&this->key_, #if defined (ACE_HAS_THR_C_DEST) - &ACE_TSS_C_cleanup, + &ACE_TSS_C_cleanup #else - &ACE_TSS<TYPE>::cleanup, + &ACE_TSS<TYPE>::cleanup #endif /* ACE_HAS_THR_C_DEST */ - (void *) this) != 0) + ) != 0) return -1; // Major problems, this should *never* happen! else { |