summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-04-14 00:27:28 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-04-14 00:27:28 +0000
commita6845eb2dcc0b863ac1ddb7f2a9d4843aef107f7 (patch)
tree12886736e8ff93dd95a31c049c2c1118ae3a1dc2
parentc8f41cba1b6ee05123372410b8e768627971985a (diff)
downloadATCD-a6845eb2dcc0b863ac1ddb7f2a9d4843aef107f7.tar.gz
More UNICODE changes.
-rw-r--r--ace/Asynch_IO.cpp4
-rw-r--r--ace/DEV_Connector.i4
2 files changed, 4 insertions, 4 deletions
diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp
index 1430885e1c4..9f794fc04a8 100644
--- a/ace/Asynch_IO.cpp
+++ b/ace/Asynch_IO.cpp
@@ -500,7 +500,7 @@ ACE_Asynch_Accept::accept (ACE_Message_Block &message_block,
size_t available_space = total_size - space_in_use;
size_t space_needed = bytes_to_read + 2 * address_size;
if (available_space < space_needed)
- ACE_ERROR_RETURN ((LM_ERROR, "Buffer too small\n"), -1);
+ ACE_ERROR_RETURN ((LM_ERROR, ASYS_TEXT ("Buffer too small\n")), -1);
int close_accept_handle = 0;
// If the <accept_handle> is invalid, we will create a new socket
@@ -1004,7 +1004,7 @@ ACE_Service_Handler::addresses (const ACE_INET_Addr &remote_address,
const ACE_INET_Addr &local_address)
{
// Default behavior is to print out the addresses.
- char local_address_buf[BUFSIZ], remote_address_buf[BUFSIZ];
+ ASYS_TCHAR local_address_buf[BUFSIZ], remote_address_buf[BUFSIZ];
if (local_address.addr_to_string (local_address_buf, sizeof local_address_buf) == -1)
ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("can't obtain local_address's address string")));
diff --git a/ace/DEV_Connector.i b/ace/DEV_Connector.i
index 53c05674f90..8b6f634e2ac 100644
--- a/ace/DEV_Connector.i
+++ b/ace/DEV_Connector.i
@@ -18,8 +18,8 @@ ACE_DEV_Connector::ACE_DEV_Connector (ACE_DEV_IO &new_io,
if (this->connect (new_io, remote_sap, timeout, local_sap,
reuse_addr, flags, perms) == ACE_IO_SAP::INVALID_HANDLE
&& timeout != 0 && !(errno == EWOULDBLOCK || errno == ETIME))
- ACE_ERROR ((LM_ERROR, "address %s, %p\n",
- remote_sap.get_path_name (), "ACE_DEV_IO"));
+ ACE_ERROR ((LM_ERROR, ASYS_TEXT ("address %s, %p\n"),
+ remote_sap.get_path_name (), ASYS_TEXT ("ACE_DEV_IO")));
}
inline int