diff options
Diffstat (limited to 'TAO/orbsvcs/LifeCycle_Service')
-rw-r--r-- | TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp | 2 | ||||
-rw-r--r-- | TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp index 3e2270c5442..4e095a93a6c 100644 --- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp @@ -73,7 +73,7 @@ Criteria_Evaluator::getCriteriaMember (const char *member_name) i < criteria_.length(); i++) if (ACE_OS::strcmp (member_name, - criteria_[i].name) == 0) + criteria_[i].name.in()) == 0) { CORBA::Any_ptr value_ptr; diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp index 0a3c9a68cf8..0ce00f92d5e 100644 --- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp +++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp @@ -88,7 +88,7 @@ Life_Cycle_Service_Server::init (int argc, ACE_CHECK_RETURN (-1); if (this->debug_level_ >= 2) - ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_CHAR_TO_TCHAR(str.in ()))); + ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_TO_TCHAR_IN(str.in ()))); // Register the LifeCycle Service with the Naming Service. ACE_TRY @@ -166,7 +166,7 @@ u_int Life_Cycle_Service_Server::parse_args (int argc, ACE_TCHAR* argv[]) { - ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("?d:")); + ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("?d:")); int opt; int exit_code = 0; |