diff options
| author | Steve Huston <shuston@riverace.com> | 2012-09-11 19:07:53 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-09-11 19:07:53 +0000 |
| commit | 64fbac344126936fed0345124b06fd7bba7c4ef8 (patch) | |
| tree | 419fde43d76fd450d348b62bd13758eb6cb36c94 /ACE | |
| parent | b09f4b25c10c32739bef6bdc71ddc104472c7ea8 (diff) | |
| download | ATCD-64fbac344126936fed0345124b06fd7bba7c4ef8.tar.gz | |
ChangeLogTag:Tue Sep 11 18:59:35 UTC 2012 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ChangeLog | 4 | ||||
| -rw-r--r-- | ACE/ace/TSS_T.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 2e94235db0c..d9732245158 100644 --- a/ACE/ChangeLog +++ b/ACE/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. + Mon Sep 10 13:57:27 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl> * ace/DLL.h: diff --git a/ACE/ace/TSS_T.cpp b/ACE/ace/TSS_T.cpp index 3f46ed7697a..316a4b257a0 100644 --- a/ACE/ace/TSS_T.cpp +++ b/ACE/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> |