1 files changed, 67 insertions, 165 deletions

diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index 4dc662ff7f3..5fff9b9379b 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -258,19 +258,14 @@ IDL3_Client::~IDL3_Client (void)
 
 int
 IDL3_Client::init (int argc,
-                   char *argv[]
-                   ACE_ENV_ARG_DECL)
+                   char *argv[])
 {
   this->orb_ = CORBA::ORB_init (argc,
                                 argv,
-                                0
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                0);
 
   CORBA::Object_var obj =
-    this->orb_->resolve_initial_references ("InterfaceRepository"
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->orb_->resolve_initial_references ("InterfaceRepository");
 
   if (CORBA::is_nil (obj.in ()))
     {
@@ -280,9 +275,7 @@ IDL3_Client::init (int argc,
     }
 
   this->repo_ =
-    CORBA::ComponentIR::Repository::_narrow (obj.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ComponentIR::Repository::_narrow (obj.in ());
 
   if (CORBA::is_nil (this->repo_.in ()))
     {
@@ -300,10 +293,9 @@ IDL3_Client::init (int argc,
 }
 
 int
-IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::run (void)
 {
-  int status = this->component_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->component_test ();
 
   if (status != 0)
     {
@@ -311,17 +303,14 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   status = this->valuetype_test (VALUETYPE_ID,
-                                 "value"
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                 "value");
 
   if (status != 0)
     {
       return status;
     }
 
-  status = this->home_test (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->home_test ();
 
   if (status != 0)
     {
@@ -329,9 +318,7 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   status = this->valuetype_test (EVENTTYPE_ID,
-                                 "event"
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                 "event");
 
   if (status != 0)
     {
@@ -368,12 +355,10 @@ IDL3_Client::parse_args (int argc,
 }
 
 int
-IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::component_test (void)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (COMPONENT_ID
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->repo_->lookup_id (COMPONENT_ID);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -387,8 +372,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::String_var str =
-    result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    result->absolute_name ();
 
   const char *tmp = str.in ();
 
@@ -416,13 +400,10 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ComponentIR::ComponentDef_var comp_def =
-    CORBA::ComponentIR::ComponentDef::_narrow (result.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ComponentIR::ComponentDef::_narrow (result.in ());
 
   CORBA::TypeCode_var comp_tc =
-    comp_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_def->type ();
 
   if (CORBA::is_nil (comp_tc.in ()))
     {
@@ -436,8 +417,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  tmp = comp_tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  tmp = comp_tc->id ();
 
   if (tmp == 0 || ACE_OS::strcmp (tmp, COMPONENT_ID) != 0)
     {
@@ -452,8 +432,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var desc =
-    comp_def->describe_ext_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_def->describe_ext_interface ();
 
   if (desc.ptr () == 0)
     {
@@ -467,27 +446,21 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  int status = this->component_attribute_test (desc
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->component_attribute_test (desc);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->component_inheritance_test (comp_def
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->component_inheritance_test (comp_def);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->component_port_test (comp_def
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->component_port_test (comp_def);
 
   if (status != 0)
     {
@@ -498,12 +471,10 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
+IDL3_Client::home_test (void)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (HOME_ID
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->repo_->lookup_id (HOME_ID);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -517,9 +488,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ComponentIR::HomeDef_var home =
-    CORBA::ComponentIR::HomeDef::_narrow (result.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ComponentIR::HomeDef::_narrow (result.in ());
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -533,8 +502,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ComponentIR::ComponentDef_var managed =
-    home->managed_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    home->managed_component ();
 
   if (CORBA::is_nil (managed.in ()))
     {
@@ -547,8 +515,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  CORBA::String_var str = managed->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = managed->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), COMPONENT_ID) != 0)
     {
@@ -562,8 +529,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::ValueDef_var pkey =
-    home->primary_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    home->primary_key ();
 
   if (CORBA::is_nil (pkey.in ()))
     {
@@ -576,8 +542,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  str = pkey->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  str = pkey->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), HOME_KEY_ID) != 0)
     {
@@ -590,9 +555,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  int status = this->home_inheritance_test (home
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->home_inheritance_test (home);
 
   if (status != 0)
     {
@@ -600,8 +563,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
     }
 
   CORBA::Contained::Description_var desc =
-    home->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    home->describe ();
 
   CORBA::ComponentIR::HomeDescription *home_desc = 0;
 
@@ -616,18 +578,14 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  status = this->home_factory_test (home_desc
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->home_factory_test (home_desc);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->home_finder_test (home_desc
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->home_finder_test (home_desc);
 
   if (status != 0)
     {
@@ -639,13 +597,10 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
 
 int
 IDL3_Client::valuetype_test (const char *repo_id,
-                             const char *prefix
-                             ACE_ENV_ARG_DECL)
+                             const char *prefix)
 {
   CORBA::Contained_var result =
-    this->repo_->lookup_id (repo_id
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    this->repo_->lookup_id (repo_id);
 
   if (CORBA::is_nil (result.in ()))
     {
@@ -660,9 +615,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   CORBA::ExtValueDef_var evd =
-    CORBA::ExtValueDef::_narrow (result.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    CORBA::ExtValueDef::_narrow (result.in ());
 
   if (CORBA::is_nil (evd.in ()))
     {
@@ -676,13 +629,10 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   CORBA::ExtValueDef::ExtFullValueDescription_var desc =
-    evd->describe_ext_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    evd->describe_ext_value ();
 
   int status = this->valuetype_attribute_test (desc,
-                                               prefix
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                               prefix);
 
   if (status != 0)
     {
@@ -690,9 +640,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_inheritance_test (evd,
-                                             prefix
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                             prefix);
 
   if (status != 0)
     {
@@ -700,9 +648,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_operation_test (desc,
-                                           prefix
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                           prefix);
 
   if (status != 0)
     {
@@ -710,9 +656,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_member_test (desc,
-                                        prefix
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                        prefix);
 
   if (status != 0)
     {
@@ -720,9 +664,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
     }
 
   status = this->valuetype_factory_test (desc,
-                                         prefix
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                         prefix);
 
   if (status != 0)
     {
@@ -735,7 +677,6 @@ IDL3_Client::valuetype_test (const char *repo_id,
 int
 IDL3_Client::component_attribute_test (
     CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var &desc
-    ACE_ENV_ARG_DECL
   )
 {
   if (desc->attributes.length () != ATTRS_LEN)
@@ -769,8 +710,7 @@ IDL3_Client::component_attribute_test (
         }
 
       CORBA::TCKind kind =
-        desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        desc->attributes[i].type->kind ();
 
       if (kind != ATTR_TC_KINDS[i])
         {
@@ -820,12 +760,10 @@ IDL3_Client::component_attribute_test (
 int
 IDL3_Client::component_inheritance_test (
     CORBA::ComponentIR::ComponentDef_var &comp_def
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::ComponentIR::ComponentDef_var comp_base =
-    comp_def->base_component (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_def->base_component ();
 
   if (CORBA::is_nil (comp_base.in ()))
     {
@@ -839,8 +777,7 @@ IDL3_Client::component_inheritance_test (
       return -1;
     }
 
-  CORBA::String_var str = comp_base->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = comp_base->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), COMP_BASE_ID) != 0)
     {
@@ -855,8 +792,7 @@ IDL3_Client::component_inheritance_test (
     }
 
   CORBA::InterfaceDefSeq_var supported =
-    comp_base->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_base->supported_interfaces ();
 
   CORBA::ULong length = supported->length ();
 
@@ -874,8 +810,7 @@ IDL3_Client::component_inheritance_test (
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      str = supported[i]->id ();
 
       if (str.in () == 0
           || ACE_OS::strcmp (str.in (), COMP_SUPPORTED_IDS[i]) != 0)
@@ -898,12 +833,10 @@ IDL3_Client::component_inheritance_test (
 int
 IDL3_Client::component_port_test (
     CORBA::ComponentIR::ComponentDef_var &comp_def
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::Contained::Description_var desc =
-    comp_def->describe (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    comp_def->describe ();
 
   CORBA::ComponentIR::ComponentDescription *cd = 0;
 
@@ -919,18 +852,14 @@ IDL3_Client::component_port_test (
       return -1;
     }
 
-  int status = this->provides_test (cd->provided_interfaces
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  int status = this->provides_test (cd->provided_interfaces);
 
   if (status != 0)
     {
       return -1;
     }
 
-  status = this->uses_test (cd->used_interfaces
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  status = this->uses_test (cd->used_interfaces);
 
   if (status != 0)
     {
@@ -941,9 +870,7 @@ IDL3_Client::component_port_test (
                                   EMITS_LEN,
                                   "emits",
                                   EMITS_NAMES,
-                                  EMITS_IDS
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  EMITS_IDS);
 
   if (status != 0)
     {
@@ -954,9 +881,7 @@ IDL3_Client::component_port_test (
                                   PUBLISHES_LEN,
                                   "publishes",
                                   PUBLISHES_NAMES,
-                                  PUBLISHES_IDS
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  PUBLISHES_IDS);
 
   if (status != 0)
     {
@@ -967,9 +892,7 @@ IDL3_Client::component_port_test (
                                   CONSUMES_LEN,
                                   "consumes",
                                   CONSUMES_NAMES,
-                                  CONSUMES_IDS
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+                                  CONSUMES_IDS);
 
   if (status != 0)
     {
@@ -980,8 +903,7 @@ IDL3_Client::component_port_test (
 }
 
 int
-IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds
-                            ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds)
 {
   if (pds.length () != PROVIDES_LEN)
     {
@@ -1034,8 +956,7 @@ IDL3_Client::provides_test (CORBA::ComponentIR::ProvidesDescriptionSeq &pds
 }
 
 int
-IDL3_Client::uses_test (CORBA::ComponentIR::UsesDescriptionSeq &uds
-                        ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::uses_test (CORBA::ComponentIR::UsesDescriptionSeq &uds)
 {
   if (uds.length () != USES_LEN)
     {
@@ -1108,8 +1029,7 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
                               CORBA::ULong seq_length,
                               const char *port_type,
                               const char **names,
-                              const char **ids
-                              ACE_ENV_ARG_DECL_NOT_USED)
+                              const char **ids)
 {
   if (eds.length () != seq_length)
     {
@@ -1166,11 +1086,9 @@ IDL3_Client::event_port_test (CORBA::ComponentIR::EventPortDescriptionSeq &eds,
 
 int
 IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
-                                         const char *prefix
-                                         ACE_ENV_ARG_DECL)
+                                         const char *prefix)
 {
-  CORBA::ValueDef_var bvd = vd->base_value (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::ValueDef_var bvd = vd->base_value ();
 
   if (CORBA::is_nil (bvd.in ()))
     {
@@ -1185,8 +1103,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
       return -1;
     }
 
-  CORBA::String_var str = bvd->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = bvd->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), VT_BASE_ID) != 0)
     {
@@ -1202,8 +1119,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
     }
 
   CORBA::InterfaceDefSeq_var supported =
-    vd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    vd->supported_interfaces ();
 
   CORBA::ULong length = supported->length ();
 
@@ -1222,8 +1138,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      str = supported[i]->id ();
 
       if (str.in () == 0
           || ACE_OS::strcmp (str.in (), VT_SUPPORTED_IDS[i]) != 0)
@@ -1248,7 +1163,6 @@ int
 IDL3_Client::valuetype_attribute_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL
   )
 {
   if (desc->attributes.length () != ATTRS_LEN)
@@ -1284,8 +1198,7 @@ IDL3_Client::valuetype_attribute_test (
         }
 
       CORBA::TCKind kind =
-        desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        desc->attributes[i].type->kind ();
 
       if (kind != ATTR_TC_KINDS[i])
         {
@@ -1339,7 +1252,6 @@ int
 IDL3_Client::valuetype_operation_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL
   )
 {
   CORBA::ULong ops_length = desc->operations.length ();
@@ -1380,8 +1292,7 @@ IDL3_Client::valuetype_operation_test (
         }
 
       CORBA::TCKind ret_kind =
-        desc->operations[i].result.in ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+        desc->operations[i].result.in ()->kind ();
 
       if (ret_kind != OP_RET_KINDS[i])
         {
@@ -1457,7 +1368,6 @@ int
 IDL3_Client::valuetype_member_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   CORBA::ULong length = desc->members.length ();
@@ -1517,7 +1427,6 @@ int
 IDL3_Client::valuetype_factory_test (
     CORBA::ExtValueDef::ExtFullValueDescription_var &desc,
     const char *prefix
-    ACE_ENV_ARG_DECL_NOT_USED
   )
 {
   CORBA::ULong length = desc->initializers.length ();
@@ -1621,12 +1530,10 @@ IDL3_Client::valuetype_factory_test (
 }
 
 int
-IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
-                                    ACE_ENV_ARG_DECL)
+IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd)
 {
   CORBA::ComponentIR::HomeDef_var bhd =
-    hd->base_home (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    hd->base_home ();
 
   if (CORBA::is_nil (bhd.in ()))
     {
@@ -1640,8 +1547,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
       return -1;
     }
 
-  CORBA::String_var str = bhd->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+  CORBA::String_var str = bhd->id ();
 
   if (str.in () == 0 || ACE_OS::strcmp (str.in (), HOME_BASE_ID) != 0)
     {
@@ -1656,8 +1562,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
     }
 
   CORBA::InterfaceDefSeq_var supported =
-    bhd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
+    bhd->supported_interfaces ();
 
   CORBA::ULong length = supported->length ();
 
@@ -1675,8 +1580,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
+      str = supported[i]->id ();
 
       if (str.in () == 0
           || ACE_OS::strcmp (str.in (), HOME_SUPPORTED_IDS[i]) != 0)
@@ -1697,8 +1601,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
 }
 
 int
-IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
-                                ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd)
 {
   CORBA::ULong length = hd->factories.length ();
 
@@ -1795,8 +1698,7 @@ IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
 }
 
 int
-IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
-                               ACE_ENV_ARG_DECL_NOT_USED)
+IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd)
 {
   CORBA::ULong length = hd->finders.length ();