1 files changed, 6 insertions, 8 deletions

diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
index f8bb9dd472a..70367532e69 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.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 "MultiTypes.h"
 
@@ -100,7 +101,6 @@ MultiTypes::on_received_event (MultiTypes_PushConsumer* consumer)
   if (disconnect_on_last_event_ == 1)
   {
     consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "PushConsumer has been disconnected.\n"));
     consumer = 0;
@@ -120,7 +120,6 @@ MultiTypes::on_received_event (MultiTypes_StructuredPushConsumer* consumer)
   if (disconnect_on_last_event_ == 1)
   {
     consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "StructuredPushConsumer has been disconnected.\n"));
     consumer = 0;
@@ -140,8 +139,6 @@ MultiTypes::on_received_event (MultiTypes_SequencePushConsumer* consumer)
   if (disconnect_on_last_event_ == 1)
   {
     consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
     if (TAO_debug_level)
       ACE_DEBUG ((LM_DEBUG, "SequencePushConsumer has been disconnected.\n"));
     consumer = 0;
@@ -379,19 +376,20 @@ MultiTypes::check_results (void)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   MultiTypes client;
 
-  if (client.parse_args (argc, argv) == -1)
+  if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc,
-                   argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;