diff options
Diffstat (limited to 'ace/Name_Proxy.cpp')
| -rw-r--r-- | ace/Name_Proxy.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/ace/Name_Proxy.cpp b/ace/Name_Proxy.cpp index c776e9cd50c..1868e56f850 100644 --- a/ace/Name_Proxy.cpp +++ b/ace/Name_Proxy.cpp @@ -13,7 +13,7 @@ ACE_Name_Proxy::dump (void) const ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this)); this->connector_.dump (); this->peer_.dump (); - ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("reactor_ = %x"), this->reactor_)); + ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("reactor_ = %x"), this->reactor_)); ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP)); } @@ -52,8 +52,8 @@ ACE_Name_Proxy::ACE_Name_Proxy (const ACE_INET_Addr &remote_addr, if (this->open (remote_addr, options) == -1 && options[ACE_Synch_Options::USE_TIMEOUT] && errno != EWOULDBLOCK) ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Name_Proxy::ACE_Name_Proxy"))); } // Obtain underlying handle. @@ -74,16 +74,16 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("encode failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("encode failed")), -1); // Transmit request via a blocking send. if (this->peer_.send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("send_n failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("send_n failed")), -1); else { @@ -94,13 +94,13 @@ ACE_Name_Proxy::request_reply (ACE_Name_Request &request) if (this->peer_.recv_n (&reply, sizeof reply) == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("recv failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("recv failed")), -1); else if (reply.decode () == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("decode failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("decode failed")), -1); errno = int (reply.errnum ()); return reply.status (); @@ -116,16 +116,16 @@ ACE_Name_Proxy::send_request (ACE_Name_Request &request) if (length == -1) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("encode failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("encode failed")), -1); // Transmit request via a blocking send. else if (this->peer_.send_n (buffer, length) != length) ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("send_n failed")), + ACE_TEXT ("%p\n"), + ACE_TEXT ("send_n failed")), -1); return 0; } @@ -144,11 +144,11 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) case -1: // FALLTHROUGH ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("****************** recv_reply returned -1\n"))); + ACE_TEXT ("****************** recv_reply returned -1\n"))); default: ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p got %d bytes, expected %d bytes\n"), - ASYS_TEXT ("recv failed"), + ACE_TEXT ("%p got %d bytes, expected %d bytes\n"), + ACE_TEXT ("recv failed"), n, sizeof (ACE_UINT32))); // FALLTHROUGH @@ -171,8 +171,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) if (n != ssize_t (length - sizeof (ACE_UINT32))) { ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p expected %d, got %d\n"), - ASYS_TEXT ("invalid length"), + ACE_TEXT ("%p expected %d, got %d\n"), + ACE_TEXT ("invalid length"), length, n)); return -1; @@ -182,8 +182,8 @@ ACE_Name_Proxy::recv_reply (ACE_Name_Request &reply) if (reply.decode () == -1) { ACE_ERROR ((LM_ERROR, - ASYS_TEXT ("%p\n"), - ASYS_TEXT ("decode failed"))); + ACE_TEXT ("%p\n"), + ACE_TEXT ("decode failed"))); return -1; } } |