8 files changed, 22 insertions, 13 deletions
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index 1bb6f2cbc19..fa1ef36c477 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -31,7 +31,7 @@ AMH_Servant::parse_args (int &argc, char **argv)
 {
   // *** To get correct behaviour, SET POSIXLY_CORECT=1 on Linux
   // systems!!! ***
-  ACE_Get_Opt get_opts (argc, argv, "s:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:");
   int c;
 
   int count_argv = 0;
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index b1a722b18d8..33cb662f799 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -43,7 +43,7 @@ Base_Server::parse_args (void)
 {
   // *** To get correct behaviour, set ** POSIXLY_CORECT=1 ** on Linux
   // systems!!! ***
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "o:");
   int c;
   int count_argv = 0;
 
@@ -210,7 +210,7 @@ Base_Server::write_ior_to_file (const char * ior)
 {
   // If the ior_output_file exists, output the ior to it
   FILE *output_file =
-    ACE_OS::fopen (this->ior_output_file_, "w");
+    ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w"));
 
   if (output_file == 0)
     {
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index 9b31627ae37..59fd9c58e81 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -21,7 +21,7 @@ Client_Task::Client_Task (int &argc, char **argv)
 int
 Client_Task::parse_args (void)
 {
-    ACE_Get_Opt get_opts (this->argc_, this->argv_, "k:n:");
+    ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "k:n:");
     int c;
 
     while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
index 43ef2b385cc..2b949f5c373 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
@@ -45,7 +45,7 @@ MT_AMH_Server::parse_args (void)
       ACE_OS::exit (1);
     }
 
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "n:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "n:");
   int c;
   int count_argv = 0;
 
diff --git a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
index 873085457c1..5e7d22fe322 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -9,6 +9,7 @@ project(*IDL) : taoidldefaults, amh {
 }
 
 project(*st_server): taoexe, strategies, valuetype, amh, portableserver {
+  exename = st_server
   after += *IDL
   Source_Files {
     st_server.cpp
@@ -23,6 +24,7 @@ project(*st_server): taoexe, strategies, valuetype, amh, portableserver {
 }
 
 project(*mt_server): taoexe, strategies, valuetype, amh, portableserver  {
+  exename = mt_server
   after += *IDL
   Source_Files {
     mt_server.cpp
@@ -38,6 +40,7 @@ project(*mt_server): taoexe, strategies, valuetype, amh, portableserver  {
 }
 
 project(*client): taoexe, strategies, valuetype, amh, portableserver  {
+  exename = client
   after += *IDL
   Source_Files {
     Client_Task.cpp
diff --git a/TAO/examples/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp
index 8ac228e10f5..f0cdbabc08c 100644
--- a/TAO/examples/AMH/Sink_Server/client.cpp
+++ b/TAO/examples/AMH/Sink_Server/client.cpp
@@ -3,11 +3,13 @@
 //
 
 #include "Client_Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  Client_Task task (argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+  Client_Task task (convert.get_argc(), convert.get_ASCII_argv());
 
   if (task.parse_args () != 1)
     {
diff --git a/TAO/examples/AMH/Sink_Server/mt_server.cpp b/TAO/examples/AMH/Sink_Server/mt_server.cpp
index be36239007c..8176e904a16 100644
--- a/TAO/examples/AMH/Sink_Server/mt_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/mt_server.cpp
@@ -2,11 +2,13 @@
 
 #include "MT_AMH_Server.h"
 #include "AMH_Servant.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  MT_AMH_Server amh_server (argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+  MT_AMH_Server amh_server (convert.get_argc(), convert.get_ASCII_argv());
   amh_server.try_RT_scheduling();
   amh_server.start_orb_and_poa ();
 
@@ -18,7 +20,7 @@ main (int argc, char *argv[])
 
   AMH_Servant servant (amh_server.orb ());
 
-  if (servant.parse_args (argc, argv) != 1)
+  if (servant.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 1)
     {
       amh_server.usage ("sleep time unspecified");
       ACE_OS::exit (1);
diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp
index 5983c3cd99f..1986d33f38f 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/st_server.cpp
@@ -2,6 +2,7 @@
 
 #include "AMH_Servant.h"
 #include "Base_Server.h"
+#include "ace/Argv_Type_Converter.h"
 
 void
 usage (const char *message)
@@ -19,9 +20,10 @@ usage (const char *message)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  Base_Server amh_server (argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+  Base_Server amh_server (convert.get_argc(), convert.get_ASCII_argv());
   amh_server.try_RT_scheduling();
   amh_server.start_orb_and_poa ();
 
@@ -33,7 +35,7 @@ main (int argc, char *argv[])
 
   AMH_Servant servant (amh_server.orb ());
 
-  if (servant.parse_args (argc, argv) != 1)
+  if (servant.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 1)
     {
       usage ("Sleep time unspecified \n");
       ACE_OS::exit (1);