From 6d660248d356872bcdf80bae2e543710de8a73b2 Mon Sep 17 00:00:00 2001
From: Erik Sohns <eriksohns@fastmail.net>
Date: Thu, 3 Dec 2015 03:40:08 +0100
Subject: fixed an issue with (exported) template specializations (Win32)
 (part2)

---
 ACE/ace/Condition_Recursive_Thread_Mutex.cpp | 12 ------------
 ACE/ace/Condition_Recursive_Thread_Mutex.h   |  3 ---
 ACE/ace/Condition_Recursive_Thread_Mutex.inl | 12 ++++++++++++
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
index 4ffe00d1947..763f08154de 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -108,18 +108,6 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (ACE_Recursive_Thread_Mutex &mut
   return result;
 }
 
-int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::signal (void)
-{
-  return ACE_OS::cond_signal (&this->cond_);
-}
-
-int
-ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast (void)
-{
-  return ACE_OS::cond_broadcast (&this->cond_);
-}
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #endif /* ACE_HAS_THREADS */
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h
index 8061f3b3d63..bb20c185bb4 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.h
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.h
@@ -33,7 +33,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class ACE_Time_Value;
 
-#if defined (ACE_BUILD_DLL)
 /**
  * @brief ACE_Condition template specialization written using
  *  @a ACE_Recursive_Thread_Mutex.  This allows threads to block until
@@ -109,9 +108,7 @@ private:
   ACE_Recursive_Thread_Mutex &mutex_;
 
 };
-#else
 extern template ACE_Export class ACE_Condition<ACE_Recursive_Thread_Mutex>;
-#endif
 
 typedef ACE_Condition<ACE_Recursive_Thread_Mutex> ACE_Condition_Recursive_Thread_Mutex;
 
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.inl b/ACE/ace/Condition_Recursive_Thread_Mutex.inl
index 44e4e09c3a7..30895e26f7c 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.inl
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.inl
@@ -13,4 +13,16 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::mutex (void)
   return this->mutex_;
 }
 
+ACE_INLINE int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::signal (void)
+{
+  return ACE_OS::cond_signal (&this->cond_);
+}
+
+ACE_INLINE int
+ACE_Condition<ACE_Recursive_Thread_Mutex>::broadcast (void)
+{
+  return ACE_OS::cond_broadcast (&this->cond_);
+}
+
 ACE_END_VERSIONED_NAMESPACE_DECL
-- 
cgit v1.2.1