ChangeLogTag: Wed Apr 19 07:44:49 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

6 files changed, 39 insertions, 39 deletions

diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 984d61c0e6f..2c77a1e7750 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -381,7 +381,7 @@ int FTClientMain::pass (
         }
         case 'S':
         {
-          if (state.in () != 0)
+          if (state->length () > 0)
           {
             if (this->verbose_ >= LOUD)
             {
@@ -411,7 +411,7 @@ int FTClientMain::pass (
         }
         case 'U':
         {
-          if (update.in () != 0)
+          if (update->length () > 0)
           {
             if (this->verbose_ >= LOUD)
             {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
index 2186ca76647..f6dd2238e12 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -182,7 +182,7 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       candidate =
-        CORBA::Container::_narrow (candidates[i].in ()
+        CORBA::Container::_narrow (candidates[i]
                                    ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN(-1);
 
@@ -219,7 +219,7 @@ IFR_DII_Client::lookup_interface_def (ACE_ENV_SINGLE_ARG_DECL)
       if (!ACE_OS::strcmp (name.in (), this->interface_name.in ()))
         {
           this->target_def_ =
-            CORBA::InterfaceDef::_narrow (interfaces[j].in ()
+            CORBA::InterfaceDef::_narrow (interfaces[j]
                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN(-1);
         }
@@ -250,7 +250,7 @@ IFR_DII_Client::get_operation_def (ACE_ENV_SINGLE_ARG_DECL)
       if (!ACE_OS::strcmp (operation_name.in (), this->op_name.in ()))
         {
           this->op_ =
-            CORBA::OperationDef::_narrow (operations[i].in ()
+            CORBA::OperationDef::_narrow (operations[i]
                                           ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index c291082e7a4..93fa6ae910a 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -5,8 +5,8 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 
-ACE_RCSID (Application_Test, 
-           ifr_dii_client, 
+ACE_RCSID (Application_Test,
+           ifr_dii_client,
            "$Id$")
 
 // All the magic quantities are here at the top.
@@ -30,7 +30,7 @@ const CORBA::ULong ATTRS_LEN = 1;
 const CORBA::ULong OPS_LEN = 1;
 const CORBA::ULong FACTORY_LEN = 2;
 
-const char *ATTR_LOCAL_NAMES[] = 
+const char *ATTR_LOCAL_NAMES[] =
   {
     "c_attr1"
   };
@@ -72,14 +72,14 @@ const char *PARAM_NAMES[] =
     "outarg"
   };
 
-const CORBA::ULong OP_EXCEP_LEN[] = 
+const CORBA::ULong OP_EXCEP_LEN[] =
   {
     2
   };
 
 const CORBA::ULong COMP_SUPPORTED_LEN = 2;
 
-const char *COMP_SUPPORTED_IDS[] = 
+const char *COMP_SUPPORTED_IDS[] =
   {
     "IDL:help/c_supp1:1.0",
     "IDL:help/c_supp2:1.0"
@@ -151,7 +151,7 @@ const char *CONSUMES_IDS[] =
 
 const CORBA::ULong VT_SUPPORTED_LEN = 2;
 
-const char *VT_SUPPORTED_IDS[] = 
+const char *VT_SUPPORTED_IDS[] =
   {
     "IDL:help/v_supp1:1.0",
     "IDL:help/v_supp2:1.0"
@@ -278,7 +278,7 @@ IDL3_Client::init (int argc,
                         -1);
     }
 
-  this->repo_ = 
+  this->repo_ =
     CORBA::ComponentIR::Repository::_narrow (obj.in ()
                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -385,7 +385,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  CORBA::String_var str = 
+  CORBA::String_var str =
     result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -419,7 +419,7 @@ IDL3_Client::component_test (ACE_ENV_SINGLE_ARG_DECL)
                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  CORBA::TypeCode_var comp_tc = 
+  CORBA::TypeCode_var comp_tc =
     comp_def->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -560,7 +560,7 @@ IDL3_Client::home_test (ACE_ENV_SINGLE_ARG_DECL)
       return -1;
     }
 
-  CORBA::ValueDef_var pkey = 
+  CORBA::ValueDef_var pkey =
     home->primary_key (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -658,7 +658,7 @@ IDL3_Client::valuetype_test (const char *repo_id,
       return -1;
     }
 
-  CORBA::ExtValueDef_var evd = 
+  CORBA::ExtValueDef_var evd =
     CORBA::ExtValueDef::_narrow (result.in ()
                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -767,7 +767,7 @@ IDL3_Client::component_attribute_test (
           return -1;
         }
 
-      CORBA::TCKind kind = 
+      CORBA::TCKind kind =
         desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
@@ -873,10 +873,10 @@ IDL3_Client::component_inheritance_test (
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i].in ()->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      if (str.in () == 0 
+      if (str.in () == 0
           || ACE_OS::strcmp (str.in (), COMP_SUPPORTED_IDS[i]) != 0)
         {
           if (this->debug_)
@@ -1200,7 +1200,7 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
       return -1;
     }
 
-  CORBA::InterfaceDefSeq_var supported = 
+  CORBA::InterfaceDefSeq_var supported =
     vd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -1221,10 +1221,10 @@ IDL3_Client::valuetype_inheritance_test (CORBA::ExtValueDef_var &vd,
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i].in ()->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      if (str.in () == 0 
+      if (str.in () == 0
           || ACE_OS::strcmp (str.in (), VT_SUPPORTED_IDS[i]) != 0)
         {
           if (this->debug_)
@@ -1282,7 +1282,7 @@ IDL3_Client::valuetype_attribute_test (
           return -1;
         }
 
-      CORBA::TCKind kind = 
+      CORBA::TCKind kind =
         desc->attributes[i].type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
@@ -1378,7 +1378,7 @@ IDL3_Client::valuetype_operation_test (
           return -1;
         }
 
-      CORBA::TCKind ret_kind = 
+      CORBA::TCKind ret_kind =
         desc->operations[i].result.in ()->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
@@ -1424,7 +1424,7 @@ IDL3_Client::valuetype_operation_test (
                               "wrong name for operation #%d,"
                               "parameter #%d\n",
                               prefix,
-                              i + 1, 
+                              i + 1,
                               j + 1));
                 }
 
@@ -1561,7 +1561,7 @@ IDL3_Client::valuetype_factory_test (
         {
           tmp = desc->initializers[i].members[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, VT_FACTORY_PARAM_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1598,7 +1598,7 @@ IDL3_Client::valuetype_factory_test (
         {
           tmp = desc->initializers[i].exceptions[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, VT_FACTORY_EXCEP_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1623,7 +1623,7 @@ int
 IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
                                     ACE_ENV_ARG_DECL)
 {
-  CORBA::ComponentIR::HomeDef_var bhd = 
+  CORBA::ComponentIR::HomeDef_var bhd =
     hd->base_home (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -1654,7 +1654,7 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
       return -1;
     }
 
-  CORBA::InterfaceDefSeq_var supported = 
+  CORBA::InterfaceDefSeq_var supported =
     bhd->supported_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
@@ -1674,10 +1674,10 @@ IDL3_Client::home_inheritance_test (CORBA::ComponentIR::HomeDef_var &hd
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      str = supported[i].in ()->id (ACE_ENV_SINGLE_ARG_PARAMETER);
+      str = supported[i]->id (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      if (str.in () == 0 
+      if (str.in () == 0
           || ACE_OS::strcmp (str.in (), HOME_SUPPORTED_IDS[i]) != 0)
         {
           if (this->debug_)
@@ -1738,7 +1738,7 @@ IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
         {
           tmp = hd->factories[i].parameters[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, HOME_FACTORY_PARAM_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1773,7 +1773,7 @@ IDL3_Client::home_factory_test (CORBA::ComponentIR::HomeDescription *hd
         {
           tmp = hd->factories[i].exceptions[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, HOME_FACTORY_EXCEP_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1836,7 +1836,7 @@ IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
         {
           tmp = hd->finders[i].parameters[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, HOME_FINDER_PARAM_NAMES[i][j]) != 0)
             {
               if (this->debug_)
@@ -1871,7 +1871,7 @@ IDL3_Client::home_finder_test (CORBA::ComponentIR::HomeDescription *hd
         {
           tmp = hd->finders[i].exceptions[j].name.in ();
 
-          if (tmp == 0 
+          if (tmp == 0
               || ACE_OS::strcmp (tmp, HOME_FINDER_EXCEP_NAMES[i][j]) != 0)
             {
               if (this->debug_)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
index b92a0f35abc..3c76d0785bb 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
@@ -18,7 +18,7 @@ void printContents( const CORBA::ContainedSeq& cont )
           if( cont[i]->describe()->kind == CORBA::dk_Interface )
             {
               CORBA::InterfaceDef_var intDef =
-                CORBA::InterfaceDef::_narrow (cont[i].in()
+                CORBA::InterfaceDef::_narrow (cont[i]
                 ACE_ENV_ARG_PARAMETER );
               ACE_TRY_CHECK;
 
@@ -41,7 +41,7 @@ void printContents( const CORBA::ContainedSeq& cont )
           else if( cont[i]->describe ()->kind == CORBA::dk_Module )
             {
               CORBA::ModuleDef_var moduleDef =
-                CORBA::ModuleDef::_narrow (cont[i].in ()
+                CORBA::ModuleDef::_narrow (cont[i]
                                            ACE_ENV_ARG_PARAMETER );
               ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 533dbbd1ee2..ef26b0b054d 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -2749,7 +2749,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
 
   for (i = 0; i < length; ++i)
     {
-      base_iface_id = ifd->base_interfaces[i].in ();
+      base_iface_id = ifd->base_interfaces[i];
 
       if (this->debug_)
         {
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index c70370c4512..282c96ae920 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -76,7 +76,7 @@ TAO_Service_Type_Exporter::add_all_types (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::"
               "adding all types to the Repository.\n"));
-  this->add_all_types_to (this->repos_.ptr () ACE_ENV_ARG_PARAMETER);
+  this->add_all_types_to (this->repos_.in () ACE_ENV_ARG_PARAMETER);
   // ACE_CHECK;
 }