Merge remote-tracking branch 'origin/master' into mmaps

1 files changed, 2 insertions, 7 deletions

diff --git a/dep/acelite/ace/TSS_Adapter.cpp b/dep/acelite/ace/TSS_Adapter.cpp
index 748ad1c13e6..e51ca303511 100644
--- a/dep/acelite/ace/TSS_Adapter.cpp
+++ b/dep/acelite/ace/TSS_Adapter.cpp
@@ -1,7 +1,7 @@
 /**
  * @file TSS_Adapter.cpp
  *
- * $Id: TSS_Adapter.cpp 91286 2010-08-05 09:04:31Z johnnyw $
+ * $Id: TSS_Adapter.cpp 93792 2011-04-07 11:48:50Z mcorino $
  *
  * Originally in Synch.cpp
  *
@@ -10,30 +10,25 @@
 
 #include "ace/TSS_Adapter.h"
 
-
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_TSS_Adapter::ACE_TSS_Adapter (void *object, ACE_THR_DEST f)
   : ts_obj_ (object),
     func_ (f)
 {
-  // ACE_TRACE ("ACE_TSS_Adapter::ACE_TSS_Adapter");
 }
 
 void
 ACE_TSS_Adapter::cleanup (void)
 {
-  // ACE_TRACE ("ACE_TSS_Adapter::cleanup");
   (*this->func_)(this->ts_obj_);  // call cleanup routine for ts_obj_
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
-extern "C" void
+extern "C" ACE_Export void
 ACE_TSS_C_cleanup (void *object)
 {
-  // ACE_TRACE ("ACE_TSS_C_cleanup");
   if (object != 0)
     {
       ACE_TSS_Adapter * const tss_adapter = (ACE_TSS_Adapter *) object;