diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-30 18:40:22 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2008-09-30 18:40:22 +0000 |
| commit | 3c28fd90c835d4a8fd38134e10b08a0b56de0e23 (patch) | |
| tree | 30dd6c31b107b9a26fad894e7c930a14e0a55914 /TAO/orbsvcs | |
| parent | 0b3693d97f4748351d4797e14626512f4bdaaf3a (diff) | |
| download | ATCD-3c28fd90c835d4a8fd38134e10b08a0b56de0e23.tar.gz | |
Tue Sep 30 18:39:45 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/orbsvcs')
4 files changed, 6 insertions, 6 deletions
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp index d603e93e435..7b51625cbc3 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp +++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp @@ -45,7 +45,7 @@ TAO_WstringDef_i::destroy_i (void) { ACE_TString name; this->repo_->config ()->get_string_value (this->section_key_, - "name", + ACE_TEXT("name"), name); this->repo_->config ()->remove_section (this->repo_->wstrings_key (), @@ -86,7 +86,7 @@ TAO_WstringDef_i::bound_i (void) { u_int retval = 0; this->repo_->config ()->get_integer_value (this->section_key_, - "bound", + ACE_TEXT("bound"), retval); return static_cast<CORBA::ULong> (retval); @@ -106,7 +106,7 @@ void TAO_WstringDef_i::bound_i (CORBA::ULong bound) { this->repo_->config ()->set_integer_value (this->section_key_, - "bound", + ACE_TEXT("bound"), bound); } diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h index 9b098d3d542..aed5dd916d7 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h @@ -213,7 +213,7 @@ namespace TAO /** * A file to which the factory's IOR should be written. */ - const char * ior_output_file_; + const ACE_TCHAR * ior_output_file_; /** * A name to be used to register the factory with the name service. diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp index 1b9aa199347..a4793d84e7e 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp @@ -52,7 +52,7 @@ TAO_PortableGroup_ORBInitializer::pre_init ( // If the application resolves the root POA, make sure we load the PG POA. tao_info->orb_core ()->orb_params ()->poa_factory_name (pg_poa_factory_name); - tao_info->orb_core ()->orb_params ()->poa_factory_directive (ACE_TEXT_ALWAYS_CHAR (pg_poa_factory_directive)); + tao_info->orb_core ()->orb_params ()->poa_factory_directive (pg_poa_factory_directive); } void diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp index 3a16a9f9793..f15e8375597 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp @@ -58,7 +58,7 @@ TAO_UIPMC_Protocol_Factory::make_acceptor (void) int TAO_UIPMC_Protocol_Factory::init (int /* argc */, - char* /* argv */ []) + ACE_TCHAR* /* argv */ []) { return 0; } |