summaryrefslogtreecommitdiff
path: root/ace/Connector.h
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-04-28 18:55:08 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1997-04-28 18:55:08 +0000
commit69835f400d484e839d5d7444cc38542e682d0d15 (patch)
tree0070854bf97249d0f02c5a14d3cca2bc1cb0280a /ace/Connector.h
parent5153591df092c30df60b92417dc8320161f88b52 (diff)
downloadATCD-69835f400d484e839d5d7444cc38542e682d0d15.tar.gz
use ACE_SYNCH_RW_MUTEX in Map typedefs
Diffstat (limited to 'ace/Connector.h')
-rw-r--r--ace/Connector.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/ace/Connector.h b/ace/Connector.h
index ffdbe535493..bfe0af40ccd 100644
--- a/ace/Connector.h
+++ b/ace/Connector.h
@@ -153,16 +153,9 @@ protected:
typedef ACE_Svc_Tuple<SVC_HANDLER> AST;
-#if defined (ACE_MT_SAFE)
- typedef ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_RW_Mutex> MAP_MANAGER;
- typedef ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_RW_Mutex> MAP_ITERATOR;
+ typedef ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_SYNCH_RW_MUTEX> MAP_MANAGER;
+ typedef ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_SYNCH_RW_MUTEX> MAP_ITERATOR;
typedef ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *> MAP_ENTRY;
-// ACE_Thread_Mutex lock_;
-#else
- typedef ACE_Map_Manager<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_Null_Mutex> MAP_MANAGER;
- typedef ACE_Map_Iterator<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *, ACE_Null_Mutex> MAP_ITERATOR;
- typedef ACE_Map_Entry<ACE_HANDLE, ACE_Svc_Tuple<SVC_HANDLER> *> MAP_ENTRY;
-#endif /* ACE_MT_SAFE */
// = The following two methods define the Connector's strategies for
// creating, connecting, and activating SVC_HANDLER's, respectively.