ChangeLogTag: Fri Jun 27 11:00:00 UTC 2008 Simon Massey <sma at prismtech dot com>

6 files changed, 11 insertions, 15 deletions

diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index d227490893d..6764fe26742 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -2,13 +2,10 @@
 
 #include "ior_mcast_client_i.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
-
   try
     {
-
       ior_mcast_Client_i client;
 
       int init_result;
@@ -18,7 +15,7 @@ int main (int argc, char *argv [])
     }
   catch (const CORBA::SystemException&)
     {
-      //
+      // Ignore
     }
   catch (const CORBA::Exception& ex)
     {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index 180c7661520..a9710c25b60 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -15,9 +15,8 @@ ior_mcast_Client_i::~ior_mcast_Client_i (void)
 
 int
 ior_mcast_Client_i::init (int& argc,
-                          char *argv[])
+                          ACE_TCHAR *argv[])
 {
-
   try
     {
       // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
index 46ca60befd4..57c6b415f21 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h
@@ -24,7 +24,7 @@ class ior_mcast_Client_i
   int run (void);
   // Execute the client example code.
 
-  int init (int& argc, char *argv[]);
+  int init (int& argc, ACE_TCHAR *argv[]);
   // Initialize the client communication endpoint with the server.
 
  private:
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index a8cd25a9b2b..29d61bc4d7d 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -2,7 +2,7 @@
 
 #include "server_i.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index 546c0c9a58d..3878ae082c1 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -29,7 +29,7 @@ Server_i::~Server_i (void)
 
 int
 Server_i::init (int &argc,
-                char **&argv)
+                ACE_TCHAR **argv)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -143,7 +143,7 @@ Server_i::enable_multicast (const char *ior)
 }
 
 int
-Server_i::parse_args (int argc, char *argv [])
+Server_i::parse_args (int argc, ACE_TCHAR *argv[])
 {
   ACE_Get_Opt get_opts (argc, argv, "a:");
   int c;
@@ -152,7 +152,7 @@ Server_i::parse_args (int argc, char *argv [])
     switch (c)
       {
       case 'a':
-        this->mcast_address_ = get_opts.opt_arg ();
+        this->mcast_address_ = ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ());
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
index d55765506e6..84aeb82e37e 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h
@@ -20,7 +20,7 @@ public:
   Server_i (void);
   ~Server_i (void);
 
-  int init (int &argc, char **&argv);
+  int init (int &argc, ACE_TCHAR **argv);
   // Initialize the server multicast.
 
 private:
@@ -30,14 +30,14 @@ private:
   int enable_multicast (const char *ior);
 
   /// Parse the command line arguments.
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
 
 private:
 
   int argc_;
   // # of arguments on the command line.
 
-  char **argv_;
+  ACE_TCHAR **argv_;
   // arguments from command line.
 
   CORBA::ORB_var orb_;