diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp index 467086d3cd6..3ae15097ad0 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp @@ -1,5 +1,5 @@ -#include "orbsvcs/Naming/Storable_Naming_Context.h" -#include "orbsvcs/Naming/Bindings_Iterator_T.h" +#include "Storable_Naming_Context.h" +#include "Bindings_Iterator_T.h" #include "tao/debug.h" @@ -16,18 +16,16 @@ #include "ace/Auto_Ptr.h" #include "ace/OS_NS_stdio.h" -ACE_RCSID (Naming, - Storable_Naming_Context, - "$Id$") - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL const char * TAO_Storable_Naming_Context::root_name_; ACE_UINT32 TAO_Storable_Naming_Context::gcounter_; ACE_Auto_Ptr<TAO_Storable_Base> TAO_Storable_Naming_Context::gfl_; int TAO_Storable_Naming_Context::redundant_; +ACE_RCSID (Naming, + Storable_Naming_Context, + "$Id$") + TAO_Storable_IntId::TAO_Storable_IntId (void) : ref_ (CORBA::string_dup ("")), type_ (CosNaming::nobject) @@ -422,7 +420,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check( file_name += context->name_; // Create the stream - fl_ = context->factory_->create_stream(file_name, ACE_TEXT_CHAR_TO_TCHAR(mode)); + fl_ = context->factory_->create_stream(file_name, ACE_TEXT_TO_TCHAR_IN(mode)); if (TAO_Storable_Naming_Context::redundant_) { if (fl_->open() != 0) @@ -534,7 +532,7 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context ( name_ (poa_id), poa_ (PortableServer::POA::_duplicate (poa)), factory_(factory), - persistence_directory_ (ACE_TEXT_ALWAYS_CHAR(persistence_directory)), + persistence_directory_ (ACE_TEXT_TO_CHAR_IN(persistence_directory)), hash_table_size_(hash_table_size), last_changed_(0) { @@ -725,7 +723,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL) poa_id, this->storable_context_->total_size (), this->factory_, - ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()), + ACE_TEXT_TO_TCHAR_IN (this->persistence_directory_.c_str ()), &new_context ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); @@ -1456,12 +1454,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many, } } -TAO_END_VERSIONED_NAMESPACE_DECL - -#include "orbsvcs/Naming/Naming_Service_Container.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - +#include "Naming_Service_Container.h" CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, @@ -1499,8 +1492,8 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( // Now 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); - ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("r"))); + file_name += ACE_TEXT_TO_TCHAR_IN(poa_id); + ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("r"))); if (fl->exists()) { // Load the map from disk @@ -1524,7 +1517,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( file_name += ACE_TEXT("_global"); // Create the stream for the counter used to uniquely creat context names - gfl_.reset(factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("crw"))); + gfl_.reset(factory->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("crw"))); if (gfl_->open() != 0) { delete gfl_.release(); @@ -1546,5 +1539,3 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all( return result._retn (); } - -TAO_END_VERSIONED_NAMESPACE_DECL |