diff options
| author | Steve Huston <shuston@riverace.com> | 2012-09-11 19:01:32 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-09-11 19:01:32 +0000 |
| commit | 347ff9de5853f51d3e4c769190ffbd54c667a851 (patch) | |
| tree | 91bd9a6f236024089ddb14b78b599eb7bd26e713 | |
| parent | a6a0d6560c2d6079955dbcb831e39d3968a4867c (diff) | |
| download | ATCD-347ff9de5853f51d3e4c769190ffbd54c667a851.tar.gz | |
ChangeLogTag:Tue Sep 11 18:59:35 UTC 2012 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ace/TSS_T.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index e4a5bff1fda..51258ea6137 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Sep 11 18:59:35 UTC 2012 Steve Huston <shuston@riverace.com> + + * ace/TSS_T.cpp (ACE_TSS_Guard::init_key): Fix compile error. + Thu Sep 6 15:06:15 UTC 2012 Steve Huston <shuston@riverace.com> * ace/Log_Msg.cpp (close): Don't try to lock/unlock the diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp index 79e88a3ae9b..172e05de0b8 100644 --- a/ace/TSS_T.cpp +++ b/ace/TSS_T.cpp @@ -350,11 +350,11 @@ ACE_TSS_Guard<ACE_LOCK>::init_key (void) this->key_ = ACE_OS::NULL_key; ACE_Thread::keycreate (&this->key_, #if defined (ACE_HAS_THR_C_DEST) - &ACE_TSS_C_cleanup, + &ACE_TSS_C_cleanup #else - &ACE_TSS_Guard<ACE_LOCK>::cleanup, + &ACE_TSS_Guard<ACE_LOCK>::cleanup #endif /* ACE_HAS_THR_C_DEST */ - (void *) this); + ); } template <class ACE_LOCK> |