6 files changed, 9 insertions, 9 deletions
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
index 31f76d4826a..e6778984b40 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client-simple.cpp
@@ -105,7 +105,7 @@ Options::read (void *buf, size_t len, size_t &iteration)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:sT:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -127,7 +127,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
         break;
       case 'q':
         ACE_OS::strncpy (this->quit_string_,
-                         ACE_TEXT_ALWAYS_CHAR (getopt.opt_arg ()),
+                         ACE_TEXT_TO_CHAR_IN (getopt.opt_arg ()),
                          QUIT_STRING_SIZE);
         break;
       case 's':
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
index 539b97c931c..7ab033550d1 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-client.cpp
@@ -110,7 +110,7 @@ Options::read (void *buf, size_t len, size_t &iteration)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("2h:i:m:p:q:st:T:"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
@@ -132,7 +132,7 @@ Options::parse_args (int argc, ACE_TCHAR *argv[])
         break;
       case 'q':
         ACE_OS::strncpy (this->quit_string_,
-                         ACE_TEXT_ALWAYS_CHAR (getopt.opt_arg ()),
+                         ACE_TEXT_TO_CHAR_IN (getopt.opt_arg ()),
                          QUIT_STRING_SIZE);
         break;
       case 's':
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index e2d2c8ad0c1..e1a9177e56b 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -173,7 +173,7 @@ Options::Options (void)
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("p:r:v"), 1);
+  ACE_Get_Arg_Opt<ACE_TCHAR> getopt (argc, argv, ACE_TEXT ("p:r:v"), 1);
 
   for (int c; (c = getopt ()) != -1; )
     switch (c)
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
index 83333ccc357..23a53a7e7c7 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-poll.cpp
@@ -170,7 +170,7 @@ handle_connections (ACE_SSL_SOCK_Acceptor &peer_acceptor,
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   u_short port = ACE_DEFAULT_SERVER_PORT + 1;
 
@@ -204,7 +204,7 @@ main (int, char *[])
 }
 #else
 #include "ace/OS_NS_stdio.h"
-int main (int, char *[])
+int ACE_TMAIN (int, ACE_TCHAR *[])
 {
   ACE_OS::fprintf (stderr, "This feature is not supported\n");
   return 0;
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
index 22535160cf0..6be3ce47b9e 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server-simple.cpp
@@ -355,7 +355,7 @@ run_event_loop (u_short port)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   u_short port = ACE_DEFAULT_SERVER_PORT;
 
diff --git a/examples/IPC_SAP/SSL_SAP/SSL-server.cpp b/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
index 8563067af03..c1f173cd72f 100644
--- a/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
+++ b/examples/IPC_SAP/SSL_SAP/SSL-server.cpp
@@ -414,7 +414,7 @@ run_event_loop (u_short port)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_SSL_Context *context = ACE_SSL_Context::instance ();