diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-04-27 23:20:36 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-04-27 23:20:36 +0000 |
| commit | 274ec2db9dc6acd7434a9680c069e5d0333852f9 (patch) | |
| tree | 52a7273875aa7fd54c401fbcbecebc744a7b32e5 /examples/ASX/Event_Server | |
| parent | ddf5e340e27dc2bf29d80a0965df02f3d04b8232 (diff) | |
| download | ATCD-274ec2db9dc6acd7434a9680c069e5d0333852f9.tar.gz | |
*** empty log message ***
Diffstat (limited to 'examples/ASX/Event_Server')
| -rw-r--r-- | examples/ASX/Event_Server/Event_Server/Peer_Router.cpp | 5 | ||||
| -rw-r--r-- | examples/ASX/Event_Server/Event_Server/Peer_Router.h | 10 | ||||
| -rw-r--r-- | examples/ASX/Event_Server/Transceiver/transceiver.cpp | 10 |
3 files changed, 6 insertions, 19 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 */ |