repaired include strategy for ace/Synch.h (prerequisite to solving template instantiation issues on Win32)

1 files changed, 9 insertions, 6 deletions

diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp
index cfda711b41e..221b29cf07c 100644
--- a/ACE/tests/Recursive_Condition_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Test.cpp
@@ -11,21 +11,23 @@
  */
 //=============================================================================
 
-
-#include "test_config.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/OS_NS_sys_time.h"
 #include "ace/Event_Handler.h"
 #include "ace/Log_Msg.h"
+#include "ace/OS_NS_sys_time.h"
+#include "ace/OS_NS_unistd.h"
+#include "ace/Synch.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Timer_Heap.h"
 #include "ace/Timer_Queue_Adapters.h"
 
-
+#include "test_config.h"
 
 #if defined (ACE_HAS_THREADS)
 
 typedef ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> Thread_Timer_Queue;
+//
+//// *NOTE*: explicit template instantiation required here...  
+//template class ACE_Condition<ACE_Recursive_Thread_Mutex>;
 
 class Test_Handler : public ACE_Event_Handler
 {
@@ -60,7 +62,8 @@ private:
 
 // These are for the basic functionality tests.
 ACE_SYNCH_RECURSIVE_MUTEX mutex_;
-ACE_Condition<ACE_SYNCH_RECURSIVE_MUTEX> condition_ (mutex_);
+//ACE_Condition<ACE_SYNCH_RECURSIVE_MUTEX> condition_ (mutex_);
+ACE_SYNCH_RECURSIVE_CONDITION condition_ (mutex_);
 // Test driver sets this to non-zero before spawning and to zero for
 // waiter.
 int protected_int = 0;