diff options
| author | Steve Huston <shuston@riverace.com> | 2012-09-11 19:05:46 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2012-09-11 19:05:46 +0000 |
| commit | 475776523dc80631b538c4fb792621154b0b2bab (patch) | |
| tree | c50dc5068144a8d16e9fd952c70450c79f7a1b87 | |
| parent | 992af9d5b0ecab5efc0c4430c45ad04ca656e52f (diff) | |
| download | ATCD-475776523dc80631b538c4fb792621154b0b2bab.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 c3b4bd92675..46c3b8426d6 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. + Mon Sep 10 15:32:15 EDT 2012 Steve Huston <shuston@riverace.com> * ACE version 6.1a released. diff --git a/ace/TSS_T.cpp b/ace/TSS_T.cpp index 3f46ed7697a..316a4b257a0 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> |