Fri May 5 14:33:29 UTC 2006 Ciju John <john_c@ociweb.com>oci_wchar_refactor_post_1_5_1_branch

1 files changed, 8 insertions, 7 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 58d348d5859..ddaaf415280 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include "Events.h"
 
@@ -145,10 +146,9 @@ Events::init (int argc,
 }
 
 int
-Events::parse_args (int argc,
-                         char *argv[])
+Events::parse_args (int argc, char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc,
+    ACE_TArg_Shifter< char > arg_shifter (argc,
                                  argv);
     const char *current_arg = 0;
 
@@ -322,19 +322,20 @@ Events::check_results (void)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Events events;
 
-  if (events.parse_args (argc, argv) == -1)
+  if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc,
-                   argv
+      events.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;