diff options
Diffstat (limited to 'examples/Service_Configurator/IPC-tests/server')
11 files changed, 18 insertions, 18 deletions
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i index ce7f42617e7..8fb87258041 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i @@ -50,7 +50,7 @@ ACE_INLINE int Handle_Broadcast::init (int argc, ACE_TCHAR *argv[]) { ACE_INET_Addr sba (Handle_Broadcast::DEFAULT_PORT); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i index a77d75e1fa8..159cf410cb3 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i @@ -31,7 +31,7 @@ Handle_L_CODgram::info (ACE_TCHAR **strp, size_t length) const if (ACE_LSOCK_CODgram::get_local_addr (sa) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ())); + ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ())); ACE_OS::strcat (buf, ACE_TEXT (" # tests local connected datagram\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -45,7 +45,7 @@ ACE_INLINE int Handle_L_CODgram::init (int argc, ACE_TCHAR *argv[]) { ACE_UNIX_Addr sucd; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0); const ACE_TCHAR *r = Handle_L_CODgram::DEFAULT_RENDEZVOUS; for (int c; (c = get_opt ()) != -1; ) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i index 3b2ab29331f..5e225fafd9e 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i @@ -31,7 +31,7 @@ Handle_L_Dgram::info (ACE_TCHAR **strp, size_t length) const if (this->ACE_LSOCK_Dgram::get_local_addr (sa) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ())); + ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ())); ACE_OS::strcat (buf, ACE_TEXT (" # tests local datagram\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -45,7 +45,7 @@ ACE_INLINE int Handle_L_Dgram::init (int argc, ACE_TCHAR *argv[]) { ACE_UNIX_Addr sudg; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0); const ACE_TCHAR *r = Handle_L_Dgram::DEFAULT_RENDEZVOUS; for (int c; (c = get_opt ()) != -1; ) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i index f6cd0cda734..8e8a3e1f960 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i @@ -43,7 +43,7 @@ ACE_INLINE int Handle_L_FIFO::init (int argc, ACE_TCHAR *argv[]) { const ACE_TCHAR *rendezvous_fifo = Handle_L_FIFO::DEFAULT_RENDEZVOUS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("r:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i index ce978aa85ea..72325011053 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i @@ -36,7 +36,7 @@ Handle_L_Pipe::info (ACE_TCHAR **strp, size_t length) const if (ACE_LSOCK_Acceptor::get_local_addr (sa) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ())); + ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ())); ACE_OS::strcat (buf, ACE_TEXT (" # tests local pipe\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -51,7 +51,7 @@ Handle_L_Pipe::init (int argc, ACE_TCHAR *argv[]) { ACE_UNIX_Addr sup; const ACE_TCHAR *r = Handle_L_Pipe::DEFAULT_RENDEZVOUS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i index 910938d8648..50c9bb36416 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i @@ -51,8 +51,8 @@ ACE_INLINE int Handle_L_SPIPE::init (int argc, ACE_TCHAR *argv[]) { ACE_SPIPE_Addr susp; - const ACE_TCHAR *rendezvous = Handle_L_SPIPE::DEFAULT_RENDEZVOUS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + const char *rendezvous = Handle_L_SPIPE::DEFAULT_RENDEZVOUS; + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "r:", 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i index 80b21852293..8da839253be 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i @@ -40,7 +40,7 @@ Handle_L_Stream::info (ACE_TCHAR **strp, size_t length) const if (this->get_local_addr (sa) == -1) return -1; - ACE_OS::strcpy (buf, ACE_TEXT_CHAR_TO_TCHAR (sa.get_path_name ())); + ACE_OS::strcpy (buf, ACE_TEXT_TO_TCHAR_IN (sa.get_path_name ())); ACE_OS::strcat (buf, ACE_TEXT (" # tests local ACE_Stream\n")); if (*strp == 0 && (*strp = ACE_OS::strdup (buf)) == 0) @@ -55,7 +55,7 @@ Handle_L_Stream::init (int argc, ACE_TCHAR *argv[]) { ACE_UNIX_Addr sus; const ACE_TCHAR *r = Handle_L_Stream::DEFAULT_RENDEZVOUS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("r:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("r:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) @@ -130,7 +130,7 @@ Handle_L_Stream::handle_input (ACE_HANDLE) if (new_local_stream.send (4, Handle_L_Stream::login_name, ACE_OS::strlen (Handle_L_Stream::login_name), - ACE_TEXT_ALWAYS_CHAR (cs), + ACE_TEXT_TO_CHAR_IN (cs), ACE_OS::strlen (cs)) == -1) return -1; else if (ACE_OS::close (handle) == -1) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i index 88212a988f0..df58c0173b8 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i @@ -45,7 +45,7 @@ ACE_INLINE int Handle_R_Dgram::init (int argc, ACE_TCHAR *argv[]) { ACE_INET_Addr sidg (Handle_R_Dgram::DEFAULT_PORT); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT ("p:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i index f126cd13aee..33045a3e44c 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i @@ -52,7 +52,7 @@ ACE_INLINE int Handle_R_Stream::init (int argc, ACE_TCHAR *argv[]) { ACE_INET_Addr sis (Handle_R_Stream::DEFAULT_PORT); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp index fb53c0f8d70..0a15478caed 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp @@ -61,7 +61,7 @@ Handle_Thr_Acceptor<SVH, PR_AC_2>::init (int argc, ACE_TCHAR *argv[]) ACE_INET_Addr local_addr (ACE_DEFAULT_THR_PORT); int n_threads = ACE_DEFAULT_THREADS; - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("p:t:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("p:t:"), 0); for (int c; (c = get_opt ()) != -1; ) switch (c) @@ -154,7 +154,7 @@ CLI_Stream<PR_ST_2>::svc (void) ACE_OS::cuserid (login_name); ACE_OS::sprintf (buf, "user %s %s", login_name, - ACE_TEXT_ALWAYS_CHAR (ACE_OS::ctime ((const time_t *) &t))); + ACE_TEXT_TO_CHAR_IN (ACE_OS::ctime ((const time_t *) &t))); if (this->peer ().send_n (buf, ACE_OS::strlen (buf) + 1) == -1) return -1; diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i index 346a22e773c..d23d1a26caa 100644 --- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i +++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i @@ -30,7 +30,7 @@ Handle_Timeout::init (int argc, ACE_TCHAR *argv[]) { ACE_Time_Value delta (10); ACE_Time_Value interval (1); - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("a:d:i:"), 0); int arg = 0; for (int c; (c = get_opt ()) != -1; ) |