6 files changed, 7 insertions, 7 deletions
diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index 9a013dadf0b..7ad8fd35061 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -22,7 +22,7 @@
 ACE_RCSID(CodeGen, client, "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   // Set TAO_debug_level to 0 to ensure silent running unless
diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp
index fae7f9c0d20..d20dc2d7401 100644
--- a/TAO/performance-tests/POA/Demux/demux_stats.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp
@@ -46,7 +46,7 @@ int
 Demux_Stats::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;
 
   iterations = 0;
@@ -337,7 +337,7 @@ if (iterations == 0)
     }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Demux_Stats demux_stats;
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 13816186585..dee326e1312 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -145,7 +145,7 @@ int
 Demux_Test_Client::parse_args (void)
 {
 
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 308a59127c6..2518046b95f 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -385,7 +385,7 @@ int
 Demux_Test_Server::parse_args (void)
 {
 
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:o:p:ut");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:o:p:ut");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
index 629bb31cf5f..b45ccf5b9cd 100644
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ b/TAO/performance-tests/POA/Demux/server.cpp
@@ -22,7 +22,7 @@
 ACE_RCSID(CodeGen, server, "$Id$")
 
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Set TAO_debug_level to 0 to ensure silent running unless
   // debugging is explicitly invoked
diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp
index c5c9c8bfc77..9b7478779c9 100644
--- a/TAO/performance-tests/POA/Demux/write_names.cpp
+++ b/TAO/performance-tests/POA/Demux/write_names.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
 
   for(int i=0; i<1000; i++)