From 64fbac344126936fed0345124b06fd7bba7c4ef8 Mon Sep 17 00:00:00 2001
From: Steve Huston <shuston@riverace.com>
Date: Tue, 11 Sep 2012 19:07:53 +0000
Subject: ChangeLogTag:Tue Sep 11 18:59:35 UTC 2012  Steve Huston 
 <shuston@riverace.com>

---
 ACE/ChangeLog     | 4 ++++
 ACE/ace/TSS_T.cpp | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'ACE')

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>
-- 
cgit v1.2.1