diff options
Diffstat (limited to 'examples/Connection')
6 files changed, 12 insertions, 12 deletions
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp index a94e9cb441b..ba65d3d7101 100644 --- a/examples/Connection/blocking/SPIPE-acceptor.cpp +++ b/examples/Connection/blocking/SPIPE-acceptor.cpp @@ -77,7 +77,7 @@ IPC_Server::init (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Opening %s\n", - ACE_MULTIBYTE_STRING (rendezvous_))); + rendezvous_)); // Initialize named pipe listener. if (this->open (ACE_SPIPE_Addr (rendezvous_)) == -1) @@ -113,8 +113,8 @@ IPC_Server::parse_args (int argc, char *argv[]) { case 'r': ACE_OS::strncpy (rendezvous_, - ACE_WIDE_STRING (get_opt.optarg), - sizeof rendezvous_ / sizeof TCHAR); + ACE_TEXT_CHAR_TO_TCHAR (get_opt.optarg), + sizeof rendezvous_ / sizeof ACE_TCHAR); break; case 't': n_threads_ = ACE_OS::atoi (get_opt.optarg); diff --git a/examples/Connection/blocking/SPIPE-acceptor.h b/examples/Connection/blocking/SPIPE-acceptor.h index 84253f2e37c..ae97487d396 100644 --- a/examples/Connection/blocking/SPIPE-acceptor.h +++ b/examples/Connection/blocking/SPIPE-acceptor.h @@ -58,7 +58,7 @@ private: int n_threads_; // Size of thread pool to use. - TCHAR rendezvous_[MAXPATHLEN + 1]; + ACE_TCHAR rendezvous_[MAXPATHLEN + 1]; // Meeting place for pipe. ACE_Sig_Adapter done_handler_; diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp index bd0956354a5..8f8bdaabc92 100644 --- a/examples/Connection/blocking/SPIPE-connector.cpp +++ b/examples/Connection/blocking/SPIPE-connector.cpp @@ -143,7 +143,7 @@ IPC_Client::init (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Opening %s\n", - ACE_MULTIBYTE_STRING (rendezvous_))); + rendezvous_)); Peer_Handler *ph; @@ -200,8 +200,8 @@ IPC_Client::parse_args (int argc, char *argv[]) { case 'r': ACE_OS::strncpy (rendezvous_, - ACE_WIDE_STRING (get_opt.optarg), - sizeof rendezvous_ / sizeof TCHAR); + ACE_TEXT_CHAR_TO_TCHAR (get_opt.optarg), + sizeof rendezvous_ / sizeof ACE_TCHAR); break; case 'i': iterations_ = ACE_OS::atoi (get_opt.optarg); diff --git a/examples/Connection/blocking/SPIPE-connector.h b/examples/Connection/blocking/SPIPE-connector.h index d9ea2d32629..83fd3174bf6 100644 --- a/examples/Connection/blocking/SPIPE-connector.h +++ b/examples/Connection/blocking/SPIPE-connector.h @@ -69,7 +69,7 @@ private: int iterations_; // Number of times to send a buffer. - TCHAR rendezvous_[MAXPATHLEN + 1]; + ACE_TCHAR rendezvous_[MAXPATHLEN + 1]; // Meeting place for pipe. ACE_Sig_Adapter done_handler_; diff --git a/examples/Connection/non_blocking/test_lsock_acceptor.cpp b/examples/Connection/non_blocking/test_lsock_acceptor.cpp index 3f11ab907b5..ddf0de2a823 100644 --- a/examples/Connection/non_blocking/test_lsock_acceptor.cpp +++ b/examples/Connection/non_blocking/test_lsock_acceptor.cpp @@ -9,8 +9,8 @@ int main (int, char *argv[]) { ACE_ERROR_RETURN ((LM_INFO, - ASYS_TEXT ("%s: not supported with ") - ASYS_TEXT ("ACE_LACKS_UNIX_DOMAIN_SOCKETS\n"), + ACE_TEXT ("%s: not supported with ") + ACE_TEXT ("ACE_LACKS_UNIX_DOMAIN_SOCKETS\n"), argv[0]), -1); } diff --git a/examples/Connection/non_blocking/test_lsock_connector.cpp b/examples/Connection/non_blocking/test_lsock_connector.cpp index 5d7fc467251..a65867fb701 100644 --- a/examples/Connection/non_blocking/test_lsock_connector.cpp +++ b/examples/Connection/non_blocking/test_lsock_connector.cpp @@ -7,8 +7,8 @@ int main (int, char *argv[]) { ACE_ERROR_RETURN ((LM_INFO, - ASYS_TEXT ("%s: not supported with ") - ASYS_TEXT ("ACE_LACKS_UNIX_DOMAIN_SOCKETS\n"), + ACE_TEXT ("%s: not supported with ") + ACE_TEXT ("ACE_LACKS_UNIX_DOMAIN_SOCKETS\n"), argv[0]), -1); } |