*** empty log message ***

5 files changed, 44 insertions, 21 deletions

diff --git a/examples/Connection/Makefile b/examples/Connection/Makefile
index f9345400a93..96c53892d51 100644
--- a/examples/Connection/Makefile
+++ b/examples/Connection/Makefile
@@ -10,7 +10,8 @@
 
 INFO  = README
 
-DIRS  = misc \
+DIRS  = blocking \
+	misc \
 	non_blocking
 
 #----------------------------------------------------------------------------
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index eeaffddd864..f4d315f33bf 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -180,6 +180,11 @@ main (void)
 }
 #endif /* ACE_HAS_THREADS */
 
+#if defined (ACE_MT_SAFE)
+typedef ACE_RW_Mutex RW_MUTEX;
+#else
+typedef ACE_Null_Mutex RW_MUTEX;
+#endif /* ACE_MT_SAFE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Accept_Strategy<Server_Service, ACE_UPIPE_ACCEPTOR>;
@@ -187,12 +192,12 @@ template class ACE_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>;
 template class ACE_Concurrency_Strategy<Server_Service>;
 template class ACE_Connector<Client_Service, ACE_UPIPE_CONNECTOR>;
 template class ACE_Creation_Strategy<Server_Service>;
-template class ACE_Guard<ACE_RW_Mutex>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Client_Service> *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<Client_Service> *, ACE_RW_Mutex>;
+template class ACE_Guard<RW_MUTEX>;
+template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Client_Service> *, RW_MUTEX>;
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<Client_Service> *, RW_MUTEX>;
 template class ACE_Message_Queue<ACE_NULL_SYNCH>;
 template class ACE_Module<ACE_NULL_SYNCH>;
-template class ACE_Read_Guard<ACE_RW_Mutex>;
+template class ACE_Read_Guard<RW_MUTEX>;
 template class ACE_Scheduling_Strategy<Server_Service>;
 template class ACE_Strategy_Acceptor<Server_Service, ACE_UPIPE_ACCEPTOR>;
 template class ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_NULL_SYNCH>;
@@ -201,5 +206,5 @@ template class ACE_TSS<ACE_Dynamic>;
 template class ACE_Task<ACE_NULL_SYNCH>;
 template class ACE_Thread_Strategy<Server_Service>;
 template class ACE_Thru_Task<ACE_NULL_SYNCH>;
-template class ACE_Write_Guard<ACE_RW_Mutex>;
+template class ACE_Write_Guard<RW_MUTEX>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/non_blocking/test_sock_connector.cpp b/examples/Connection/non_blocking/test_sock_connector.cpp
index 1417715f94e..f297af8efcb 100644
--- a/examples/Connection/non_blocking/test_sock_connector.cpp
+++ b/examples/Connection/non_blocking/test_sock_connector.cpp
@@ -23,17 +23,22 @@ main (int argc, char *argv[])
   return peer_connector.svc ();
 }                                                       
 
+#if defined (ACE_MT_SAFE)
+typedef ACE_RW_Mutex RW_MUTEX;
+#else
+typedef ACE_Null_Mutex RW_MUTEX;
+#endif /* ACE_MT_SAFE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Connector<PEER_HANDLER, ACE_SOCK_CONNECTOR>;
-template class ACE_Guard<ACE_RW_Mutex>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_RW_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Mutex>;
 template class ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>;
 template class ACE_Svc_Tuple<PEER_HANDLER>;
-template class ACE_Write_Guard<ACE_RW_Mutex>;
 template class ACE_TSS<ACE_Dynamic>;
 template class IPC_Client<PEER_HANDLER, ACE_SOCK_CONNECTOR>;
 template class Peer_Handler<ACE_SOCK_STREAM>;
+template class ACE_Guard<RW_MUTEX>;
+template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, RW_MUTEX>;
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, RW_MUTEX>;
+template class ACE_Read_Guard<RW_MUTEX>;
+template class ACE_Write_Guard<RW_MUTEX>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/Connection/non_blocking/test_spipe_connector.cpp b/examples/Connection/non_blocking/test_spipe_connector.cpp
index d47fd847575..b540c954877 100644
--- a/examples/Connection/non_blocking/test_spipe_connector.cpp
+++ b/examples/Connection/non_blocking/test_spipe_connector.cpp
@@ -23,15 +23,21 @@ main (int argc, char *argv[])
   return peer_connector.svc ();
 }                                                       
 
+#if defined (ACE_MT_SAFE)
+typedef ACE_RW_Mutex RW_MUTEX;
+#else
+typedef ACE_Null_Mutex RW_MUTEX;
+#endif /* ACE_MT_SAFE */
+
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Connector<PEER_HANDLER, ACE_SPIPE_CONNECTOR>;
-template class ACE_Guard<ACE_RW_Mutex>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_RW_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Mutex>;
 template class ACE_Svc_Handler<ACE_SPIPE_STREAM, ACE_SYNCH>;
 template class ACE_Svc_Tuple<PEER_HANDLER>;
-template class ACE_Write_Guard<ACE_RW_Mutex>;
+template class ACE_Guard<RW_MUTEX>;
+template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, RW_MUTEX>;
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, RW_MUTEX>;
+template class ACE_Read_Guard<RW_MUTEX>;
+template class ACE_Write_Guard<RW_MUTEX>;
 template class ACE_TSS<ACE_Dynamic>;
 template class IPC_Client<PEER_HANDLER, ACE_SPIPE_CONNECTOR>;
 template class Peer_Handler<ACE_SPIPE_STREAM>;
diff --git a/examples/Connection/non_blocking/test_tli_connector.cpp b/examples/Connection/non_blocking/test_tli_connector.cpp
index 243da828cfc..810c0645f6c 100644
--- a/examples/Connection/non_blocking/test_tli_connector.cpp
+++ b/examples/Connection/non_blocking/test_tli_connector.cpp
@@ -25,15 +25,21 @@ main (int argc, char *argv[])
   return peer_connector.svc ();
 }                                                       
 
+#if defined (ACE_MT_SAFE)
+typedef ACE_RW_Mutex RW_MUTEX;
+#else
+typedef ACE_Null_Mutex RW_MUTEX;
+#endif /* ACE_MT_SAFE */
+
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Connector<PEER_HANDLER, ACE_TLI_CONNECTOR>;
-template class ACE_Guard<ACE_RW_Mutex>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_RW_Mutex>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, ACE_RW_Mutex>;
-template class ACE_Read_Guard<ACE_RW_Mutex>;
 template class ACE_Svc_Handler<ACE_TLI_STREAM, ACE_SYNCH>;
 template class ACE_Svc_Tuple<PEER_HANDLER>;
-template class ACE_Write_Guard<ACE_RW_Mutex>;
+template class ACE_Guard<RW_MUTEX>;
+template class ACE_Map_Iterator<int, ACE_Svc_Tuple<PEER_HANDLER> *, RW_MUTEX>;
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<PEER_HANDLER> *, RW_MUTEX>;
+template class ACE_Read_Guard<RW_MUTEX>;
+template class ACE_Write_Guard<RW_MUTEX>;
 template class ACE_TSS<ACE_Dynamic>;
 template class IPC_Client<PEER_HANDLER, ACE_TLI_CONNECTOR>;
 template class Peer_Handler<ACE_TLI_STREAM>;