diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp index b2bb63bf6cf..306b7bd00a6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp @@ -12,21 +12,19 @@ // // ============================================================================ -#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h" +#include "Storable_Naming_Context_Activator.h" #if (TAO_HAS_MINIMUM_POA == 0) -#include "orbsvcs/Naming/Naming_Context_Interface.h" -#include "orbsvcs/Naming/Storable_Naming_Context.h" -#include "orbsvcs/Naming/Storable.h" +#include "Naming_Context_Interface.h" +#include "Storable_Naming_Context.h" +#include "Storable.h" #include "ace/Auto_Ptr.h" -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TAO_Storable_Naming_Context_Activator::TAO_Storable_Naming_Context_Activator ( - CORBA::ORB_ptr orb, - TAO_Naming_Service_Persistence_Factory *factory, - const ACE_TCHAR *persistence_directory, - size_t context_size) +TAO_Storable_Naming_Context_Activator:: +TAO_Storable_Naming_Context_Activator (CORBA::ORB_ptr orb, + TAO_Naming_Service_Persistence_Factory *factory, + const ACE_TCHAR *persistence_directory, + size_t context_size) : orb_(orb), factory_(factory), persistence_directory_(persistence_directory), @@ -40,10 +38,9 @@ TAO_Storable_Naming_Context_Activator::~TAO_Storable_Naming_Context_Activator () } PortableServer::Servant -TAO_Storable_Naming_Context_Activator::incarnate ( - const PortableServer::ObjectId &oid, - PortableServer::POA_ptr poa - ACE_ENV_ARG_DECL) +TAO_Storable_Naming_Context_Activator::incarnate (const PortableServer::ObjectId &oid, + PortableServer::POA_ptr poa + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableServer::ForwardRequest)) { @@ -62,8 +59,8 @@ TAO_Storable_Naming_Context_Activator::incarnate ( // Does this already exist on disk? ACE_TString file_name(persistence_directory_); file_name += ACE_TEXT("/"); - file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id.in()); - TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("rw")); + file_name += ACE_TEXT_TO_TCHAR_IN(poa_id.in()); + TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("rw")); if (!fl->exists()) { ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); @@ -106,13 +103,12 @@ TAO_Storable_Naming_Context_Activator::incarnate ( } void -TAO_Storable_Naming_Context_Activator::etherealize ( - const PortableServer::ObjectId &/*oid*/, - PortableServer::POA_ptr /*adapter*/, - PortableServer::Servant servant, - CORBA::Boolean /*cleanup_in_progress*/, - CORBA::Boolean remaining_activations - ACE_ENV_ARG_DECL_NOT_USED) +TAO_Storable_Naming_Context_Activator::etherealize (const PortableServer::ObjectId &/*oid*/, + PortableServer::POA_ptr /*adapter*/, + PortableServer::Servant servant, + CORBA::Boolean /*cleanup_in_progress*/, + CORBA::Boolean remaining_activations + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (!remaining_activations) { @@ -120,6 +116,4 @@ TAO_Storable_Naming_Context_Activator::etherealize ( } } -TAO_END_VERSIONED_NAMESPACE_DECL - #endif /* TAO_HAS_MINIMUM_POA */ |