From 347ff9de5853f51d3e4c769190ffbd54c667a851 Mon Sep 17 00:00:00 2001
From: Steve Huston <shuston@riverace.com>
Date: Tue, 11 Sep 2012 19:01:32 +0000
Subject: ChangeLogTag:Tue Sep 11 18:59:35 UTC 2012  Steve Huston 
 <shuston@riverace.com>

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