Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

3 files changed, 14 insertions, 32 deletions

diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
index da21a7210b2..69449348a84 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h
@@ -9,22 +9,22 @@ class Multiple_Inheritance_i : public POA_D
 public:
   Multiple_Inheritance_i (void);
 
-  virtual char* method1 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method1 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method1");
     }
-  virtual char* method2 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method2 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method2");
     }
-  virtual char* method3 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method3 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method3");
     }
-  virtual char* method4 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  virtual char* method4 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
     {
       return CORBA::string_dup ("method4");
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index ce7f8434a2f..8ccf929918a 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -77,7 +77,6 @@ main (int argc, char **argv)
       // Initialize the ORB
       CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
       parse_args (argc, argv);
@@ -105,60 +104,46 @@ main (int argc, char **argv)
 
       // Get the object reference with the IOR
       CORBA::Object_var object = orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       CORBA::String_var string;
 
       // Narrow the object reference
       A_var a = A::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Narrow the object reference
       intB_var b = intB::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Narrow the object reference
       C_var c = C::_narrow (a.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       // Narrow the object reference
       D_var d = D::_narrow (c.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
-      string = a->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = a->method1 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = b->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = b->method1 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = b->method2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = b->method2 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = c->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = c->method1 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = c->method3 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = c->method3 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method1 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = d->method1 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method2 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = d->method2 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method3 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = d->method3 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
 
-      string = d->method4 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      string = d->method4 ();
       ACE_DEBUG ((LM_DEBUG, "%s\n", string.in ()));
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index d29978c9163..0bc9e14d7ef 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -57,7 +57,6 @@ main (int argc, char **argv)
                                   argv,
                                   "child_poa"
                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return -1;
@@ -66,7 +65,6 @@ main (int argc, char **argv)
         orb_manager.activate_under_child_poa ("my_object",
                                               &servant
                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "%s\n",
                   ior.in ()));
@@ -84,8 +82,7 @@ main (int argc, char **argv)
           ACE_OS::fclose (output_file);
         }
 
-      orb_manager.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      orb_manager.run ();
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {