diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2004-01-29 20:12:03 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2004-01-29 20:12:03 +0000 |
| commit | 28479f8cbd01d77d0027fada8a2483b4da131ea4 (patch) | |
| tree | 2e75ba36eda8a291b97465aea70409469581efe8 | |
| parent | bf0009c3ebff395bc22fd345aa1386b30cbe209e (diff) | |
| download | ATCD-28479f8cbd01d77d0027fada8a2483b4da131ea4.tar.gz | |
ChangeLogTag:Thu Jan 29 14:10:27 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
55 files changed, 233 insertions, 182 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 3f58f4d9505..cd176c70bce 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,64 @@ +Thu Jan 29 14:10:27 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * TAO/tao/Acceptor_Impl.cpp: + * TAO/tao/Asynch_Queued_Message.cpp: + * TAO/tao/CORBALOC_Parser.cpp: + * TAO/tao/Codeset_Manager.cpp: + * TAO/tao/Connection_Handler.cpp: + * TAO/tao/DLL_ORB.cpp: + * TAO/tao/Environment.cpp: + * TAO/tao/GIOP_Message_Base.cpp: + * TAO/tao/GIOP_Message_Generator_Parser.cpp: + * TAO/tao/GIOP_Message_Lite.cpp: + * TAO/tao/IIOP_Acceptor.cpp: + * TAO/tao/IIOP_Connector.cpp: + * TAO/tao/IIOP_Profile.cpp: + * TAO/tao/Incoming_Message_Queue.cpp: + * TAO/tao/Invocation_Adapter.cpp: + * TAO/tao/MCAST_Parser.cpp: + * TAO/tao/NVList.cpp: + * TAO/tao/ORB.cpp: + * TAO/tao/ORB_Core.cpp: + * TAO/tao/Object_Ref_Table.cpp: + * TAO/tao/Profile.cpp: + * TAO/tao/Sequence.cpp: + * TAO/tao/Synch_Invocation.cpp: + * TAO/tao/Synch_Queued_Message.cpp: + * TAO/tao/Synch_Reply_Dispatcher.cpp: + * TAO/tao/TAO_Internal.cpp: + * TAO/tao/Thread_Per_Connection_Handler.cpp: + * TAO/tao/Transport.cpp: + * TAO/tao/Transport_Cache_Manager.cpp: + * TAO/tao/Transport_Connector.cpp: + * TAO/tao/Typecode.cpp: + * TAO/tao/default_resource.cpp: + * TAO/tao/skip.cpp: + * TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp: + * TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp: + * TAO/tao/PortableServer/Operation_Table.cpp: + * TAO/tao/PortableServer/POA.cpp: + * TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp: + * TAO/tao/RTScheduling/Request_Interceptor.cpp: + * TAO/tao/Strategies/DIOP_Acceptor.cpp: + * TAO/tao/Strategies/DIOP_Connection_Handler.cpp: + * TAO/tao/Strategies/DIOP_Profile.cpp: + * TAO/tao/Strategies/DIOP_Transport.cpp: + * TAO/tao/Strategies/SCIOP_Acceptor.cpp: + * TAO/tao/Strategies/SCIOP_Profile.cpp: + * TAO/tao/Strategies/SCIOP_Transport.cpp: + * TAO/tao/Strategies/SHMIOP_Acceptor.cpp: + * TAO/tao/Strategies/SHMIOP_Connector.cpp: + * TAO/tao/Strategies/SHMIOP_Profile.cpp: + * TAO/tao/Strategies/UIOP_Acceptor.cpp: + * TAO/tao/Strategies/UIOP_Connector.cpp: + * TAO/tao/Strategies/UIOP_Profile.cpp: + * TAO/tao/Strategies/advanced_resource.cpp: + * TAO/tao/Utils/Server_Main.cpp: + + Thanks to Duane Binder<duane.binder@veritas.com> for providing + patches to fix some of the messages printed out using + ACE_Log_Msg. + Thu Jan 29 14:03:42 2004 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/orbsvcs/ec_typed_events.mpb: diff --git a/TAO/tao/Acceptor_Impl.cpp b/TAO/tao/Acceptor_Impl.cpp index c056a09f0ca..f1abf134d1a 100644 --- a/TAO/tao/Acceptor_Impl.cpp +++ b/TAO/tao/Acceptor_Impl.cpp @@ -163,11 +163,11 @@ TAO_Concurrency_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *sh, if (TAO_debug_level > 0) { - const char *error = 0; + const ACE_TCHAR *error = 0; if (f->activate_server_connections ()) - error = "could not activate new connection"; + error = ACE_LIB_TEXT("could not activate new connection"); else - error = "could not register new connection in the reactor"; + error = ACE_LIB_TEXT("could not register new connection in the reactor"); ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - Concurrency_Strategy::activate_svc_handler, " diff --git a/TAO/tao/Asynch_Queued_Message.cpp b/TAO/tao/Asynch_Queued_Message.cpp index 70a03a2f040..d55a5530872 100644 --- a/TAO/tao/Asynch_Queued_Message.cpp +++ b/TAO/tao/Asynch_Queued_Message.cpp @@ -135,7 +135,7 @@ TAO_Asynch_Queued_Message::clone (ACE_Allocator *alloc) { // This debug is for testing purposes! ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Asynch_Queued_Message::clone\n", + "TAO (%P|%t) - Asynch_Queued_Message::clone\n" "Using global pool for allocation \n")); } diff --git a/TAO/tao/CORBALOC_Parser.cpp b/TAO/tao/CORBALOC_Parser.cpp index 423836b125f..856d1ca4b8e 100644 --- a/TAO/tao/CORBALOC_Parser.cpp +++ b/TAO/tao/CORBALOC_Parser.cpp @@ -66,7 +66,7 @@ TAO_CORBALOC_Parser::parse_string_count_helper (const char * s, if (TAO_debug_level > 0) ACE_ERROR((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid Syntax: %s\n"), - s)); + ACE_TEXT_CHAR_TO_TCHAR (s))); ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10, CORBA::COMPLETED_NO)); diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp index 48767ed0b30..3bb45eca015 100644 --- a/TAO/tao/Codeset_Manager.cpp +++ b/TAO/tao/Codeset_Manager.cpp @@ -327,8 +327,8 @@ TAO_Codeset_Manager::add_char_translator (const char *name) { ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("(%P|%t) Unable to add Codeset ") - ACE_LIB_TEXT ("factories for %s: %p\n"), - name), + ACE_LIB_TEXT ("factories for %s: %m\n"), + ACE_TEXT_CHAR_TO_TCHAR (name)), -1); } @@ -345,8 +345,8 @@ TAO_Codeset_Manager::add_wchar_translator (const char *name) { ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("(%P|%t) Unable to add Codeset ") - ACE_LIB_TEXT ("factories for %s: %p\n"), - name), + ACE_LIB_TEXT ("factories for %s: %m\n"), + ACE_TEXT_CHAR_TO_TCHAR (name)), -1); } @@ -403,8 +403,8 @@ TAO_Codeset_Manager::init_codeset_factories_i ( { ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("TAO (%P|%t) Unable to load ") - ACE_LIB_TEXT ("CodeSet <%s>, %p\n"), - ACE_TEXT_CHAR_TO_TCHAR(name), "")); + ACE_LIB_TEXT ("CodeSet <%s>, %m\n"), + ACE_TEXT_CHAR_TO_TCHAR(name))); continue; } diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index d76d7faafb1..0231bbcb364 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -42,7 +42,7 @@ TAO_Connection_Handler::~TAO_Connection_Handler (void) { ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - Connection_Handler::~Connection_Handler," - "release_os_resources() failed %p\n")); + "release_os_resources() failed %m\n")); } // @@ TODO Use auto_ptr<> diff --git a/TAO/tao/DLL_ORB.cpp b/TAO/tao/DLL_ORB.cpp index 420d606d95f..89a990302e5 100644 --- a/TAO/tao/DLL_ORB.cpp +++ b/TAO/tao/DLL_ORB.cpp @@ -7,6 +7,7 @@ #include "tao/CORBA_methods.h" #include "ace/ARGV.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID (tao, DLL_ORB, @@ -62,7 +63,7 @@ TAO_DLL_ORB::init (int /*argc*/, ACE_TCHAR *argv[]) int new_argc = new_argv.argc (); -#if defined (ACE_HAS_WINCE) +#if defined (ACE_HAS_WINCE) || defined (ACE_USES_WCHAR) { // Copy command line parameter from new_argv. ACE_Argv_Type_Converter command_line(new_argc, new_argv.argv()); diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp index 592582e3115..a950fb105ca 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp @@ -51,7 +51,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( if (TAO_debug_level > 2) ACE_ERROR (( LM_ERROR, - "TAO (%P|%t) - DII_Deferred_Reply_Dispatcher::dispatch_reply ", + "TAO (%P|%t) - DII_Deferred_Reply_Dispatcher::dispatch_reply " "clone_from failed \n")); return -1; } diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 1ffe446a74c..44970378122 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -183,7 +183,7 @@ CORBA::Environment::print_exception (const char *info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"), - info)); + ACE_TEXT_CHAR_TO_TCHAR (info))); CORBA::SystemException *x2 = CORBA::SystemException::_downcast (this->exception_); @@ -196,11 +196,11 @@ CORBA::Environment::print_exception (const char *info, ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"), - id)); + ACE_TEXT_CHAR_TO_TCHAR (id))); } else ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), info)); + ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (info))); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 76aeeaee51e..bfe704826f0 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1284,7 +1284,7 @@ TAO_GIOP_Message_Base::send_error (TAO_Transport *transport) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %lu\n"), + ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %u\n"), transport->id ())); } @@ -1409,7 +1409,7 @@ TAO_GIOP_Message_Base:: { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "(%P|%t) error closing connection %lu, errno = %d\n", + "(%P|%t) error closing connection %u, errno = %d\n", transport->id (), errno)); } @@ -1529,7 +1529,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, "TAO (%P|%t) - GIOP_Message_Base::dump_msg, " "%s GIOP v%c.%c msg, %d data bytes, %s endian, " "Type %s[%u]\n", - label, + ACE_TEXT_CHAR_TO_TCHAR (label), digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]], digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]], len - TAO_GIOP_MESSAGE_HEADER_LEN , diff --git a/TAO/tao/GIOP_Message_Generator_Parser.cpp b/TAO/tao/GIOP_Message_Generator_Parser.cpp index 37c2497f9db..5ab223e8171 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp @@ -23,8 +23,8 @@ TAO_GIOP_Message_Generator_Parser::parse_reply ( { if (TAO_debug_level) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply, \n ") - ACE_TEXT ("extracting request id"))); + ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply :") + ACE_TEXT ("extracting request id\n"))); } // and the reply status type. status can be NO_EXCEPTION, @@ -36,8 +36,8 @@ TAO_GIOP_Message_Generator_Parser::parse_reply ( { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply, \n ") - ACE_TEXT ("extracting reply status"))); + ACE_TEXT ("TAO (%P|%t) : TAO_GIOP_Message_Generator_Parser::parse_reply, ") + ACE_TEXT ("extracting reply status\n"))); return -1; } @@ -101,7 +101,7 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply ( if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, ACE_TEXT ("TAO (%P|%t|%N|%l):parse_locate_reply, ") - ACE_TEXT ("extracting request id \n"))); + ACE_TEXT ("extracting request id\n"))); return -1; } diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp index 462266dd9bf..6f749804802 100644 --- a/TAO/tao/GIOP_Message_Lite.cpp +++ b/TAO/tao/GIOP_Message_Lite.cpp @@ -666,7 +666,7 @@ TAO_GIOP_Message_Lite::generate_exception_reply ( // Close the handle. ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ") - ACE_TEXT ("generate_exception_reply ()"))); + ACE_TEXT ("generate_exception_reply ()\n"))); return -1; } ACE_ENDTRY; @@ -1079,7 +1079,7 @@ TAO_GIOP_Message_Lite::parse_reply (TAO_InputCDR &cdr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t|%N|%l) : ") ACE_TEXT ("TAO_GIOP_Message_Lite::parse_reply, ") - ACE_TEXT ("extracting request id"))); + ACE_TEXT ("extracting request id\n"))); } return -1; @@ -1469,7 +1469,7 @@ TAO_GIOP_Message_Lite::send_reply_exception ( // Close the handle. ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception on transport %lu: %p\n"), + ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception on transport %u: %p\n"), transport->id (), ACE_TEXT ("send_reply_exception ()"))); return -1; @@ -1553,7 +1553,7 @@ TAO_GIOP_Message_Lite::send_error (TAO_Transport *transport) { ACE_DEBUG (( LM_DEBUG, - ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %lu, errno = %d\n"), + ACE_TEXT ("TAO (%N|%l|%P|%t) error sending error to transport %u, errno = %d\n"), transport->id (), errno )); } @@ -1612,10 +1612,10 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P | %t):%s GIOP lite msg, ") ACE_TEXT ("%d data bytes, %s endian, <%s = %d> \n"), - label, + ACE_TEXT_CHAR_TO_TCHAR(label), len - TAO_GIOP_LITE_HEADER_LEN, - (byte_order == TAO_ENCAP_BYTE_ORDER) ? "my" : "other", - message_name, + (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_LIB_TEXT("my") : ACE_LIB_TEXT("other"), + ACE_TEXT_CHAR_TO_TCHAR (message_name), *id)); if (TAO_debug_level >= 10) diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index 02766f36109..501537ca615 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -278,7 +278,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, // This is bad mojo, i.e. an internal TAO error. ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") - ACE_TEXT ("IIOP_Acceptor::open, "), + ACE_TEXT ("IIOP_Acceptor::open, ") ACE_TEXT ("hostname already set\n\n")), -1); } @@ -365,7 +365,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Overriding address in IOR with %s\n"), - this->hostname_in_ior_)); + ACE_TEXT_CHAR_TO_TCHAR (this->hostname_in_ior_))); } if (this->hostname (orb_core, addr, @@ -409,7 +409,7 @@ TAO_IIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, // This is bad mojo, i.e. an internal TAO error. ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") - ACE_TEXT ("IIOP_Acceptor::open_default - "), + ACE_TEXT ("IIOP_Acceptor::open_default - ") ACE_TEXT ("hostname already set\n\n")), -1); } @@ -723,7 +723,7 @@ TAO_IIOP_Acceptor::probe_interfaces (TAO_ORB_Core *orb_core) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Overriding address in IOR with %s\n"), - this->hostname_in_ior_)); + ACE_TEXT_CHAR_TO_TCHAR (this->hostname_in_ior_))); } if (this->hostname (orb_core, if_addrs[i], @@ -796,7 +796,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile, { ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("TAO (%P|%t) TAO_IIOP_Acceptor::object_key - ") - ACE_LIB_TEXT ("error while decoding host/port"))); + ACE_LIB_TEXT ("error while decoding host/port\n"))); } return -1; } @@ -874,7 +874,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) IIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - opt.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR ( opt.c_str ())), -1); ACE_CString name = opt.substring (0, slot); @@ -890,8 +890,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ") - ACE_TEXT ("endpoint priorities no longer supported. \n"), - value.c_str ()), + ACE_TEXT ("endpoint priorities no longer supported. \n")), -1); } else if (name == "portspan") @@ -903,7 +902,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str) ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint ") ACE_TEXT ("portspan: <%s>\n") ACE_TEXT ("Valid range 1 -- %d\n"), - value.c_str (), ACE_MAX_DEFAULT_PORT), + ACE_TEXT_CHAR_TO_TCHAR (value.c_str ()), ACE_MAX_DEFAULT_PORT), -1); this->port_span_ = ACE_static_cast (u_short, range); @@ -915,7 +914,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str) else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid IIOP option: <%s>\n"), - name.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())), -1); } } diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 39e3aa883c6..895c2bac8bb 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -148,7 +148,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - IIOP_Connector::make_connection, " "to <%s:%d>\n", - iiop_endpoint->host(), iiop_endpoint->port())); + ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()), iiop_endpoint->port())); // Get the right synch options ACE_Synch_Options synch_options; @@ -274,8 +274,8 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_ERROR, "TAO (%P|%t) - IIOP_Connector::make_connection, " "connection to <%s:%d> failed (%p)\n", - iiop_endpoint->host (), iiop_endpoint->port (), - "errno")); + ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host ()), iiop_endpoint->port (), + ACE_LIB_TEXT("errno"))); } return 0; @@ -287,7 +287,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - IIOP_Connector::make_connection, " "new connection to <%s:%d> on Transport[%d]\n", - iiop_endpoint->host (), iiop_endpoint->port (), + ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host ()), iiop_endpoint->port (), svc_handler->peer ().get_handle ())); TAO_Transport *transport = diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index f9f74e78923..560b82cf256 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -92,7 +92,7 @@ TAO_IIOP_Profile::decode_profile (TAO_InputCDR& cdr) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) IIOP_Profile::decode - ") - ACE_TEXT ("error while decoding host/port"))); + ACE_TEXT ("error while decoding host/port\n"))); return -1; } @@ -366,7 +366,7 @@ TAO_IIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const else { ACE_ERROR ((LM_ERROR, - "(%P|%t) TAO - IIOP_Profile::create_profile_body ", + "(%P|%t) TAO - IIOP_Profile::create_profile_body " "no object key marshalled \n")); } diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp index 14970106b50..921ae744613 100644 --- a/TAO/tao/Incoming_Message_Queue.cpp +++ b/TAO/tao/Incoming_Message_Queue.cpp @@ -195,7 +195,7 @@ TAO_Queued_Data::get_queued_data (ACE_Allocator *alloc) { // This debug is for testing purposes! ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Queued_Data::get_queued_data\n", + "TAO (%P|%t) - Queued_Data::get_queued_data\n" "Using global pool for allocation \n")); } diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp index dc250d22850..b50fbffa936 100644 --- a/TAO/tao/Invocation_Adapter.cpp +++ b/TAO/tao/Invocation_Adapter.cpp @@ -131,7 +131,7 @@ namespace TAO { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Invocation_Adapter::invoke_collocated, ", + "TAO (%P|%t) - Invocation_Adapter::invoke_collocated, " "handling forwarded locations \n")); } diff --git a/TAO/tao/MCAST_Parser.cpp b/TAO/tao/MCAST_Parser.cpp index c5920d67530..3f2e541f125 100644 --- a/TAO/tao/MCAST_Parser.cpp +++ b/TAO/tao/MCAST_Parser.cpp @@ -137,7 +137,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf, { ACE_ERROR ((LM_ERROR, ACE_TEXT ("acceptor.open () || ") - ACE_TEXT ("acceptor.get_local_addr () failed"))); + ACE_TEXT ("acceptor.get_local_addr () failed\n"))); result = -1; } else @@ -236,9 +236,8 @@ TAO_MCAST_Parser::multicast_query (char *&buf, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("\n%s; Sent multicast.") + ACE_TEXT ("\n%N; Sent multicast.") ACE_TEXT ("# of bytes sent is %d.\n"), - __FILE__, result)); // Wait for response until timeout. ACE_Time_Value tv ( @@ -305,9 +304,8 @@ TAO_MCAST_Parser::multicast_query (char *&buf, ACE_TEXT ("error reading ior"))); else if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("%s: service resolved to IOR <%s>\n"), - __FILE__, - buf)); + ACE_TEXT ("%N: service resolved to IOR <%s>\n"), + ACE_TEXT_CHAR_TO_TCHAR (buf))); } } } @@ -317,7 +315,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf, { ACE_ERROR ((LM_ERROR, ACE_TEXT("\nmulticast discovery of %s failed.\n"), - service_name)); + ACE_TEXT_CHAR_TO_TCHAR (service_name))); if (ACE_OS::strcasecmp (service_name, "NameService") == 0) diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index c1edc73a224..7dabc913864 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -76,7 +76,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply ( if (TAO_debug_level > 2) ACE_ERROR (( LM_ERROR, - "TAO (%P|%t) - Asynch_Reply_Dispatcher::dispatch_reply ", + "TAO (%P|%t) - Asynch_Reply_Dispatcher::dispatch_reply " "clone_from failed \n")); return -1; } diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index b153c634cad..494ffd266eb 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -371,7 +371,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"), - arg)); + ACE_TEXT_CHAR_TO_TCHAR (arg))); } CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode (); (void) TAO_Marshal_Object::perform_append (tc, @@ -442,7 +442,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"), - nv->name ()? nv->name () : "(no name given)" )); + ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" ))); } CORBA::Any_ptr any = nv->value (); diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 6391baf2f16..a03bf354117 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -1339,10 +1339,9 @@ CORBA::ORB::init_orb_globals (ACE_ENV_SINGLE_ARG_DECL) || sizeof (void *) != ACE_SIZEOF_VOID_P) { ACE_DEBUG ((LM_DEBUG, - "%s; ERROR: unexpected basic type size; " + "%N; ERROR: unexpected basic type size; " "s:%d l:%d ll:%d f:%d d:%d ld:%d wc:%d v:%d\n" "please reconfigure TAO\n", - __FILE__, sizeof (CORBA::Short), sizeof (CORBA::Long), sizeof (CORBA::LongLong), diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index e470c4ed255..28ea51c30d0 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -633,7 +633,8 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) pos - current_arg); ACE_CString IOR (ACE_TEXT_ALWAYS_CHAR(pos + 1)); if (this->init_ref_map_.bind (object_id, IOR) != 0) - { ACE_ERROR ((LM_ERROR, + { + ACE_ERROR ((LM_ERROR, ACE_LIB_TEXT ("Cannot store ORBInitRef ") ACE_LIB_TEXT ("argument '%s'\n"), current_arg)); @@ -709,7 +710,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL) CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (-1); - output_stream->open (file_name, ios::out | ios::app); + output_stream->open (ACE_TEXT_ALWAYS_CHAR (file_name), ios::out | ios::app); if (!output_stream->bad ()) { @@ -1150,7 +1151,7 @@ TAO_ORB_Core::fini (void) { ACE_DEBUG ((LM_DEBUG, ACE_LIB_TEXT ("Destroying ORB <%s>\n"), - this->orbid_)); + ACE_TEXT_CHAR_TO_TCHAR (this->orbid_))); } // Finalize lane resources. @@ -1822,9 +1823,9 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, { if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - ORB_Core::run, " - "start [%s]\n", - perform_work?"perform_work":"run")); + ACE_LIB_TEXT ("TAO (%P|%t) - ORB_Core::run, ") + ACE_LIB_TEXT ("start [%s]\n"), + perform_work?ACE_LIB_TEXT("perform_work"):ACE_LIB_TEXT("run"))); // Fetch the Reactor ACE_Reactor *r = this->reactor (); @@ -1875,15 +1876,15 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("TAO (%P|%t) - ORB_Core::run, " - "calling handle_events()\n"))); + ACE_LIB_TEXT ("TAO (%P|%t) - ORB_Core::run, ") + ACE_LIB_TEXT ( "calling handle_events()\n"))); result = r->handle_events (tv); if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("TAO (%P|%t) - ORB_Core::run, " - "handle_events() returns %d\n"), + ACE_LIB_TEXT ("TAO (%P|%t) - ORB_Core::run, ") + ACE_LIB_TEXT ("handle_events() returns %d\n"), result)); if (result == -1) @@ -2095,7 +2096,7 @@ TAO_ORB_Core::destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 3) { ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) Exception in TAO_ORB_Core"), + ACE_LIB_TEXT ("(%P|%t) Exception in TAO_ORB_Core") ACE_LIB_TEXT ("::destroy_interceptors () \n"))); } } diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index 481afa2a4a4..4f9e8c8565e 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -46,10 +46,10 @@ TAO_Object_Ref_Table::register_initial_reference ( if (TAO_debug_level > 1) { ACE_ERROR ((LM_ERROR, - "(%P|%t) Object_Ref_Table::register_initial_reference:" - " Could not register duplicate object <%s> " - "with the ORB\n", - id)); + ACE_LIB_TEXT ("(%P|%t) Object_Ref_Table::register_initial_reference:") + ACE_LIB_TEXT (" Could not register duplicate object <%s> ") + ACE_LIB_TEXT ("with the ORB\n"), + ACE_TEXT_CHAR_TO_TCHAR (id))); } ACE_THROW (CORBA::ORB::InvalidName ()); @@ -59,10 +59,10 @@ TAO_Object_Ref_Table::register_initial_reference ( { if (TAO_debug_level > 1) ACE_ERROR ((LM_ERROR, - "(%P|%t) Object_Ref_Table::register_initial_reference:" - " Could not register object <%s> with " - "the ORB\n", - id)); + ACE_LIB_TEXT ("(%P|%t) Object_Ref_Table::register_initial_reference:") + ACE_LIB_TEXT (" Could not register object <%s> with ") + ACE_LIB_TEXT ("the ORB\n"), + ACE_TEXT_CHAR_TO_TCHAR (id))); ACE_THROW (CORBA::INTERNAL ()); } diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index c9c25c2214c..0d0584823f1 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -351,7 +351,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ") ACE_TEXT ("operation '%s' (length=%d) failed\n"), - opname ? opname : "<null string>", length), + ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length), -1); } @@ -377,7 +377,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ") ACE_TEXT ("operation '%s' (length=%d) failed\n"), - opname ? opname : "<null string>", length), + ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length), -1); } diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 07a0f206e24..71bb5ca25a3 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -3612,7 +3612,7 @@ TAO_POA::key_to_object (const TAO::ObjectKey &key, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "IMR IOR = \n%s\n", - imr_str.in ())); + ACE_TEXT_CHAR_TO_TCHAR (imr_str.in ()))); // Search for "corbaloc:" alone, without the protocol. This code // should be protocol neutral. @@ -3645,7 +3645,7 @@ TAO_POA::key_to_object (const TAO::ObjectKey &key, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "ImR-ified IOR = \n%s\n", - ior.c_str ())); + ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ()))); obj = this->orb_core_.orb ()->string_to_object (ior.c_str () @@ -3799,7 +3799,7 @@ TAO_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL) ACE_DEBUG ((LM_WARNING, "(%P|%t) Exception thrown while processing " "IORInterceptor \"%s\">\n", - name.in ())); + ACE_TEXT_CHAR_TO_TCHAR (name.in ()))); } ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION, @@ -4091,7 +4091,7 @@ TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Informing IMR that we are running at: %s\n", - partial_ior.c_str())); + ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str()))); char host_name[MAXHOSTNAMELEN + 1]; ACE_OS::hostname (host_name, MAXHOSTNAMELEN); diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp index f5485fc9832..52ae14fe87e 100644 --- a/TAO/tao/Profile.cpp +++ b/TAO/tao/Profile.cpp @@ -518,8 +518,8 @@ TAO_Profile::policies (ACE_ENV_SINGLE_ARG_DECL) if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("The IOR contains unsupported " - "policies.\n"))); + ACE_TEXT ("The IOR contains unsupported ") + ACE_TEXT ("policies.\n"))); } } ACE_CATCHANY diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp index 631206640af..67bed6488be 100644 --- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp +++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp @@ -183,8 +183,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("%s processing using %s ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("not changed\n"), - priority_model, - thread_pool_id, + ACE_TEXT_CHAR_TO_TCHAR (priority_model), + ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_)); @@ -196,8 +196,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("%s processing using %s ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority ") ACE_TEXT ("not changed\n"), - priority_model, - thread_pool_id)); + ACE_TEXT_CHAR_TO_TCHAR (priority_model), + ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id))); #endif /* ACE_HAS_THREADS */ @@ -237,8 +237,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("%s processing using %s ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"), - priority_model, - thread_pool_id, + ACE_TEXT_CHAR_TO_TCHAR (priority_model), + ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_, target_priority, @@ -254,8 +254,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request ( ACE_TEXT ("%s processing using %s ") ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ") ACE_TEXT ("is the same as the target priority\n"), - priority_model, - thread_pool_id, + ACE_TEXT_CHAR_TO_TCHAR (priority_model), + ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id), pre_invoke_state.original_CORBA_priority_, pre_invoke_state.original_native_priority_)); } diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp index adf013c0f12..399d04a9748 100644 --- a/TAO/tao/RTScheduling/Request_Interceptor.cpp +++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp @@ -201,7 +201,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Received Exception %s\n", - id)); + ACE_TEXT_CHAR_TO_TCHAR (id))); // If the remote host threw a THREAD_CANCELLED diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp index 53c860edfbb..df093dc4bf9 100644 --- a/TAO/tao/Sequence.cpp +++ b/TAO/tao/Sequence.cpp @@ -56,7 +56,7 @@ check_bounds( ACE_ERROR((LM_ERROR, "Access error in TAO_Sequence file=%s, line=%u, " "idx=%u, max=%u\n", - filename, lineno, tao_idx, tao_max)); + ACE_TEXT_CHAR_TO_TCHAR (filename), lineno, tao_idx, tao_max)); } } diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index bdca8d2d02e..85846a00f41 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -244,7 +244,7 @@ TAO_DIOP_Acceptor::open (TAO_ORB_Core *orb_core, // This is bad mojo, i.e. an internal TAO error. ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") - ACE_TEXT ("DIOP_Acceptor::open - "), + ACE_TEXT ("DIOP_Acceptor::open - ") ACE_TEXT ("hostname already set\n\n")), -1); } @@ -358,7 +358,7 @@ TAO_DIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, // This is bad mojo, i.e. an internal TAO error. ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") - ACE_TEXT ("DIOP_Acceptor::open_default - "), + ACE_TEXT ("DIOP_Acceptor::open_default - ") ACE_TEXT ("hostname already set\n\n")), -1); } @@ -429,7 +429,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nTAO (%P|%t) DIOP_Acceptor::open_i - ") ACE_TEXT ("listening on: <%s:%u>\n"), - this->hosts_[i], + ACE_TEXT_CHAR_TO_TCHAR (this->hosts_[i]), this->addrs_[i].get_port_number ())); } } @@ -713,7 +713,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str) ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ") ACE_TEXT ("missing a value.\n"), - opt.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())), -1); ACE_CString name = opt.substring (0, slot); @@ -729,14 +729,13 @@ TAO_DIOP_Acceptor::parse_options (const char *str) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid DIOP endpoint format: ") - ACE_TEXT ("endpoint priorities no longer supported. \n"), - value.c_str ()), + ACE_TEXT ("endpoint priorities no longer supported. \n")), -1); } else ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid DIOP option: <%s>\n"), - name.c_str ()), + ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())), -1); } } diff --git a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp index bd65c8fec3b..bba8297505f 100644 --- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp +++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp @@ -120,7 +120,7 @@ TAO_DIOP_Connection_Handler::open (void*) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open -") ACE_TEXT("listening on: <%s:%u>\n"), - this->local_addr_.get_host_name (), + ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()), this->local_addr_.get_port_number ())); } @@ -141,7 +141,7 @@ TAO_DIOP_Connection_Handler::open_server (void) ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open_server -") ACE_TEXT("listening on %s:%d\n"), - this->local_addr_.get_host_name (), + ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()), this->local_addr_.get_port_number () )); } diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp index ae98edfdffd..50961d1eb82 100644 --- a/TAO/tao/Strategies/DIOP_Profile.cpp +++ b/TAO/tao/Strategies/DIOP_Profile.cpp @@ -353,7 +353,7 @@ TAO_DIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const else { ACE_ERROR ((LM_ERROR, - "(%P|%t) TAO - UIOP_Profile::create_profile_body ", + "(%P|%t) TAO - UIOP_Profile::create_profile_body " "no object key marshalled \n")); } diff --git a/TAO/tao/Strategies/DIOP_Transport.cpp b/TAO/tao/Strategies/DIOP_Transport.cpp index d4edd4c8c80..849240d6b7c 100644 --- a/TAO/tao/Strategies/DIOP_Transport.cpp +++ b/TAO/tao/Strategies/DIOP_Transport.cpp @@ -116,7 +116,7 @@ TAO_DIOP_Transport::recv (char *buf, ACE_DEBUG ((LM_DEBUG, "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n", n, - from_addr.get_host_name (), + ACE_TEXT_CHAR_TO_TCHAR (from_addr.get_host_name ()), from_addr.get_port_number (), errno)); } diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp index 2bb6169d174..91e607e38a9 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp @@ -253,7 +253,7 @@ TAO_SCIOP_Acceptor::open (TAO_ORB_Core *orb_core, // This is bad mojo, i.e. an internal TAO error. ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) - ") - ACE_TEXT ("SCIOP_Acceptor::open, "), + ACE_TEXT ("SCIOP_Acceptor::open, ") ACE_TEXT ("hostname already set\n\n")), -1); } @@ -493,7 +493,7 @@ TAO_SCIOP_Acceptor::open_default (TAO_ORB_Core *orb_core, // This is bad mojo, i.e. an internal TAO error. ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) ") - ACE_TEXT ("SCIOP_Acceptor::open_default - "), + ACE_TEXT ("SCIOP_Acceptor::open_default - ") ACE_TEXT ("hostname already set\n\n")), -1); } @@ -1029,8 +1029,7 @@ TAO_SCIOP_Acceptor::parse_options (const char *str) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid SCIOP endpoint format: ") - ACE_TEXT ("endpoint priorities no longer supported. \n"), - value.c_str ()), + ACE_TEXT ("endpoint priorities no longer supported. \n")), -1); } else if (name == "portspan") diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 59bef91749c..d01935260ac 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -393,7 +393,7 @@ TAO_SCIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const else { ACE_ERROR ((LM_ERROR, - "(%P|%t) TAO - IIOP_Profile::create_profile_body ", + "(%P|%t) TAO - IIOP_Profile::create_profile_body " "no object key marshalled \n")); } diff --git a/TAO/tao/Strategies/SCIOP_Transport.cpp b/TAO/tao/Strategies/SCIOP_Transport.cpp index c888ec4e1d1..f5664f2e4af 100644 --- a/TAO/tao/Strategies/SCIOP_Transport.cpp +++ b/TAO/tao/Strategies/SCIOP_Transport.cpp @@ -212,7 +212,7 @@ TAO_SCIOP_Transport::send_message (TAO_OutputCDR &stream, if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - SCIOP_Transport[%d]::send_message, ") - ACE_TEXT (" write failure - %p\n"), + ACE_TEXT (" write failure - %m\n"), this->id ())); return -1; } diff --git a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp index da2edda4bbf..6655a560bfd 100644 --- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp @@ -503,8 +503,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str) { ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT ("TAO (%P|%t) Invalid SHMIOP endpoint format: ") - ACE_LIB_TEXT ("endpoint priorities no longer supported. \n"), - value.c_str ()), + ACE_LIB_TEXT ("endpoint priorities no longer supported. \n")), -1); } else diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index b8c1aa11b2a..770feceb3f9 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -203,11 +203,9 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level > 0) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) %s:%u, connection to ") - ACE_TEXT ("<%s:%p> failed (%p)\n"), - __FILE__, - __LINE__, - shmiop_endpoint->host (), + ACE_TEXT ("(%P|%t) %N:%l, connection to ") + ACE_TEXT ("<%s:%u> failed (%p)\n"), + ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), shmiop_endpoint->port (), ACE_TEXT ("errno"))); } @@ -221,7 +219,8 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - SHMIOP_Connector::make_connection, " "new connection to <%s:%d> on Transport[%d]\n", - shmiop_endpoint->host (), shmiop_endpoint->port (), + ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()), + shmiop_endpoint->port (), svc_handler->peer ().get_handle ())); TAO_Transport *transport = diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp index 4c0a462bc68..88d8413d197 100644 --- a/TAO/tao/Strategies/SHMIOP_Profile.cpp +++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp @@ -394,7 +394,7 @@ TAO_SHMIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const else { ACE_ERROR ((LM_ERROR, - "(%P|%t) TAO - UIOP_Profile::create_profile_body ", + "(%P|%t) TAO - UIOP_Profile::create_profile_body " "no object key marshalled \n")); } diff --git a/TAO/tao/Strategies/UIOP_Acceptor.cpp b/TAO/tao/Strategies/UIOP_Acceptor.cpp index 9ac84d9fae6..dcebc0befe7 100644 --- a/TAO/tao/Strategies/UIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp @@ -515,8 +515,7 @@ TAO_UIOP_Acceptor::parse_options (const char *str) { ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("TAO (%P|%t) Invalid IIOP endpoint format: ") - ACE_TEXT ("endpoint priorities no longer supported. \n"), - value.c_str ()), + ACE_TEXT ("endpoint priorities no longer supported. \n")), -1); } else diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index fe21b22e61f..34f9ba7c37d 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -279,10 +279,8 @@ TAO_UIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *, if (TAO_debug_level) { ACE_DEBUG ((LM_ERROR, - ACE_TEXT ("(%P|%t) %s:%u, connection to ") + ACE_TEXT ("(%P|%t) %N:%l, connection to ") ACE_TEXT ("%s failed (%p)\n"), - __FILE__, - __LINE__, uiop_endpoint->rendezvous_point (), ACE_TEXT ("errno"))); } diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp index b8aaf43922b..85c3531ffa2 100644 --- a/TAO/tao/Strategies/UIOP_Profile.cpp +++ b/TAO/tao/Strategies/UIOP_Profile.cpp @@ -297,7 +297,7 @@ TAO_UIOP_Profile::create_profile_body (TAO_OutputCDR &encap) const else { ACE_ERROR ((LM_ERROR, - "(%P|%t) TAO - UIOP_Profile::create_profile_body ", + "(%P|%t) TAO - UIOP_Profile::create_profile_body " "no object key marshalled \n")); } diff --git a/TAO/tao/Strategies/advanced_resource.cpp b/TAO/tao/Strategies/advanced_resource.cpp index 88c1b2ab71f..c559bf6a983 100644 --- a/TAO/tao/Strategies/advanced_resource.cpp +++ b/TAO/tao/Strategies/advanced_resource.cpp @@ -564,8 +564,8 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void) { ACE_ERROR_RETURN ((LM_ERROR, ACE_LIB_TEXT("TAO (%P|%t) Unable to load ") - ACE_LIB_TEXT("protocol <%s>, %p\n"), - ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()), ""), + ACE_LIB_TEXT("protocol <%s>, %m\n"), + ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())), -1); } diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp index eeb699d9138..39b4f542a71 100644 --- a/TAO/tao/Synch_Invocation.cpp +++ b/TAO/tao/Synch_Invocation.cpp @@ -493,10 +493,10 @@ namespace TAO if (TAO_debug_level > 5) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Synch_Twoway_Invocation::" - "handle_user_exception - " - "raising exception %s\n", - buf.in ())); + ACE_LIB_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::") + ACE_LIB_TEXT ("handle_user_exception - ") + ACE_LIB_TEXT ("raising exception %s\n"), + ACE_TEXT_CHAR_TO_TCHAR (buf.in ()))); } mon.set_status (TAO_INVOKE_USER_EXCEPTION); diff --git a/TAO/tao/Synch_Queued_Message.cpp b/TAO/tao/Synch_Queued_Message.cpp index 44ba841dda2..1f41ecc331d 100644 --- a/TAO/tao/Synch_Queued_Message.cpp +++ b/TAO/tao/Synch_Queued_Message.cpp @@ -135,7 +135,7 @@ TAO_Synch_Queued_Message::clone (ACE_Allocator *alloc) { // This debug is for testing purposes! ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Synch_Queued_Message::clone\n", + "TAO (%P|%t) - Synch_Queued_Message::clone\n" "Using global pool for allocation \n")); } diff --git a/TAO/tao/Synch_Reply_Dispatcher.cpp b/TAO/tao/Synch_Reply_Dispatcher.cpp index 9fcd717e515..87b9773c34d 100644 --- a/TAO/tao/Synch_Reply_Dispatcher.cpp +++ b/TAO/tao/Synch_Reply_Dispatcher.cpp @@ -74,7 +74,7 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply ( { if (TAO_debug_level > 2) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) - Synch_Reply_Dispatcher::dispatch_reply ", + "TAO (%P|%t) - Synch_Reply_Dispatcher::dispatch_reply " "clone_from failed \n")); return -1; } diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index 1fb645636a7..c0da93c3b19 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -97,7 +97,7 @@ TAO_Internal::open_services (int &argc, ACE_TCHAR **argv) } ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_debug_level == %d"), TAO_debug_level)); + ACE_TEXT ("TAO_debug_level == %d\n"), TAO_debug_level)); } } #endif /* TAO_DEBUG && !ACE_HAS_WINCE */ diff --git a/TAO/tao/Thread_Per_Connection_Handler.cpp b/TAO/tao/Thread_Per_Connection_Handler.cpp index a89952e186b..a0840d54f23 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.cpp +++ b/TAO/tao/Thread_Per_Connection_Handler.cpp @@ -40,8 +40,7 @@ TAO_Thread_Per_Connection_Handler::activate (long flags, ACE_LIB_TEXT ("TAO (%P|%t) - IIOP_Connection_Handler::") ACE_LIB_TEXT ("activate %d threads, flags = %d\n"), n_threads, - flags, - THR_BOUND)); + flags)); } return TAO_TPC_BASE::activate (flags, diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp index 9923ff1f895..78d9095c07b 100644 --- a/TAO/tao/Transport.cpp +++ b/TAO/tao/Transport.cpp @@ -41,12 +41,12 @@ dump_iov (iovec *iov, int iovcnt, size_t id, { ACE_Log_Msg::instance ()->acquire (); -#define DUMP_IOV_PREFIX "Transport[" ACE_SIZE_T_FORMAT_SPECIFIER "]::%s" +#define DUMP_IOV_PREFIX ACE_LIB_TEXT("Transport[") ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT("]::%s") ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - " - DUMP_IOV_PREFIX ", " - "sending %d buffers\n", - id, location, iovcnt)); + ACE_LIB_TEXT ("TAO (%P|%t) - ") + DUMP_IOV_PREFIX ACE_LIB_TEXT (", ") + ACE_LIB_TEXT ("sending %d buffers\n"), + id, ACE_TEXT_CHAR_TO_TCHAR (location), iovcnt)); for (int i = 0; i != iovcnt && 0 < current_transfer; ++i) { @@ -59,10 +59,10 @@ dump_iov (iovec *iov, int iovcnt, size_t id, } ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - " - DUMP_IOV_PREFIX ", " - "buffer %d/%d has %d bytes\n", - id, location, + ACE_LIB_TEXT ("TAO (%P|%t) - ") + DUMP_IOV_PREFIX ACE_LIB_TEXT (", ") + ACE_LIB_TEXT ("buffer %d/%d has %d bytes\n"), + id, ACE_TEXT_CHAR_TO_TCHAR(location), i, iovcnt, iov_len)); @@ -72,9 +72,9 @@ dump_iov (iovec *iov, int iovcnt, size_t id, { ACE_TCHAR header[1024]; ACE_OS::sprintf (header, - "TAO - " DUMP_IOV_PREFIX " (" - ACE_SIZE_T_FORMAT_SPECIFIER "/" - ACE_SIZE_T_FORMAT_SPECIFIER ")\n", + ACE_LIB_TEXT("TAO - ") DUMP_IOV_PREFIX ACE_LIB_TEXT(" (") + ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT("/") + ACE_SIZE_T_FORMAT_SPECIFIER ACE_LIB_TEXT(")\n"), id, location, offset, iov_len); len = iov_len - offset; @@ -93,10 +93,10 @@ dump_iov (iovec *iov, int iovcnt, size_t id, } ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - " - DUMP_IOV_PREFIX ", " - "end of data\n", - id, location)); + ACE_LIB_TEXT ("TAO (%P|%t) - ") + DUMP_IOV_PREFIX ACE_LIB_TEXT (", ") + ACE_LIB_TEXT ("end of data\n"), + id, ACE_TEXT_CHAR_TO_TCHAR(location))); ACE_Log_Msg::instance ()->release (); } @@ -491,8 +491,8 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb, { ACE_ERROR ((LM_ERROR, "TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, " - "error while flushing message %p\n", - this->id (), "")); + "error while flushing message %m\n", + this->id ())); } return -1; @@ -712,7 +712,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[]) { ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::drain_queue_helper, " - "send() returns 0", + "send() returns 0\n", this->id ())); } return -1; @@ -724,7 +724,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[]) ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::drain_queue_helper, " "error during %p\n", - this->id (), "send()")); + this->id (), ACE_LIB_TEXT ("send()"))); } if (errno == EWOULDBLOCK) @@ -925,7 +925,7 @@ TAO_Transport::report_invalid_event_handler (const char *caller) ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::report_invalid_event_handler" "(%s) no longer associated with handler [tag=%d]\n", - this->id (), caller, this->tag_)); + this->id (), ACE_TEXT_CHAR_TO_TCHAR (caller), this->tag_)); } } @@ -1033,8 +1033,8 @@ TAO_Transport::send_message_shared_i (TAO_Stub *stub, ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::send_message_i, " "fatal error in " - "send_message_block_chain_i %p\n", - this->id (), "")); + "send_message_block_chain_i %m\n", + this->id ())); } return -1; } @@ -1769,8 +1769,8 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::process_parsed_messages, " - "received CloseConnection message %p\n", - this->id(), "")); + "received CloseConnection message %m\n", + this->id())); // Return a "-1" so that the next stage can take care of // closing connection and the necessary memory management. @@ -1805,8 +1805,8 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - Transport[%d]::process_parsed_messages, " - "error in process_reply_message %p\n", - this->id (), "")); + "error in process_reply_message %m\n", + this->id ())); return -1; } diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp index deb95ea0c3a..1f5369cf31a 100644 --- a/TAO/tao/Transport_Cache_Manager.cpp +++ b/TAO/tao/Transport_Cache_Manager.cpp @@ -475,10 +475,10 @@ TAO_Transport_Cache_Manager::purge (void) { ACE_DEBUG ((LM_INFO, ACE_TEXT ("TAO (%P|%t) - ") - ACE_TEXT ("Unable to push transport %lu ") + ACE_TEXT ("Unable to push transport %u ") ACE_TEXT ("on the to-be-closed stack, so ") ACE_TEXT ("it will leak\n"), - transport)); + transport->id ())); } if (TAO_debug_level > 0) diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index a5b22ce9f56..224a5e05e55 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -70,7 +70,7 @@ TAO_Connector::make_mprofile (const char *string, ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile ") ACE_TEXT ("<%s>\n"), - string)); + ACE_TEXT_CHAR_TO_TCHAR (string))); } ACE_CString ior; diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 50944284ec7..4d19db22857 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -2684,7 +2684,7 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TypeCode::private_member_label -- ") - ACE_TEXT ("error reading from stream"))); + ACE_TEXT ("error reading from stream\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); } diff --git a/TAO/tao/Utils/Server_Main.cpp b/TAO/tao/Utils/Server_Main.cpp index 95135dec01f..a90f575e093 100644 --- a/TAO/tao/Utils/Server_Main.cpp +++ b/TAO/tao/Utils/Server_Main.cpp @@ -100,7 +100,7 @@ int TAO::Utils::Server_Main<SERVANT>::run (int argc, ACE_TCHAR *argv[]) else { ACE_ERROR ((LM_ERROR, - "%T %s (%P|%t) Registration failed: %p\n", name_ + "%T %s (%P|%t) Registration failed: %m\n", name_ )); result = -1; } diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index a3ff81c9d19..38eacae6129 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -160,7 +160,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) -1); if (pset->insert (item) == -1) ACE_ERROR ((LM_ERROR, - ACE_LIB_TEXT ("(%P|%t) Unable to add protocol factories for %s: %p\n"), + ACE_LIB_TEXT ("(%P|%t) Unable to add protocol factories for %s: %m\n"), argv[curarg])); } } @@ -171,7 +171,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { curarg++; CONV_FRAME::CodeSetId ncs; - if (ACE_Codeset_Registry::locale_to_registry (argv[curarg], + if (ACE_Codeset_Registry::locale_to_registry (ACE_TEXT_ALWAYS_CHAR(argv[curarg]), ncs) == 0) { char **endPtr =0; @@ -197,7 +197,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { curarg++; CONV_FRAME::CodeSetId ncs; - if (ACE_Codeset_Registry::locale_to_registry( argv[curarg], + if (ACE_Codeset_Registry::locale_to_registry( ACE_TEXT_ALWAYS_CHAR (argv[curarg]), ncs) == 0) { char **endPtr = 0; @@ -227,7 +227,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { TAO_Codeset_Manager *csm = this->get_codeset_manager(); if (csm) - if (csm->add_char_translator(argv[curarg]) == -1) + if (csm->add_char_translator(ACE_TEXT_ALWAYS_CHAR (argv[curarg])) == -1) return -1; } } @@ -241,7 +241,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) { TAO_Codeset_Manager *csm = this->get_codeset_manager(); if (csm) - if (csm->add_wchar_translator(argv[curarg]) == -1) + if (csm->add_wchar_translator(ACE_TEXT_ALWAYS_CHAR(argv[curarg])) == -1) return -1; } } @@ -460,7 +460,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[]) this->max_muxed_connections_ = ACE_OS::atoi (argv[curarg]); else - this->report_option_value_error ("-ORBMuxedConnectionMax", + this->report_option_value_error (ACE_LIB_TEXT("-ORBMuxedConnectionMax"), argv[curarg]); } else if (ACE_OS::strncmp (argv[curarg], diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index c090c07a823..08d20666ce7 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -191,7 +191,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("TAO_Marshal_TypeCode::skip: ") - ACE_TEXT ("Bad kind_ value in CDR stream"))); + ACE_TEXT ("Bad kind_ value in CDR stream\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), TAO::TRAVERSE_STOP); } @@ -611,7 +611,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error"))); + ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO::TRAVERSE_STOP); |