5 files changed, 17 insertions, 7 deletions
diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
index 01fcb2cd41a..1cab9bda0ea 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
+++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*idl): taoidldefaults {
+  avoids += uses_wchar
   IDL_Files {
     MCast.idl
   }
@@ -10,6 +11,7 @@ project(*idl): taoidldefaults {
 
 project(*server): namingexe, iortable, svc_utils {
   exename = server
+  avoids += uses_wchar
 
   after += *idl
   Source_Files {
@@ -25,6 +27,7 @@ project(*server): namingexe, iortable, svc_utils {
 
 project(*client): namingexe, iortable, svc_utils {
   exename = client
+  avoids += uses_wchar
 
   after += *idl
   Source_Files {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index 7a79bec47bc..209879f40fd 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
 #include "ior_mcast_client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -13,7 +15,7 @@ int main (int argc, char *argv [])
       ior_mcast_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      init_result = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
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 26a0d6c3e12..80087193f30 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -2,6 +2,7 @@
 
 #include "ior_mcast_client_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 
 ior_mcast_Client_i::ior_mcast_Client_i (void)
@@ -23,8 +24,7 @@ ior_mcast_Client_i::init (int& argc,
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (argc, argv,
                          "" /* the ORB name, it can be anything! */
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index be8c6ab97c8..09bfed08ece 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -1,9 +1,13 @@
 // $Id$
 
 #include "server_i.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+// This test cannot be run on a wide character build
+// ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index e9a12f65dc5..d877a11543c 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -10,6 +10,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 
 Server_i::Server_i (void)
@@ -159,9 +160,9 @@ Server_i::enable_multicast (const char *ior)
 }
 
 int
-Server_i::parse_args (int argc, char *argv [])
+Server_i::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:");
   int c;
 
   while ((c = get_opts ()) != -1)