Dave's partial ACE_USES_WCHAR fixes

30 files changed, 47 insertions, 47 deletions

diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
index 633697c0641..73348aca4eb 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
@@ -30,7 +30,7 @@ using namespace CCF::CIDL;
 using namespace CCF::CIDL::SemanticGraph;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try
   {
diff --git a/TAO/CIAO/CIDLC/cidlc.cpp b/TAO/CIAO/CIDLC/cidlc.cpp
index 1f6f2a6d424..aea178da6a5 100644
--- a/TAO/CIAO/CIDLC/cidlc.cpp
+++ b/TAO/CIAO/CIDLC/cidlc.cpp
@@ -78,7 +78,7 @@ using namespace CCF::CIDL;
 using namespace CCF::CIDL::SemanticGraph;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try
   {
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp b/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp
index 5a538d8accd..8bcab6d6af8 100644
--- a/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp
+++ b/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp
@@ -40,7 +40,7 @@ namespace CIAO
     parse_args (int argc,
                 ACE_TCHAR *argv[])
     {
-      ACE_Get_Opt get_opt (argc,
+      ACE_Get_Arg_Opt<char> get_opt (argc,
                            argv,
                            ACE_TEXT ("p:i:o:h"));
       int c;
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index 2c62f431071..f4850968e10 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -24,7 +24,7 @@ namespace CIAO
     bool
     parse_args (int argc, char *argv[])
     {
-      ACE_Get_Opt get_opts (argc, argv, "o:m:i:n");
+      ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:m:i:n");
       int c;
       while ((c = get_opts ()) != -1)
         switch (c)
@@ -236,7 +236,7 @@ namespace CIAO
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   return CIAO::Execution_Manager::run_main (argc,
                                            argv);
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
index d50765f78d5..4bb0fc03df2 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
@@ -16,7 +16,7 @@ int use_callback = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "nk:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "nk:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -56,7 +56,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index d222f09b624..78d63ebd770 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -25,7 +25,7 @@ int spawn_delay = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:c:m:s:d:n");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:m:s:d:n");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -122,7 +122,7 @@ register_with_ns (const char * name_context,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index 654e3b2a59e..af67fd06b45 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -45,7 +45,7 @@ namespace CIAO
     parse_args (int argc,
                 ACE_TCHAR *argv[])
     {
-      ACE_Get_Opt get_opt (argc,
+      ACE_Get_Arg_Opt<char> get_opt (argc,
                            argv,
                            ACE_TEXT ("p:nk:o:i:h"));
       int c;
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
index 86e56f99cb3..2bdc40ffff1 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
@@ -10,7 +10,7 @@ parse_args (int argc,
             char *argv[],
             CIAO::NodeApplication_Task::Options &opts)
 {
-  ACE_Get_Opt get_opts (argc, argv, "nk:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "nk:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -96,7 +96,7 @@ check_supported_priorities (CORBA::ORB_ptr orb)
 
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
index 8aa41d076fa..b04f594cc91 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
@@ -40,7 +40,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   // deployment plan URL
   char* plan_url = 0;
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:d:k:t:"));
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("p:d:k:t:"));
   int c;
 
   while ((c = get_opt ()) != EOF)
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp
index a8dc818bbb6..45227d1741b 100644
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp
@@ -21,7 +21,7 @@ Options::instance (void)
 void
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-	ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("n:l:u:ifds"));
+	ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("n:l:u:ifds"));
 
   int c;
 
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp
index 79b2a338719..d9428e8f14e 100644
--- a/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp
@@ -21,7 +21,7 @@ URL_Parser::instance (void)
 bool
 URL_Parser::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("rwu:h:p:f:d"));
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("rwu:h:p:f:d"));
 
   bool success = true;
   int c;
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
index 446e366105b..ec2bebd91e7 100644
--- a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
@@ -52,7 +52,7 @@ namespace Config_Handler_Test
   {
     ACE_TCHAR* url = 0;
     
-    ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("u:"));
+    ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("u:"));
     int c;
     
     while ((c = get_opt ()) != EOF)
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index 49688375063..a7f196835db 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -18,7 +18,7 @@ int count = 0;
 
 int parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -47,7 +47,7 @@ int parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   std::vector<NodeAppTest::NodeAppTest_RoundTrip_var> comp_list;
   //std::vector<NodeAppTest::NodeAppTest_RoundTrip_var>::const_iterator iter;
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
index b3a7abf3451..d1834637fcc 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -11,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
index c00b3a9fcac..c3beeed8a2b 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
@@ -11,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
index 330b4419477..4c284e26fb0 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
@@ -17,7 +17,7 @@ const char *unsubscribe_name = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:s:u:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:s:u:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,7 +52,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   ACE_TRY_NEW_ENV
   {
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
index 9332d1a3e0c..3ba0c93cf81 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
@@ -17,7 +17,7 @@ int turn_on = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -58,7 +58,7 @@ parse_args (int argc, char *argv[])
 }
 
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   ACE_TRY_NEW_ENV
   {
diff --git a/TAO/CIAO/examples/BasicSP/EC/client.cpp b/TAO/CIAO/examples/BasicSP/EC/client.cpp
index 2c2f34118bc..7b3c62c776f 100644
--- a/TAO/CIAO/examples/BasicSP/EC/client.cpp
+++ b/TAO/CIAO/examples/BasicSP/EC/client.cpp
@@ -16,7 +16,7 @@
 #include "ace/OS_NS_unistd.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/examples/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/BasicSP/EC/controller.cpp
index d52ac54dba9..0bd9a112e7f 100644
--- a/TAO/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/TAO/CIAO/examples/BasicSP/EC/controller.cpp
@@ -18,7 +18,7 @@ int turn_on = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -70,7 +70,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/examples/Display/RateGen/controller.cpp b/TAO/CIAO/examples/Display/RateGen/controller.cpp
index f90ee66e797..3f2fa87298f 100644
--- a/TAO/CIAO/examples/Display/RateGen/controller.cpp
+++ b/TAO/CIAO/examples/Display/RateGen/controller.cpp
@@ -19,7 +19,7 @@ int turn_on = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -67,7 +67,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/examples/Hello/Sender/starter.cpp b/TAO/CIAO/examples/Hello/Sender/starter.cpp
index 7c647ef01dd..3577fcee991 100644
--- a/TAO/CIAO/examples/Hello/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/starter.cpp
@@ -11,7 +11,7 @@ const char * message = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:m:");
   int c = 0;
   
   while ((c = get_opts ()) != -1)
@@ -47,7 +47,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/examples/Swapping/Sender/starter.cpp b/TAO/CIAO/examples/Swapping/Sender/starter.cpp
index c88771ea568..82005cfe9aa 100644
--- a/TAO/CIAO/examples/Swapping/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Swapping/Sender/starter.cpp
@@ -11,7 +11,7 @@ const char * message = "starters message";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:m");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:m");
   int c = 0;
   
   while ((c = get_opts ()) != -1)
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index 7eba8595527..4be012c571d 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -25,7 +25,7 @@ const char *ior4 = "file://comp4.ior";
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 08bd7c111d9..15dc1c5d5ed 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -30,7 +30,7 @@ int
 parse_args (int argc, char *argv[])
 {
   //parse arguments
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:");
   char c;
   while ((c = get_opts ()) != -1)
     switch (c)
@@ -83,7 +83,7 @@ set_priority ()
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index 2df894b41c1..b4b6d285e1b 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -18,7 +18,7 @@
 const char *ior = "file://test.ior";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
index c6f2f81ae0c..8e6b863386a 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
@@ -9,7 +9,7 @@
 const char *ior_output_file = "rtserver.ior";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/CIAO/performance-tests/Benchmark/server.cpp b/TAO/CIAO/performance-tests/Benchmark/server.cpp
index 345610c1eb2..e76dc23daf9 100644
--- a/TAO/CIAO/performance-tests/Benchmark/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/server.cpp
@@ -10,7 +10,7 @@
 const char *ior_output_file = "test.ior";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index 2ea3c57a1c3..f88e97c5fe5 100644
--- a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -29,7 +29,7 @@ static const char *test_type = "PACED";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -150,7 +150,7 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index e177820261a..9f18172ba5b 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
@@ -16,7 +16,7 @@ static const char *input_file = "BasicSP.cdp";
 static int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
 
   int c;
 
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
 
 using namespace CIAO::Config_Handlers;
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
     
   if (parse_args (argc, argv) != 0)
diff --git a/TAO/CIAO/tools/Config_Handlers/test.cpp b/TAO/CIAO/tools/Config_Handlers/test.cpp
index 96c19b6688d..2f77796921c 100644
--- a/TAO/CIAO/tools/Config_Handlers/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/test.cpp
@@ -16,7 +16,7 @@ static const char *input_file = "BasicSP.cdp";
 static int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
 
   int c;
 
@@ -45,7 +45,7 @@ void check_srd (const Deployment::DeploymentPlan &);
 using namespace CIAO::Config_Handlers;
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   
   if (parse_args (argc, argv) != 0)