diff options
Diffstat (limited to 'ace/Connector.cpp')
-rw-r--r-- | ace/Connector.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ace/Connector.cpp b/ace/Connector.cpp index 76d20b2f1b3..d9ff5973a9d 100644 --- a/ace/Connector.cpp +++ b/ace/Connector.cpp @@ -11,7 +11,7 @@ #define SH SVC_HANDLER #define PR_CO_1 ACE_PEER_CONNECTOR_1 #define PR_CO_2 ACE_PEER_CONNECTOR_2 -#define PR_AD ACE_PEER_CONNECTOR_ADDR +#define PEER_ADDR ACE_PEER_CONNECTOR_ADDR ACE_ALLOC_HOOK_DEFINE(ACE_Connector) @@ -58,9 +58,9 @@ ACE_Connector<SH, PR_CO_2>::activate_svc_handler (SVC_HANDLER *svc_handler) template <class SH, PR_CO_1> int ACE_Connector<SH, PR_CO_2>::connect_svc_handler (SVC_HANDLER *svc_handler, - const PR_AD &remote_addr, + const PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options, - const PR_AD &local_addr, + const PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) @@ -313,7 +313,7 @@ ACE_Connector<SH, PR_CO_2>::handle_output (ACE_HANDLE handle) // Transfer ownership of the ACE_HANDLE to the SVC_HANDLER. ast->svc_handler ()->set_handle (handle); - PR_AD raddr; + PEER_ADDR raddr; // Check to see if we're connected. if (ast->svc_handler ()->peer ().get_remote_addr (raddr) != -1) @@ -329,9 +329,9 @@ ACE_Connector<SH, PR_CO_2>::handle_output (ACE_HANDLE handle) template <class SH, PR_CO_1> int ACE_Connector<SH, PR_CO_2>::connect (SH *sh, - const PR_AD &remote_addr, + const PEER_ADDR &remote_addr, const ACE_Synch_Options &synch_options, - const PR_AD &local_addr, + const PEER_ADDR &local_addr, int reuse_addr, int flags, int perms) @@ -504,7 +504,7 @@ ACE_Connector<SH, PR_CO_2>::info (char **strp, size_t length) const ACE_TRACE ("ACE_Connector<SH, PR_CO_2>::info"); char buf[BUFSIZ]; char addr_str[BUFSIZ]; - PR_AD addr; + PEER_ADDR addr; if (this->connector ().get_local_addr (addr) == -1) return -1; @@ -533,5 +533,4 @@ ACE_Connector<SH, PR_CO_2>::~ACE_Connector (void) #undef SH #undef PR_CO_1 #undef PR_CO_2 -#undef PR_AD #endif /* ACE_CONNECTOR_C */ |