2 files changed, 13 insertions, 7 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index 3e6109e1ee1..b48d70383aa 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -25,6 +25,7 @@
 // For in-process Notification Service.
 //
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper.
 
@@ -204,11 +205,13 @@ private:
 };
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
-    ORB_var orb (ORB_init (argc, argv));
+    ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv()));
 
     if (argc < 2)
     {
@@ -287,7 +290,7 @@ main (int argc, char* argv[])
     if (argc < 3)
       space_craft_name = "a";  // Default to spacecraft "a".
     else
-      space_craft_name = argv[2];
+      space_craft_name = convert.get_ASCII_argv()[2];
 
     // Do a quick mapping to mcast addresses.
     //
@@ -322,7 +325,7 @@ main (int argc, char* argv[])
 
     // Start the agent.
     //
-    Agent agent (space_craft_name, argv[1], channel.in ());
+    Agent agent (space_craft_name, convert.get_ASCII_argv()[1], channel.in ());
 
     orb->run ();
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index 2751694dcd7..e858f379b04 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -17,6 +17,7 @@
 // For in-process Notification Service.
 //
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper.
 
@@ -33,11 +34,13 @@ using namespace CosNotification;
 using namespace CosNotifyChannelAdmin;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
-    ORB_var orb (ORB_init (argc, argv));
+    ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv()));
 
     if (argc < 2)
     {
@@ -134,7 +137,7 @@ main (int argc, char* argv[])
     ACE_INET_Addr space_craft_addr;
     char const* space_craft_name = 0;
 
-    space_craft_name = argv[1];
+    space_craft_name = convert.get_ASCII_argv()[1];
 
     // Do a quick mapping to mcast addresses.
     //