5 files changed, 9 insertions, 9 deletions
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
     {