diff options
Diffstat (limited to 'TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp')
| -rw-r--r-- | TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp index bfc77eb5a46..81c83a7f821 100644 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp @@ -95,7 +95,7 @@ TAO::FT_ReplicationManager::~FT_ReplicationManager (void) //public int TAO::FT_ReplicationManager::parse_args (int argc, char * argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:o:f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:o:f:"); int c; while ( (c = get_opts ()) != -1) @@ -208,9 +208,8 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL) else { ACE_ERROR_RETURN ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Could not resolve notifier IOR.\n")), + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Could not resolve notifier IOR.\n")), -1); } } @@ -403,9 +402,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (CORBA::is_nil (fault_notifier)) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Bad Fault Notifier object reference provided.\n") + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Bad Fault Notifier object reference provided.\n") )); ACE_THROW (CORBA::BAD_PARAM ( CORBA::SystemException::_tao_minor_code ( @@ -437,10 +435,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (analyzer == 0) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Error creating FaultAnalyzer.\n" - ) + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Error creating FaultAnalyzer.\n") )); result = -1; } @@ -457,9 +453,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( ACE_CATCHANY { ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - ACE_TEXT ( - "TAO::FT_ReplicationManager::register_fault_notifier_i: " - "Error reinitializing FT_FaultConsumer.\n") + ACE_TEXT ("TAO::FT_ReplicationManager::register_fault_notifier_i: ") + ACE_TEXT ("Error reinitializing FT_FaultConsumer.\n") ); result = -1; } @@ -468,9 +463,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i ( if (result != 0) { ACE_ERROR ( (LM_ERROR, - ACE_TEXT ( - "%T %n (%P|%t) - " - "Could not re-initialize FT_FaultConsumer.\n") + ACE_TEXT ("%T %n (%P|%t) - ") + ACE_TEXT ("Could not re-initialize FT_FaultConsumer.\n") )); ACE_THROW (CORBA::INTERNAL ( @@ -1076,7 +1070,7 @@ TAO::FT_ReplicationManager::delete_object ( int TAO::FT_ReplicationManager::write_ior () { int result = -1; - FILE* out = ACE_OS::fopen (this->ior_output_file_, "w"); + FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w")); if (out) { CORBA::String_var ior_str = this->orb_->object_to_string ( |