diff options
| -rw-r--r-- | CIAO/ChangeLog | 10 | ||||
| -rw-r--r-- | CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp | 4 | ||||
| -rw-r--r-- | CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp | 12 | ||||
| -rw-r--r-- | CIAO/ciao/ComponentServer/CIAO_ComponentServer.h | 2 | ||||
| -rw-r--r-- | CIAO/ciao/Logger/File_Logger_Backend.cpp | 2 | ||||
| -rw-r--r-- | CIAO/tools/XML/XML_Schema_Resolver.h | 4 |
6 files changed, 22 insertions, 12 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 76d75e14f61..75e4463cecc 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,13 @@ +Fri Jun 5 18:17:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * ciao/ComponentServer/CIAO_ComponentServer.cpp + * ciao/ComponentServer/CIAO_ComponentServer.h + * ciao/Logger/File_Logger_Backend.cpp + * ciao/Server_init.cpp + * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp + * tools/XML/XML_Schema_Resolver.h + Unicode fixes + Thu Jun 4 19:12:06 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * DAnCE/ExecutionManager/ExecutionManager_Module.cpp diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp index b9956127f84..edcf725c062 100644 --- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp +++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp @@ -15,7 +15,7 @@ DomainApplicationManager_Impl::DomainApplicationManager_Impl (CORBA::ORB_ptr orb , plan_ (plan) , nodes_ (nodes) { - DANCE_TRACE(DLINFO "DomainApplicationManager_Impl::DomainApplicationManager_Impl"); + DANCE_TRACE(DLINFO ACE_TEXT("DomainApplicationManager_Impl::DomainApplicationManager_Impl")); this->preparePlan(); DANCE_DEBUG((LM_DEBUG, DLINFO "DomainApplicationManager_Impl::DomainApplicationManager_Impl - " "Successfully prepared plan : %C\n", this->plan_.UUID.in())); @@ -160,7 +160,7 @@ DomainApplicationManager_Impl::getApplications () ::Deployment::DeploymentPlan * DomainApplicationManager_Impl::getPlan () { - DANCE_TRACE ( DLINFO "DomainApplicationManager_Impl::getPlan ()"); + DANCE_TRACE ( DLINFO ACE_TEXT("DomainApplicationManager_Impl::getPlan ()")); Deployment::DeploymentPlan* plan = 0; diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp index b7c2eaa6895..126c0309502 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.cpp @@ -83,7 +83,7 @@ namespace CIAO ComponentServer_Task::ComponentServer_Task (int argc, ACE_TCHAR **argv) : orb_ (0), uuid_ (""), - callback_ior_str_ ("") + callback_ior_str_ (ACE_TEXT("")) { CIAO_TRACE ("CIAO_ComponentServer_Task::CIAO_ComponentServer_Task ()"); @@ -169,7 +169,7 @@ namespace CIAO } - if (this->callback_ior_str_ != "") + if (this->callback_ior_str_ != ACE_TEXT("")) { CIAO_DEBUG ((LM_TRACE, CLINFO " resolving callback IOR\n")); CORBA::Object_ptr obj = this->orb_->string_to_object (this->callback_ior_str_.c_str ()); @@ -337,7 +337,7 @@ namespace CIAO CIAO_DEBUG ((LM_DEBUG, CLINFO "ComponentServer_Task::parse_args - " "uuid is %s\n", opts.opt_arg ())); - this->uuid_ = opts.opt_arg (); + this->uuid_ = ACE_TEXT_ALWAYS_CHAR (opts.opt_arg ()); break; case 'c': @@ -370,8 +370,8 @@ namespace CIAO CIAO_ERROR ((LM_ERROR, CLINFO " Unknown option: %s\n", opts.last_option ())); this->usage (); - ACE_TString err (ACE_TEXT("Unknown option ")); - err += opts.last_option (); + ACE_CString err ("Unknown option "); + err += ACE_TEXT_ALWAYS_CHAR (opts.last_option ()); throw Error (err); } } @@ -379,7 +379,7 @@ namespace CIAO // check required options. if (this->uuid_ == "") throw Error ("Option required: -u|--uuid"); - if (this->callback_ior_str_ == "") + if (this->callback_ior_str_ == ACE_TEXT("")) CIAO_ERROR ((LM_WARNING, CLINFO "ComponentServer_Task::parse_args - Starting ComponentServer without a callback IOR\n")); } diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h index 1b89ff461e0..26919ad8486 100644 --- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h +++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer.h @@ -58,7 +58,7 @@ namespace CIAO auto_ptr<CIAO::Logger_Service> logger_; ACE_CString uuid_; - ACE_CString callback_ior_str_; + ACE_TString callback_ior_str_; ACE_TString output_file_; auto_ptr<ComponentServer_Configurator> configurator_; diff --git a/CIAO/ciao/Logger/File_Logger_Backend.cpp b/CIAO/ciao/Logger/File_Logger_Backend.cpp index 192efcd3d0d..1339ab57fbb 100644 --- a/CIAO/ciao/Logger/File_Logger_Backend.cpp +++ b/CIAO/ciao/Logger/File_Logger_Backend.cpp @@ -16,7 +16,7 @@ namespace CIAO if (0 == this->fh_) { ACE_CString s = "Failed to open log file \""; - s += this->filename_; + s += ACE_TEXT_ALWAYS_CHAR(this->filename_); s += "\""; throw LoggerError (s.c_str()); } diff --git a/CIAO/tools/XML/XML_Schema_Resolver.h b/CIAO/tools/XML/XML_Schema_Resolver.h index 5ccc00c4bde..d321be3474f 100644 --- a/CIAO/tools/XML/XML_Schema_Resolver.h +++ b/CIAO/tools/XML/XML_Schema_Resolver.h @@ -88,8 +88,8 @@ namespace CIAO */ struct CIAO_XML_Utils_Export Environment_Resolver { - Environment_Resolver (const ACE_TCHAR *variable = "", - const ACE_TCHAR *path = "./"); + Environment_Resolver (const ACE_TCHAR *variable = ACE_TXT(""), + const ACE_TCHAR *path = ACE_TXT("./")); void add_path (const ACE_TCHAR *variable, const ACE_TCHAR *path); |