*** empty log message ***

5 files changed, 15 insertions, 35 deletions

diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index 017543878b2..078209ff6c7 100644
--- a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
@@ -346,9 +346,8 @@ Peer_Router::control (ACE_Message_Block *mb)
 
 #endif /* _PEER_ROUTER_C */
 
-
 #if defined (ACE_TEMPLATES_REQUIRE_SPECIALIZATION)
 template class ACE_Acceptor<Peer_Handler, ACE_SOCK_ACCEPTOR>;
-template class ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ROUTER_MUTEX>;
-template class ACE_Map_Manager<ROUTING_KEY, Peer_Handler *, ROUTER_MUTEX>;
+template class ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.h b/examples/ASX/Event_Server/Event_Server/Peer_Router.h
index 7bdfe46a271..69eed7098f2 100644
--- a/examples/ASX/Event_Server/Event_Server/Peer_Router.h
+++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.h
@@ -15,12 +15,6 @@ typedef ACE_HANDLE ROUTING_KEY;
 class Peer_Router;
 class Peer_Router_Context;
 
-#if defined (ACE_MT_SAFE)
-typedef ACE_RW_Mutex ROUTER_MUTEX;
-#else
-typedef ACE_Null_Mutex ROUTER_MUTEX;
-#endif /* ACE_MT_SAFE */
-
 class Peer_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
   // = TITLE
   //     Receive input from a Peer and forward to the appropriate
@@ -84,8 +78,8 @@ private:
   // Pointer to the <Peer_Router> that we are accepting for.
 
   // = Useful typedefs
-  typedef ACE_Map_Manager <ROUTING_KEY, Peer_Handler *, ROUTER_MUTEX> PEER_MAP;
-  typedef ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ROUTER_MUTEX> PEER_ITERATOR;
+  typedef ACE_Map_Manager <ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX> PEER_MAP;
+  typedef ACE_Map_Iterator<ROUTING_KEY, Peer_Handler *, ACE_SYNCH_RW_MUTEX> PEER_ITERATOR;
   typedef ACE_Map_Entry<ROUTING_KEY, Peer_Handler *> PEER_ENTRY;
 
   PEER_MAP peer_map_;
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index d37335de9fd..7a1a9f7153d 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -205,15 +205,9 @@ main (int argc, char *argv[])
   return 0;
 }
 
-#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<Event_Transceiver, ACE_SOCK_CONNECTOR>;
 template class ACE_Svc_Tuple<Event_Transceiver>;
-template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Event_Transceiver> *, RW_MUTEX>;
-template class ACE_Map_Manager<int, ACE_Svc_Tuple<Event_Transceiver> *, RW_MUTEX>;
+template class ACE_Map_Iterator<int, ACE_Svc_Tuple<Event_Transceiver> *, ACE_SYNCH_RW_MUTEX>;
+template class ACE_Map_Manager<int, ACE_Svc_Tuple<Event_Transceiver> *, ACE_SYNCH_RW_MUTEX>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
diff --git a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
index 07b773c614f..a1421e05ef3 100644
--- a/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Consumer_Router.cpp
@@ -126,19 +126,12 @@ Consumer_Router::info (char **strp, size_t length) const
   return ACE_OS::strlen (mod_name);
 }
 
-#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_Acceptor<Consumer_Handler, ACE_UPIPE_ACCEPTOR>;
 template class Acceptor_Factory<Consumer_Handler, CONSUMER_KEY>;
 template class Peer_Handler<CONSUMER_ROUTER, CONSUMER_KEY>;
 template class Peer_Router<Consumer_Handler, CONSUMER_KEY>;
-template class ACE_Map_Iterator<long, Consumer_Handler *, RW_MUTEX>;
-template class ACE_Map_Manager<long, Consumer_Handler *, RW_MUTEX>;
+template class ACE_Map_Iterator<long, Consumer_Handler *, ACE_RW_Mutex>;
+template class ACE_Map_Manager<long, Consumer_Handler *, ACE_RW_Mutex>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
+#endif /* ACE_HAS_THREADS */
diff --git a/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp b/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
index 888a0979a34..4159c840597 100644
--- a/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Supplier_Router.cpp
@@ -1,7 +1,7 @@
-#include "Supplier_Router.h"
 // $Id$
 
 #include "Options.h"
+#include "Supplier_Router.h"
 
 #if defined (ACE_HAS_THREADS)
 
@@ -133,11 +133,11 @@ template class ACE_Svc_Handler<ACE_UPIPE_STREAM, ACE_MT_SYNCH>;
 template class ACE_TSS<ACE_Dynamic>;
 template class Peer_Handler<SUPPLIER_ROUTER, SUPPLIER_KEY>;
 template class Peer_Router<Supplier_Handler, SUPPLIER_KEY>;
-template class ACE_Map_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_Null_Mutex>;
-template class ACE_Map_Manager<SUPPLIER_KEY, Supplier_Handler *, ACE_Null_Mutex>;
-template class ACE_Read_Guard<ACE_Null_Mutex>;
-template class ACE_Write_Guard<ACE_Null_Mutex>;
-template class ACE_Guard<ACE_Null_Mutex>;
+template class ACE_Map_Iterator<SUPPLIER_KEY, Supplier_Handler *, ACE_ACE_RW_Mutex>;
+template class ACE_Map_Manager<SUPPLIER_KEY, Supplier_Handler *, ACE_ACE_RW_Mutex>;
+template class ACE_Read_Guard<ACE_ACE_RW_Mutex>;
+template class ACE_Write_Guard<ACE_ACE_RW_Mutex>;
+template class ACE_Guard<ACE_ACE_RW_Mutex>;
 #endif /* ACE_TEMPLATES_REQUIRE_SPECIALIZATION */
 
 #endif /* ACE_HAS_THREADS */