summaryrefslogtreecommitdiff
path: root/ace/Svc_Handler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/Svc_Handler.cpp')
-rw-r--r--ace/Svc_Handler.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/ace/Svc_Handler.cpp b/ace/Svc_Handler.cpp
index 0f4c3ebe617..e48100a7b1c 100644
--- a/ace/Svc_Handler.cpp
+++ b/ace/Svc_Handler.cpp
@@ -130,21 +130,21 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *)
{
ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open");
#if defined (ACE_DEBUGGING)
- ASYS_TCHAR buf[BUFSIZ];
+ ACE_TCHAR buf[BUFSIZ];
ACE_PEER_STREAM_ADDR client_addr;
if (this->peer_.get_remote_addr (client_addr) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("get_remote_addr")),
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("get_remote_addr")),
-1);
else if (client_addr.addr_to_string (buf, sizeof buf) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("can't obtain peer's address")),
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("can't obtain peer's address")),
-1);
ACE_DEBUG ((LM_DEBUG,
- ASYS_TEXT ("connected to %s on fd %d\n"),
+ ACE_TEXT ("connected to %s on fd %d\n"),
buf,
this->peer_.get_handle ()));
#endif /* ACE_DEBUGGING */
@@ -153,8 +153,8 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::open (void *)
(this,
ACE_Event_Handler::READ_MASK) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- ASYS_TEXT ("%p\n"),
- ASYS_TEXT ("unable to register client handler")),
+ ACE_TEXT ("%p\n"),
+ ACE_TEXT ("unable to register client handler")),
-1);
return 0;
}
@@ -285,7 +285,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::close (unsigned long)
}
template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init (int argc, ASYS_TCHAR *argv[])
+ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init (int argc, ACE_TCHAR *argv[])
{
ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::init");
ACE_UNUSED_ARG (argc);
@@ -301,7 +301,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::fini (void)
}
template <PR_ST_1, ACE_SYNCH_DECL> int
-ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::info (ASYS_TCHAR **, size_t) const
+ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::info (ACE_TCHAR **, size_t) const
{
ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::info");
return -1;