diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp index a4c5a74089d..6c9c5cb3498 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp @@ -1,11 +1,11 @@ // $Id$ -#include "orbsvcs/IFRService/Repository_i.h" -#include "orbsvcs/IFRService/InterfaceDef_i.h" -#include "orbsvcs/IFRService/ValueDef_i.h" -#include "orbsvcs/IFRService/ExtValueDef_i.h" -#include "orbsvcs/IFRService/IFR_Service_Utils.h" -#include "orbsvcs/IFRService/IFR_Service_Utils_T.h" +#include "Repository_i.h" +#include "InterfaceDef_i.h" +#include "ValueDef_i.h" +#include "ExtValueDef_i.h" +#include "IFR_Service_Utils.h" +#include "IFR_Service_Utils_T.h" #include "tao/IFR_Client/IFR_ComponentsC.h" @@ -19,7 +19,6 @@ ACE_RCSID (IFRService, Container_i, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char *TAO_Container_i::tmp_name_holder_ = 0; @@ -201,7 +200,7 @@ TAO_Container_i::lookup_i (const char *search_name ACE_TString section_name; int status = 0; int index = 0; - ssize_t pos = 0; + int pos = 0; int so_far_so_good = 0; u_int kind = 0; CORBA::DefinitionKind def_kind = CORBA::dk_none; @@ -1487,7 +1486,7 @@ TAO_Container_i::create_value_box_i (const char *id, ACE_CHECK_RETURN (CORBA::ValueBoxDef::_nil ()); return CORBA::ValueBoxDef::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::ExceptionDef_ptr @@ -2425,7 +2424,7 @@ TAO_Container_i::update_refs (const char *path, "name", ref_name); - ssize_t pos = ref_name.find (this->repo_->extension ()); + int pos = ref_name.find (this->repo_->extension ()); // If one of the names has been mangled by move(), fix it. if (pos != ACE_TString::npos) @@ -2680,5 +2679,3 @@ TAO_Container_i::create_value_common ( return path; } - -TAO_END_VERSIONED_NAMESPACE_DECL |