diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-12 21:37:48 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-12-12 21:37:48 +0000 |
| commit | f18613e918d42d5a3c9cb6bf217ade6027224aa2 (patch) | |
| tree | 9f95f89d56f67059b483c6cde8bf464caa9c4eda | |
| parent | 70788645e2d085064f89174248b48b42bf3f698e (diff) | |
| download | ATCD-f18613e918d42d5a3c9cb6bf217ade6027224aa2.tar.gz | |
ChangeLogTag: Sat Dec 12 15:15:00 1999 Kirthika Parameswaran <kirthika@cs.wustl.edu>
41 files changed, 509 insertions, 509 deletions
diff --git a/TAO/tao/Acceptor_Registry.cpp b/TAO/tao/Acceptor_Registry.cpp index 67303f84643..bbe3f0c33c6 100644 --- a/TAO/tao/Acceptor_Registry.cpp +++ b/TAO/tao/Acceptor_Registry.cpp @@ -118,8 +118,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "(%P|%t) Invalid endpoint specification: " - "<%s>.\n", + ASYS_TEXT ("(%P|%t) Invalid endpoint specification: ") + ASYS_TEXT ("<%s>.\n"), iop.c_str ())); ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1); @@ -228,8 +228,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) unable to open acceptor " - "for <%s>%p\n", + ASYS_TEXT ("TAO (%P|%t) unable to open acceptor ") + ASYS_TEXT ("for <%s>%p\n"), iop.c_str (),"")); ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1); @@ -242,8 +242,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) unable to add <%s> " - "to acceptor registry.\n", + ASYS_TEXT ("TAO (%P|%t) unable to add <%s> ") + ASYS_TEXT ("to acceptor registry.\n"), address.c_str ())); ACE_THROW_RETURN (CORBA::INTERNAL (), -1); @@ -253,8 +253,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) unable to create " - "an acceptor for <%s>.\n", + ASYS_TEXT ("TAO (%P|%t) unable to create ") + ASYS_TEXT ("an acceptor for <%s>.\n"), iop.c_str ())); ACE_THROW_RETURN (CORBA::NO_MEMORY (), -1); @@ -268,8 +268,8 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core, if (found == 0) { ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) no usable transport protocol " - "was found.\n")); + ASYS_TEXT ("TAO (%P|%t) no usable transport protocol ") + ASYS_TEXT ("was found.\n"))); ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1); } } @@ -324,8 +324,8 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) unable to create " - "an acceptor for <%s>\n", + ASYS_TEXT ("TAO (%P|%t) unable to create ") + ASYS_TEXT ("an acceptor for <%s>\n"), (*factory)->protocol_name ().c_str ())); return -1; @@ -338,8 +338,8 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) unable to open " - "default acceptor for <%s>%p\n", + ASYS_TEXT ("TAO (%P|%t) unable to open ") + ASYS_TEXT ("default acceptor for <%s>%p\n"), (*factory)->protocol_name ().c_str (), "")); return -1; @@ -351,8 +351,8 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core, if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) unable to add <%s> default_acceptor " - "to acceptor registry.\n", + ASYS_TEXT ("TAO (%P|%t) unable to add <%s> default_acceptor ") + ASYS_TEXT ("to acceptor registry.\n"), (*factory)->protocol_name ().c_str ())); return -1; diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 6f083e3240b..ea9bde575a3 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -482,7 +482,7 @@ CORBA_Any::operator<<= (CORBA::Short s) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Short insertion\n")); + ASYS_TEXT ("Exception in CORBA::Short insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -506,7 +506,7 @@ CORBA_Any::operator<<= (CORBA::UShort s) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::UShort insertion\n")); + ASYS_TEXT ("Exception in CORBA::UShort insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -530,7 +530,7 @@ CORBA_Any::operator<<= (CORBA::Long l) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Long insertion\n")); + ASYS_TEXT ("Exception in CORBA::Long insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -554,7 +554,7 @@ CORBA_Any::operator<<= (CORBA::ULong l) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::ULong insertion\n")); + ASYS_TEXT ("Exception in CORBA::ULong insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -578,7 +578,7 @@ CORBA_Any::operator<<= (CORBA::LongLong l) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::LongLong insertion\n")); + ASYS_TEXT ("Exception in CORBA::LongLong insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -602,7 +602,7 @@ CORBA_Any::operator<<= (CORBA::ULongLong l) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::ULongLong insertion\n")); + ASYS_TEXT ("Exception in CORBA::ULongLong insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -626,7 +626,7 @@ CORBA_Any::operator<<= (CORBA::Float f) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Float insertion\n")); + ASYS_TEXT ("Exception in CORBA::Float insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -650,7 +650,7 @@ CORBA_Any::operator<<= (CORBA::Double d) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Double insertion\n")); + ASYS_TEXT ("Exception in CORBA::Double insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -675,7 +675,7 @@ CORBA_Any::operator<<= (const CORBA_Any& a) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Any copying insertion\n")); + ASYS_TEXT ("Exception in CORBA::Any copying insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -697,7 +697,7 @@ CORBA::Any::operator<<= (CORBA::Any_ptr anyptr) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Any non-copying insertion\n")); + ASYS_TEXT ("Exception in CORBA::Any non-copying insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -723,7 +723,7 @@ CORBA_Any::operator<<= (from_boolean b) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Boolean insertion\n")); + ASYS_TEXT ("Exception in CORBA::Boolean insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -747,7 +747,7 @@ CORBA_Any::operator<<= (from_octet o) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Octet insertion\n")); + ASYS_TEXT ("Exception in CORBA::Octet insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -771,7 +771,7 @@ CORBA_Any::operator<<= (from_char c) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Char insertion\n")); + ASYS_TEXT ("Exception in CORBA::Char insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -795,7 +795,7 @@ CORBA_Any::operator<<= (from_wchar wc) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::WChar insertion\n")); + ASYS_TEXT ("Exception in CORBA::WChar insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -823,7 +823,7 @@ CORBA_Any::operator<<= (CORBA::TypeCode_ptr tc) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::TypeCode_ptr insertion\n")); + ASYS_TEXT ("Exception in CORBA::TypeCode_ptr insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -850,7 +850,7 @@ CORBA_Any::operator<<= (const CORBA_Exception &exception) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Exception insertion\n")); + ASYS_TEXT ("Exception in CORBA::Exception insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -891,7 +891,7 @@ CORBA::Any::operator<<= (CORBA::Object_ptr *objptr) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Object_ptr insertion\n")); + ASYS_TEXT ("Exception in CORBA::Object_ptr insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -955,7 +955,7 @@ CORBA_Any::operator<<= (from_string s) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in bounded string insertion\n")); + ASYS_TEXT ("Exception in bounded string insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -1017,7 +1017,7 @@ CORBA_Any::operator<<= (from_wstring ws) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in bounded wstring insertion\n")); + ASYS_TEXT ("Exception in bounded wstring insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -1060,7 +1060,7 @@ CORBA_Any::operator>>= (CORBA::Short &s) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Short extraction\n")); + ASYS_TEXT ("Exception in CORBA::Short extraction\n"))); } ACE_ENDTRY; @@ -1100,7 +1100,7 @@ CORBA_Any::operator>>= (CORBA::UShort &s) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::UShort extraction\n")); + ASYS_TEXT ("Exception in CORBA::UShort extraction\n"))); } ACE_ENDTRY; @@ -1140,7 +1140,7 @@ CORBA_Any::operator>>= (CORBA::Long &l) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Long extraction\n")); + ASYS_TEXT ("Exception in CORBA::Long extraction\n"))); } ACE_ENDTRY; @@ -1180,7 +1180,7 @@ CORBA_Any::operator>>= (CORBA::ULong &l) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::ULong extraction\n")); + ASYS_TEXT ("Exception in CORBA::ULong extraction\n"))); } ACE_ENDTRY; @@ -1220,7 +1220,7 @@ CORBA_Any::operator>>= (CORBA::LongLong &l) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::LongLong extraction\n")); + ASYS_TEXT ("Exception in CORBA::LongLong extraction\n"))); } ACE_ENDTRY; @@ -1260,7 +1260,7 @@ CORBA_Any::operator>>= (CORBA::ULongLong &l) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::ULongLong extraction\n")); + ASYS_TEXT ("Exception in CORBA::ULongLong extraction\n"))); } ACE_ENDTRY; @@ -1300,7 +1300,7 @@ CORBA_Any::operator>>= (CORBA::Float &f) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Float extraction\n")); + ASYS_TEXT ("Exception in CORBA::Float extraction\n"))); } ACE_ENDTRY; @@ -1340,7 +1340,7 @@ CORBA_Any::operator>>= (CORBA::Double &d) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Double extraction\n")); + ASYS_TEXT ("Exception in CORBA::Double extraction\n"))); } ACE_ENDTRY; @@ -1388,7 +1388,7 @@ CORBA_Any::operator>>= (CORBA::Any &a) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Any extraction\n")); + ASYS_TEXT ("Exception in CORBA::Any extraction\n"))); } ACE_ENDTRY; @@ -1446,7 +1446,7 @@ CORBA_Any::operator>>= (char *&s) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in unbounded string extraction\n")); + ASYS_TEXT ("Exception in unbounded string extraction\n"))); } ACE_ENDTRY; @@ -1504,7 +1504,7 @@ CORBA_Any::operator>>= (CORBA::WChar *&ws) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in unbounded wstring extraction\n")); + ASYS_TEXT ("Exception in unbounded wstring extraction\n"))); } ACE_ENDTRY; @@ -1552,7 +1552,7 @@ CORBA_Any::operator>>= (CORBA::TypeCode_ptr &tc) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::TypeCode_ptr extraction\n")); + ASYS_TEXT ("Exception in CORBA::TypeCode_ptr extraction\n"))); } ACE_ENDTRY; @@ -1594,7 +1594,7 @@ CORBA_Any::operator>>= (to_boolean b) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Boolean extraction\n")); + ASYS_TEXT ("Exception in CORBA::Boolean extraction\n"))); } ACE_ENDTRY; @@ -1634,7 +1634,7 @@ CORBA_Any::operator>>= (to_octet o) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Octet extraction\n")); + ASYS_TEXT ("Exception in CORBA::Octet extraction\n"))); } ACE_ENDTRY; @@ -1674,7 +1674,7 @@ CORBA_Any::operator>>= (to_char c) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Char extraction\n")); + ASYS_TEXT ("Exception in CORBA::Char extraction\n"))); } ACE_ENDTRY; @@ -1714,7 +1714,7 @@ CORBA_Any::operator>>= (to_wchar wc) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::WChar extraction\n")); + ASYS_TEXT ("Exception in CORBA::WChar extraction\n"))); } ACE_ENDTRY; @@ -1772,7 +1772,7 @@ CORBA_Any::operator>>= (to_string s) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in bounded string extraction\n")); + ASYS_TEXT ("Exception in bounded string extraction\n"))); } ACE_ENDTRY; @@ -1830,7 +1830,7 @@ CORBA_Any::operator>>= (to_wstring ws) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in bounded wstring extraction\n")); + ASYS_TEXT ("Exception in bounded wstring extraction\n"))); } ACE_ENDTRY; @@ -1890,7 +1890,7 @@ CORBA_Any::operator>>= (to_object obj) const ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in CORBA::Object_ptr extraction\n")); + ASYS_TEXT ("Exception in CORBA::Object_ptr extraction\n"))); } ACE_ENDTRY; @@ -1921,7 +1921,7 @@ CORBA_Any::operator<<= (const char* s) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in unbounded string insertion\n")); + ASYS_TEXT ("Exception in unbounded string insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -1949,7 +1949,7 @@ CORBA_Any::operator<<= (const CORBA::WChar* s) ACE_CATCHANY { ACE_DEBUG ((LM_DEBUG, - "Exception in unbounded wstring insertion\n")); + ASYS_TEXT ("Exception in unbounded wstring insertion\n"))); } ACE_ENDTRY; ACE_CHECK; @@ -2005,18 +2005,18 @@ CORBA_Any::dump (const CORBA::Any &any_value) { case CORBA::tk_null: ACE_DEBUG ((LM_DEBUG, - "Null\n")); + ASYS_TEXT ("Null\n"))); break; case CORBA::tk_void: ACE_DEBUG ((LM_DEBUG, - "Void\n")); + ASYS_TEXT ("Void\n"))); break; case CORBA::tk_short: { CORBA::Short s; any_value >>= s; ACE_DEBUG ((LM_DEBUG, - "Short %d\n", + ASYS_TEXT ("Short %d\n"), s)); break; } @@ -2025,7 +2025,7 @@ CORBA_Any::dump (const CORBA::Any &any_value) CORBA::Long l; any_value >>= l; ACE_DEBUG ((LM_DEBUG, - "Long %d\n", + ASYS_TEXT ("Long %d\n"), l)); break; } @@ -2034,7 +2034,7 @@ CORBA_Any::dump (const CORBA::Any &any_value) CORBA::UShort s; any_value >>= s; ACE_DEBUG ((LM_DEBUG, - "UShort %d\n", + ASYS_TEXT ("UShort %d\n"), s)); break; } @@ -2043,7 +2043,7 @@ CORBA_Any::dump (const CORBA::Any &any_value) CORBA::ULong l; any_value >>= l; ACE_DEBUG ((LM_DEBUG, - "ULong %d\n", + ASYS_TEXT ("ULong %d\n"), l)); break; } @@ -2052,7 +2052,7 @@ CORBA_Any::dump (const CORBA::Any &any_value) CORBA::Float f; any_value >>= f; ACE_DEBUG ((LM_DEBUG, - "Float %f\n", + ASYS_TEXT ("Float %f\n"), f)); break; } @@ -2061,7 +2061,7 @@ CORBA_Any::dump (const CORBA::Any &any_value) CORBA::Double d; any_value >>= d; ACE_DEBUG ((LM_DEBUG, - "Double %f\n", + ASYS_TEXT ("Double %f\n"), d)); break; } @@ -2073,12 +2073,12 @@ CORBA_Any::dump (const CORBA::Any &any_value) if (b == 1) { ACE_DEBUG ((LM_DEBUG, - "Boolean TRUE\n")); + ASYS_TEXT ("Boolean TRUE\n"))); } else { ACE_DEBUG ((LM_DEBUG, - "Boolean FALSE\n")); + ASYS_TEXT ("Boolean FALSE\n"))); } break; } @@ -2088,7 +2088,7 @@ CORBA_Any::dump (const CORBA::Any &any_value) to_char tch (ch); any_value >>= tch; ACE_DEBUG ((LM_DEBUG, - "Char %c\n", + ASYS_TEXT ("Char %c\n"), ch)); break; } @@ -2097,13 +2097,13 @@ CORBA_Any::dump (const CORBA::Any &any_value) char* str; any_value >>= str; ACE_DEBUG ((LM_DEBUG, - "String %s\n", + ASYS_TEXT ("String %s\n"), str)); break; } default: ACE_DEBUG ((LM_DEBUG, - "TCKind %d\n", + ASYS_TEXT ("TCKind %d\n"), kind)); break; } diff --git a/TAO/tao/CDR_Interpreter.cpp b/TAO/tao/CDR_Interpreter.cpp index 9ab96f9a2ad..2927990f6fa 100644 --- a/TAO/tao/CDR_Interpreter.cpp +++ b/TAO/tao/CDR_Interpreter.cpp @@ -298,7 +298,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, if (TAO_CDR_Interpreter::table_[kind].calc_ != 0) { - assert (TAO_CDR_Interpreter::table_[kind].size_ == 0); + ACE_ASSERT (TAO_CDR_Interpreter::table_[kind].size_ == 0); // Pull encapsulation length out of the stream. if (stream->read_ulong (temp) == 0) @@ -319,7 +319,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, // any to ensure correctness. Then use the calculator routine // to calculate size and alignment. - assert (temp <= UINT_MAX); + ACE_ASSERT (temp <= UINT_MAX); TAO_InputCDR nested (*stream, temp); @@ -344,7 +344,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, } return size; } - assert (TAO_CDR_Interpreter::table_[kind].size_ != 0); + ACE_ASSERT (TAO_CDR_Interpreter::table_[kind].size_ != 0); // Reinitialize the TypeCode if requested; this consumes any // TypeCode parameters in the stream. They only exist for TCKind @@ -360,7 +360,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, switch (kind) { default: - assert (TAO_CDR_Interpreter::table_[kind].skipper_ == 0); + ACE_ASSERT (TAO_CDR_Interpreter::table_[kind].skipper_ == 0); break; case CORBA::tk_string: @@ -381,7 +381,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, } tc->length_ = len; - assert (len < UINT_MAX); + ACE_ASSERT (len < UINT_MAX); tc->buffer_ = stream->rd_ptr (); stream->skip_bytes (len); break; @@ -1107,7 +1107,7 @@ TAO_CDR_Interpreter::calc_union_attr_is_var_sized_member if (stream->read_ulong (encap) == 0) return -1; - assert (encap <= UINT_MAX); + ACE_ASSERT (encap <= UINT_MAX); TAO_InputCDR nested (*stream, temp); @@ -1133,7 +1133,7 @@ TAO_CDR_Interpreter::calc_union_attr_is_var_sized_member if (stream->read_ulong (encap) == 0) return -1; - assert (encap <= UINT_MAX); + ACE_ASSERT (encap <= UINT_MAX); TAO_InputCDR nested (*stream, temp); diff --git a/TAO/tao/Connector_Registry.cpp b/TAO/tao/Connector_Registry.cpp index d6641607364..15d4311858b 100644 --- a/TAO/tao/Connector_Registry.cpp +++ b/TAO/tao/Connector_Registry.cpp @@ -61,8 +61,8 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) delete connector; ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) unable to open connector for " - "<%s>.\n", + ASYS_TEXT ("TAO (%P|%t) unable to open connector for ") + ASYS_TEXT ("<%s>.\n"), (*factory)->protocol_name ().c_str ()), -1); } @@ -72,8 +72,8 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core) delete connector; ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) unable to add a <%s> connector " - "to the connector registry.\n", + ASYS_TEXT ("TAO (%P|%t) unable to add a <%s> connector ") + ASYS_TEXT ("to the connector registry.\n"), (*factory)->protocol_name ().c_str ()), -1); } @@ -117,7 +117,7 @@ TAO_Connector_Registry::preconnect (TAO_ORB_Core *orb_core, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) Unable to preprocess the preconnections.\n")); + ASYS_TEXT ("TAO (%P|%t) Unable to preprocess the preconnections.\n"))); return -1; } @@ -336,7 +336,7 @@ TAO_Connector_Registry::create_profile (TAO_InputCDR &cdr) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) unknown profile tag %d\n", + ASYS_TEXT ("TAO (%P|%t) unknown profile tag %d\n"), tag)); } diff --git a/TAO/tao/DomainS.cpp b/TAO/tao/DomainS.cpp index b46e8be807a..b1ab2782837 100644 --- a/TAO/tao/DomainS.cpp +++ b/TAO/tao/DomainS.cpp @@ -207,7 +207,7 @@ void POA_CORBA::DomainManager::_dispatch (CORBA::ServerRequest &req, void *conte // find the skeleton corresponding to this opname if (this->_find (opname, skel, req.operation_length ()) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else @@ -470,7 +470,7 @@ void POA_CORBA::ConstructionPolicy::_dispatch (CORBA::ServerRequest &req, void * // find the skeleton corresponding to this opname if (this->_find (opname, skel, req.operation_length ()) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index bdd144703c3..cbc6fb8facf 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -218,7 +218,7 @@ CORBA::Environment::print_exception (const char *info, const char *id = this->exception_->_id (); ACE_DEBUG ((LM_ERROR, - "TAO: (%P|%t) EXCEPTION, %s\n", + ASYS_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"), info)); CORBA::SystemException *x2 = @@ -231,12 +231,12 @@ CORBA::Environment::print_exception (const char *info, // held within it ... ACE_DEBUG ((LM_ERROR, - "TAO: (%P|%t) user exception, ID '%s'\n", + ASYS_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"), id)); } else ACE_DEBUG ((LM_ERROR, - "TAO: (%P|%t) no exception, %s\n", info)); + ASYS_TEXT ("TAO: (%P|%t) no exception, %s\n"), info)); } CORBA_Environment_var & diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 4b73df08ad6..6971e535edc 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -101,8 +101,8 @@ CORBA_Exception::_tao_print_exception (const char *user_provided_info, FILE *) const { ACE_DEBUG ((LM_ERROR, - "(%P|%t) EXCEPTION, %s\n" - "%s\n", + ASYS_TEXT ("(%P|%t) EXCEPTION, %s\n") + ASYS_TEXT ("%s\n"), user_provided_info, this->_info ().c_str ())); } @@ -349,7 +349,7 @@ void CORBA_SystemException::_tao_print_system_exception (FILE *) const { ACE_DEBUG ((LM_ERROR, - "(%P|%t) system exception, ID '%s'\n", + ASYS_TEXT ("(%P|%t) system exception, ID '%s'\n"), this->_info ().c_str ())); } diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp index 1bb6f496de0..4b5e3c59f7c 100644 --- a/TAO/tao/GIOP.cpp +++ b/TAO/tao/GIOP.cpp @@ -195,8 +195,8 @@ TAO_GIOP_Message_State::append_fragment (ACE_Message_Block* current) { // Yes, print it out in all debug levels! ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) incompatible fragments:\n" - " Different GIOP versions or byte order\n")); + ASYS_TEXT ("TAO (%P|%t) incompatible fragments:\n") + ASYS_TEXT (" Different GIOP versions or byte order\n"))); this->reset (); return -1; } @@ -249,7 +249,7 @@ TAO_GIOP::dump_msg (const char *label, // Print. ACE_DEBUG ((LM_DEBUG, - "(%P | %t):%s GIOP v%c.%c msg, %d data bytes, %s endian, %s = %d\n", + ASYS_TEXT ("(%P | %t):%s GIOP v%c.%c msg, %d data bytes, %s endian, %s = %d\n"), label, digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]], digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]], @@ -262,7 +262,7 @@ TAO_GIOP::dump_msg (const char *label, ACE_HEX_DUMP ((LM_DEBUG, (const char *) ptr, len, - "GIOP message")); + ASYS_TEXT ("GIOP message"))); } } @@ -457,9 +457,9 @@ TAO_GIOP::send_message (TAO_Transport *transport, { if (TAO_orbdebug) ACE_DEBUG ((LM_DEBUG, - "TAO: (%P|%t) closing conn %d after fault %p\n", + ASYS_TEXT ("TAO: (%P|%t) closing conn %d after fault %p\n"), transport->handle (), - "GIOP::send_message ()")); + ASYS_TEXT ("GIOP::send_message ()"))); return -1; } @@ -469,8 +469,8 @@ TAO_GIOP::send_message (TAO_Transport *transport, { if (TAO_orbdebug) ACE_DEBUG ((LM_DEBUG, - "TAO: (%P|%t) GIOP::send_message () " - "EOF, closing conn %d\n", + ASYS_TEXT ("TAO: (%P|%t) GIOP::send_message () ") + ASYS_TEXT ("EOF, closing conn %d\n"), transport->handle())); return -1; } @@ -529,8 +529,8 @@ TAO_GIOP::send_close_connection (const TAO_GIOP_Version& version, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) TAO_GIOP::send_close_connection -" - " connection already closed\n")); + ASYS_TEXT ("TAO (%P|%t) TAO_GIOP::send_close_connection -") + ASYS_TEXT (" connection already closed\n"))); return; } @@ -539,13 +539,13 @@ TAO_GIOP::send_close_connection (const TAO_GIOP_Version& version, { if (TAO_orbdebug) ACE_ERROR ((LM_ERROR, - "(%P|%t) error closing connection %d\n", + ASYS_TEXT ("(%P|%t) error closing connection %d\n"), which)); } transport->close_connection (); ACE_DEBUG ((LM_DEBUG, - "(%P|%t) shut down transport, handle %d\n", + ASYS_TEXT ("(%P|%t) shut down transport, handle %d\n"), which)); } @@ -590,7 +590,7 @@ TAO_GIOP::send_error (const TAO_GIOP_Version &version, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) error sending error to %d\n", + ASYS_TEXT ("TAO (%P|%t) error sending error to %d\n"), which)); } @@ -609,10 +609,10 @@ TAO_GIOP::read_buffer (TAO_Transport *transport, if (bytes_read <= 0 && TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - %p,\n" - " transport = %d, " - "bytes = %d, len = %d\n", - "TAO_GIOP::read_buffer", + ASYS_TEXT ("TAO (%P|%t) - %p,\n") + ASYS_TEXT (" transport = %d, ") + ASYS_TEXT ("bytes = %d, len = %d\n"), + ASYS_TEXT ("TAO_GIOP::read_buffer"), transport->handle (), bytes_read, len)); @@ -729,8 +729,8 @@ TAO_GIOP::handle_input (TAO_Transport *transport, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - %p\n", - "TAO_GIOP::handle_input, read_header")); + ASYS_TEXT ("TAO (%P|%t) - %p\n"), + ASYS_TEXT ("TAO_GIOP::handle_input, read_header"))); return -1; } @@ -739,8 +739,8 @@ TAO_GIOP::handle_input (TAO_Transport *transport, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - %p\n", - "TAO_GIOP::handle_input, ACE_CDR::grow")); + ASYS_TEXT ("TAO (%P|%t) - %p\n"), + ASYS_TEXT ("TAO_GIOP::handle_input, ACE_CDR::grow"))); return -1; } @@ -761,8 +761,8 @@ TAO_GIOP::handle_input (TAO_Transport *transport, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - %p\n", - "TAO_GIOP::handle_input, read_buffer[1]")); + ASYS_TEXT ("TAO (%P|%t) - %p\n"), + ASYS_TEXT ("TAO_GIOP::handle_input, read_buffer[1]"))); return -1; } else if (n == 0) @@ -771,8 +771,8 @@ TAO_GIOP::handle_input (TAO_Transport *transport, return 0; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - %p\n", - "TAO_GIOP::handle_input, read_buffer[2]")); + ASYS_TEXT ("TAO (%P|%t) - %p\n"), + ASYS_TEXT ("TAO_GIOP::handle_input, read_buffer[2]"))); return -1; } @@ -815,8 +815,8 @@ TAO_GIOP::parse_reply (TAO_Transport *, // this on the firt iteration, leave it for the nearby future... // ERROR too. @@ this->reply_handler_->error (); ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) %N:%l TAO_GIOP::parse_reply: " - "request.\n"), + ASYS_TEXT ("TAO (%P|%t) %N:%l TAO_GIOP::parse_reply: ") + ASYS_TEXT ("request.\n")), -1); case TAO_GIOP::CancelRequest: @@ -826,8 +826,8 @@ TAO_GIOP::parse_reply (TAO_Transport *, // @@ Errors for the time being. // @@ this->reply_handler_->error (); ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) %N:%l TAO_GIOP::parse_reply: " - "wrong message.\n"), + ASYS_TEXT ("TAO (%P|%t) %N:%l TAO_GIOP::parse_reply: ") + ASYS_TEXT ("wrong message.\n")), -1); case TAO_GIOP::LocateReply: @@ -848,8 +848,8 @@ TAO_GIOP::parse_reply (TAO_Transport *, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) TAO_GIOP::parse_reply, " - "extracting context\n")); + ASYS_TEXT ("TAO (%P|%t) TAO_GIOP::parse_reply, ") + ASYS_TEXT ("extracting context\n"))); return -1; } } @@ -859,8 +859,8 @@ TAO_GIOP::parse_reply (TAO_Transport *, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) : TAO_GIOP::parse_reply, " - "extracting request id")); + ASYS_TEXT ("TAO (%P|%t) : TAO_GIOP::parse_reply, ") + ASYS_TEXT ("extracting request id"))); return -1; } @@ -871,8 +871,8 @@ TAO_GIOP::parse_reply (TAO_Transport *, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) : TAO_GIOP::parse_reply, " - "extracting reply status\n")); + ASYS_TEXT ("TAO (%P|%t) : TAO_GIOP::parse_reply, ") + ASYS_TEXT ("extracting reply status\n"))); return -1; } return 0; @@ -923,7 +923,7 @@ TAO_GIOP::process_server_message (TAO_Transport *transport, case TAO_GIOP::MessageError: if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) MessageError received by server\n")); + ASYS_TEXT ("TAO (%P|%t) MessageError received by server\n"))); break; // These messages should never be sent to the server; it's an @@ -935,7 +935,7 @@ TAO_GIOP::process_server_message (TAO_Transport *transport, default: // Unknown message if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Illegal message received by server\n")); + ASYS_TEXT ("TAO (%P|%t) Illegal message received by server\n"))); return TAO_GIOP::send_error (giop_version, transport); } @@ -1080,8 +1080,8 @@ TAO_GIOP::process_server_request (TAO_Transport *transport, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO: (%P|%t) %p: cannot send exception\n", - "TAO_GIOP::process_server_message")); + ASYS_TEXT ("TAO: (%P|%t) %p: cannot send exception\n"), + ASYS_TEXT ("TAO_GIOP::process_server_message"))); ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO: "); } @@ -1096,8 +1096,8 @@ TAO_GIOP::process_server_request (TAO_Transport *transport, // down, since it really isn't the client's fault. ACE_ERROR ((LM_ERROR, - "(%P|%t) exception thrown " - "but client is not waiting a response\n")); + ASYS_TEXT ("(%P|%t) exception thrown ") + ASYS_TEXT ("but client is not waiting a response\n"))); ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO: "); } @@ -1171,8 +1171,8 @@ TAO_GIOP::process_server_request (TAO_Transport *transport, // No exception but some kind of error, yet a response // is required. ACE_ERROR ((LM_ERROR, - "TAO: (%P|%t) %p: cannot send reply\n", - "TAO_GIOP::process_server_message")); + ASYS_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"), + ASYS_TEXT ("TAO_GIOP::process_server_message"))); } } } @@ -1219,7 +1219,7 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "Simple Object key %s. Doing the Table Lookup ...\n", + ASYS_TEXT ("Simple Object key %s. Doing the Table Lookup ...\n"), object_id.c_str ())); CORBA::Object_ptr object_reference; @@ -1285,7 +1285,7 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport, status = TAO_GIOP_OBJECT_HERE; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO: (%P|%t) handle_locate() : found\n")); + ASYS_TEXT ("TAO: (%P|%t) handle_locate() : found\n"))); } else if (serverRequest.exception_type () != TAO_GIOP_NO_EXCEPTION) { @@ -1294,14 +1294,14 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport, { status = TAO_GIOP_OBJECT_FORWARD; ACE_DEBUG ((LM_DEBUG, - "handle_locate has been called: forwarding\n")); + ASYS_TEXT ("handle_locate has been called: forwarding\n"))); } else { // Normal exception, so the object is not here status = TAO_GIOP_UNKNOWN_OBJECT; ACE_DEBUG ((LM_DEBUG, - "handle_locate has been called: not here\n")); + ASYS_TEXT ("handle_locate has been called: not here\n"))); } } @@ -1313,7 +1313,7 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport, forward_location_var = forward_request.forward_reference; ACE_DEBUG ((LM_DEBUG, - "handle_locate has been called: forwarding\n")); + ASYS_TEXT ("handle_locate has been called: forwarding\n"))); } #endif /* TAO_HAS_MINIMUM_CORBA */ ACE_CATCHANY @@ -1322,8 +1322,8 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport, status = TAO_GIOP_UNKNOWN_OBJECT; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) TAO_GIOP::process_server_locate - " - "CORBA exception raised\n")); + ASYS_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_locate - ") + ASYS_TEXT ("CORBA exception raised\n"))); } #if defined (TAO_HAS_EXCEPTIONS) ACE_CATCHALL @@ -1353,8 +1353,8 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) TAO_GIOP::process_server_request -" - " cannot marshal object reference\n")); + ASYS_TEXT ("TAO (%P|%t) TAO_GIOP::process_server_request -") + ASYS_TEXT (" cannot marshal object reference\n"))); } } @@ -1367,8 +1367,8 @@ TAO_GIOP::process_server_locate (TAO_Transport *transport, if (TAO_debug_level > 0) { ACE_ERROR ((LM_ERROR, - "TAO: (%P|%t) %p: cannot send reply\n", - "TAO_GIOP::process_server_message")); + ASYS_TEXT ("TAO: (%P|%t) %p: cannot send reply\n"), + ASYS_TEXT ("TAO_GIOP::process_server_message"))); } } @@ -1444,9 +1444,9 @@ TAO_GIOP::send_reply_exception (const TAO_GIOP_Version &version, // Close the handle. ACE_DEBUG ((LM_DEBUG, - "(%P|%t) cannot marshal exception, handle = %d: %p\n", + ASYS_TEXT ("(%P|%t) cannot marshal exception, handle = %d: %p\n"), transport->handle (), - "TAO_GIOP::send_reply_exception")); + ASYS_TEXT ("TAO_GIOP::send_reply_exception"))); return -1; } ACE_ENDTRY; @@ -1610,7 +1610,7 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &input, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) bad header, magic word [%c%c%c%c]\n", + ASYS_TEXT ("TAO (%P|%t) bad header, magic word [%c%c%c%c]\n"), buf[0], buf[1], buf[2], @@ -1626,7 +1626,7 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &input, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) bad version <%d.%d>\n", + ASYS_TEXT ("TAO (%P|%t) bad version <%d.%d>\n"), state.giop_version.major, state.giop_version.minor)); return -1; @@ -1639,8 +1639,8 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &input, && state.byte_order != 0 && state.byte_order != 1) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) invalid byte order <%d>" - " for version <1.0>\n", + ASYS_TEXT ("TAO (%P|%t) invalid byte order <%d>") + ASYS_TEXT (" for version <1.0>\n"), state.byte_order)); return -1; } @@ -1654,8 +1654,8 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &input, && (buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET] & ~0x3) != 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) invalid flags for <%d>" - " for version <1.1>\n", + ASYS_TEXT ("TAO (%P|%t) invalid flags for <%d>") + ASYS_TEXT (" for version <1.1>\n"), buf[TAO_GIOP_MESSAGE_FLAGS_OFFSET])); return -1; } @@ -1671,7 +1671,7 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &input, if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Parsed header = <%d,%d,%d,%d,%d>\n", + ASYS_TEXT ("TAO (%P|%t) Parsed header = <%d,%d,%d,%d,%d>\n"), state.giop_version.major, state.giop_version.minor, state.byte_order, diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp index 34748cfd470..fc931485e76 100644 --- a/TAO/tao/GIOP_Server_Request.cpp +++ b/TAO/tao/GIOP_Server_Request.cpp @@ -673,8 +673,8 @@ TAO_GIOP_ServerRequest::init_reply (CORBA::Environment &ACE_TRY_ENV) if ((*this->outgoing_ << object_ptr) == 0) { ACE_DEBUG ((LM_DEBUG, - "TAO_GIOP_ServerRequest::marshal - " - "encoding forwarded objref failed\n")); + ASYS_TEXT ("TAO_GIOP_ServerRequest::marshal - ") + ASYS_TEXT ("encoding forwarded objref failed\n"))); return; } } @@ -742,8 +742,8 @@ TAO_GIOP_ServerRequest::send_no_exception_reply (TAO_Transport *transport) // No exception but some kind of error, yet a response // is required. ACE_ERROR ((LM_ERROR, - "TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n", - "TAO_GIOP_ServerRequest::send_no_exception_reply")); + ASYS_TEXT ("TAO: (%P|%t) %p: cannot send NO_EXCEPTION reply\n"), + ASYS_TEXT ("TAO_GIOP_ServerRequest::send_no_exception_reply"))); } } } diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp index f9c8d5eb89a..a0d0cb2cf30 100644 --- a/TAO/tao/IIOP_Acceptor.cpp +++ b/TAO/tao/IIOP_Acceptor.cpp @@ -236,8 +236,8 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n", - "cannot open acceptor")); + ASYS_TEXT ("\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n"), + ASYS_TEXT ("cannot open acceptor"))); return -1; } @@ -246,8 +246,8 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n", - "cannot get local addr")); + ASYS_TEXT ("\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n"), + ASYS_TEXT ("cannot get local addr"))); return -1; } @@ -258,8 +258,8 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n", - "cannot cache hostname")); + ASYS_TEXT ("\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n"), + ASYS_TEXT ("cannot cache hostname"))); return -1; } this->host_ = tmp; @@ -272,8 +272,8 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n", - "cannot cache hostname")); + ASYS_TEXT ("\n\nTAO (%P|%t) IIOP_Acceptor::open_i - %p\n\n"), + ASYS_TEXT ("cannot cache hostname"))); return -1; } this->host_ = tmp_host; @@ -282,8 +282,8 @@ TAO_IIOP_Acceptor::open_i (TAO_ORB_Core* orb_core, if (TAO_debug_level > 5) { ACE_DEBUG ((LM_DEBUG, - "\nTAO (%P|%t) IIOP_Acceptor::open_i - " - "listening on: <%s:%u>\n", + ASYS_TEXT ("\nTAO (%P|%t) IIOP_Acceptor::open_i - ") + ASYS_TEXT ("listening on: <%s:%u>\n"), this->host_.c_str (), this->address_.get_port_number ())); } @@ -348,7 +348,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str) if (end == begin) ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) Zero length IIOP option.\n"), + ASYS_TEXT ("TAO (%P|%t) Zero length IIOP option.\n")), -1); else if (end != ACE_CString::npos) { @@ -359,8 +359,8 @@ TAO_IIOP_Acceptor::parse_options (const char *str) if (slot == ACE_static_cast (int, len - 1) || slot == ACE_CString::npos) ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) IIOP option <%s> is " - "missing a value.\n", + ASYS_TEXT ("TAO (%P|%t) IIOP option <%s> is ") + ASYS_TEXT ("missing a value.\n"), opt.c_str ()), -1); @@ -369,8 +369,8 @@ TAO_IIOP_Acceptor::parse_options (const char *str) if (name.length () == 0) ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) Zero length IIOP " - "option name.\n"), + ASYS_TEXT ("TAO (%P|%t) Zero length IIOP ") + ASYS_TEXT ("option name.\n")), -1); if (name == "priority") @@ -387,14 +387,14 @@ TAO_IIOP_Acceptor::parse_options (const char *str) this->priority_ = corba_priority; else ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) Invalid IIOP endpoint " - "priority: <%s>\n", + ASYS_TEXT ("TAO (%P|%t) Invalid IIOP endpoint ") + ASYS_TEXT ("priority: <%s>\n"), value.c_str ()), -1); } else ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) Invalid IIOP option: <%s>\n", + ASYS_TEXT ("TAO (%P|%t) Invalid IIOP option: <%s>\n"), name.c_str ()), -1); } diff --git a/TAO/tao/IIOP_Connect.cpp b/TAO/tao/IIOP_Connect.cpp index bb3f62fe0ae..61011b46860 100644 --- a/TAO/tao/IIOP_Connect.cpp +++ b/TAO/tao/IIOP_Connect.cpp @@ -142,7 +142,7 @@ TAO_IIOP_Server_Connection_Handler::open (void*) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP connection from client <%s> on %d\n", + ASYS_TEXT ("TAO (%P|%t) IIOP connection from client <%s> on %d\n"), client, this->peer ().get_handle ())); return 0; @@ -162,8 +162,8 @@ TAO_IIOP_Server_Connection_Handler::activate (long flags, { if (TAO_orbdebug) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Server_Connection_Handler::activate %d " - "threads, flags = %d\n", + ASYS_TEXT ("TAO (%P|%t) IIOP_Server_Connection_Handler::activate %d ") + ASYS_TEXT ("threads, flags = %d\n"), n_threads, flags, THR_BOUND)); @@ -186,8 +186,8 @@ TAO_IIOP_Server_Connection_Handler::handle_close (ACE_HANDLE handle, { if (TAO_orbdebug) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Server_Connection_Handler::handle_close " - "(%d, %d)\n", + ASYS_TEXT ("TAO (%P|%t) IIOP_Server_Connection_Handler::handle_close ") + ASYS_TEXT ("(%d, %d)\n"), handle, rm)); @@ -211,7 +211,7 @@ TAO_IIOP_Server_Connection_Handler::svc (void) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Server_Connection_Handler::svc begin\n")); + ASYS_TEXT ("TAO (%P|%t) IIOP_Server_Connection_Handler::svc begin\n"))); // Here we simply synthesize the "typical" event loop one might find // in a reactive handler, except that this can simply block waiting @@ -239,13 +239,13 @@ TAO_IIOP_Server_Connection_Handler::svc (void) current_timeout = timeout; if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Server_Connection_Handler::svc - " - "loop <%d>\n", current_timeout.msec ())); + ASYS_TEXT ("TAO (%P|%t) IIOP_Server_Connection_Handler::svc - ") + ASYS_TEXT ("loop <%d>\n"), current_timeout.msec ())); } if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Server_Connection_Handler::svc end\n")); + ASYS_TEXT ("TAO (%P|%t) IIOP_Server_Connection_Handler::svc end\n"))); return result; } @@ -270,9 +270,9 @@ TAO_IIOP_Server_Connection_Handler::handle_input_i (ACE_HANDLE, if (result == -1 && TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - %p\n", - "IIOP_Server_Connection_Handler::handle_input, " - "handle_input")); + ASYS_TEXT ("TAO (%P|%t) - %p\n"), + ASYS_TEXT ("IIOP_Server_Connection_Handler::handle_input, ") + ASYS_TEXT ("handle_input"))); } if (result == 0 || result == -1) @@ -382,7 +382,7 @@ TAO_IIOP_Client_Connection_Handler::open (void *) (void *) &nodelay, sizeof (nodelay)) == -1) ACE_ERROR_RETURN ((LM_ERROR, - "NODELAY failed\n"), + ASYS_TEXT ("NODELAY failed\n")), -1); #endif /* TCP_NODELAY */ @@ -404,7 +404,7 @@ TAO_IIOP_Client_Connection_Handler::open (void *) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP connection to server <%s> on %d\n", + ASYS_TEXT ("TAO (%P|%t) IIOP connection to server <%s> on %d\n"), server, this->peer ().get_handle ())); // Register the handler with the Reactor if necessary. @@ -453,8 +453,8 @@ TAO_IIOP_Client_Connection_Handler::handle_close (ACE_HANDLE handle, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Client_Connection_Handler::" - "handle_close (%d, %d)\n", handle, rm)); + ASYS_TEXT ("TAO (%P|%t) IIOP_Client_Connection_Handler::") + ASYS_TEXT ("handle_close (%d, %d)\n"), handle, rm)); if (this->recycler ()) this->recycler ()->mark_as_closed (this->recycling_act ()); @@ -476,8 +476,8 @@ TAO_IIOP_Client_Connection_Handler::handle_close_i (ACE_HANDLE handle, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Client_Connection_Handler::" - "handle_close_i (%d, %d)\n", handle, rm)); + ASYS_TEXT ("TAO (%P|%t) IIOP_Client_Connection_Handler::") + ASYS_TEXT ("handle_close_i (%d, %d)\n"), handle, rm)); if (this->recycler ()) this->recycler ()->mark_as_closed_i (this->recycling_act ()); diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 4b0a5a354be..f019e677d3c 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -479,8 +479,8 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile, profile->addr_to_string (buffer, (MAXNAMELEN * 2) - 1); ACE_DEBUG ((LM_ERROR, - "(%P|%t) %s:%u, connection to " - "%s failed (%p)\n", + ASYS_TEXT ("(%P|%t) %s:%u, connection to ") + ASYS_TEXT ("%s failed (%p)\n"), __FILE__, __LINE__, buffer, @@ -560,8 +560,8 @@ TAO_IIOP_Connector::preconnect (const char *preconnects) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) No port specified for <%s>. " - "Using <%d> as default port.\n", + ASYS_TEXT ("TAO (%P|%t) No port specified for <%s>. ") + ASYS_TEXT ("Using <%d> as default port.\n"), where, dest.get_port_number ())); } @@ -620,14 +620,14 @@ TAO_IIOP_Connector::preconnect (const char *preconnects) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Preconnection <%s:%d> " - "succeeded.\n", + ASYS_TEXT ("TAO (%P|%t) Preconnection <%s:%d> ") + ASYS_TEXT ("succeeded.\n"), remote_addrs[slot].get_host_name (), remote_addrs[slot].get_port_number ())); } else if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Preconnection <%s:%d> failed.\n", + ASYS_TEXT ("TAO (%P|%t) Preconnection <%s:%d> failed.\n"), remote_addrs[slot].get_host_name (), remote_addrs[slot].get_port_number ())); } @@ -636,8 +636,8 @@ TAO_IIOP_Connector::preconnect (const char *preconnects) if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP preconnections: %d successes and " - "%d failures.\n", + ASYS_TEXT ("TAO (%P|%t) IIOP preconnections: %d successes and ") + ASYS_TEXT ("%d failures.\n"), successes, num_connections - successes)); } diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 95a3abf3391..8c3d4d9fd98 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -151,7 +151,7 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n", + ASYS_TEXT ("TAO (%P|%t) IIOP_Profile::decode - v%d.%d\n"), this->version_.major, this->version_.minor)); } @@ -164,8 +164,8 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Profile::decode - " - "error while decoding host/port")); + ASYS_TEXT ("TAO (%P|%t) IIOP_Profile::decode - ") + ASYS_TEXT ("error while decoding host/port"))); } return -1; } @@ -189,7 +189,7 @@ TAO_IIOP_Profile::decode (TAO_InputCDR& cdr) // If there is extra data in the profile we are supposed to // ignore it, but print a warning just in case... ACE_DEBUG ((LM_DEBUG, - "%d bytes out of %d left after IIOP profile data\n", + ASYS_TEXT ("%d bytes out of %d left after IIOP profile data\n"), cdr.length (), encap_len)); } diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index 6727a930585..6517c0b4248 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -221,8 +221,8 @@ TAO_IIOP_Client_Transport::handle_client_input (int /* block */, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) IIOP_Transport::handle_client_input -" - " nil message state\n")); + ASYS_TEXT ("TAO (%P|%t) IIOP_Transport::handle_client_input -") + ASYS_TEXT (" nil message state\n"))); return -1; } @@ -234,8 +234,8 @@ TAO_IIOP_Client_Transport::handle_client_input (int /* block */, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - %p\n", - "IIOP_Transport::handle_client_input, handle_input")); + ASYS_TEXT ("TAO (%P|%t) - %p\n"), + ASYS_TEXT ("IIOP_Transport::handle_client_input, handle_input"))); return -1; } if (result == 0) @@ -257,8 +257,8 @@ TAO_IIOP_Client_Transport::handle_client_input (int /* block */, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - %p\n", - "IIOP_Transport::handle_client_input, parse reply")); + ASYS_TEXT ("TAO (%P|%t) - %p\n"), + ASYS_TEXT ("IIOP_Transport::handle_client_input, parse reply"))); message_state->reset (); return -1; } @@ -274,9 +274,9 @@ TAO_IIOP_Client_Transport::handle_client_input (int /* block */, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) : IIOP_Client_Transport::" - "handle_client_input - " - "dispatch reply failed\n")); + ASYS_TEXT ("TAO (%P|%t) : IIOP_Client_Transport::") + ASYS_TEXT ("handle_client_input - ") + ASYS_TEXT ("dispatch reply failed\n"))); message_state->reset (); return -1; } diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index e546c8ff6b9..7125a3761d7 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -150,7 +150,7 @@ TAO_GIOP_Invocation::select_profile_based_on_policy } if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - matching priority range %d %d\n", + ASYS_TEXT ("TAO (%P|%t) - matching priority range %d %d\n"), min_priority, max_priority)); @@ -261,7 +261,7 @@ TAO_GIOP_Invocation::start (CORBA::Environment &ACE_TRY_ENV) CORBA::ULong msecs = ACE_static_cast(CORBA::ULong, microseconds / 1000); ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Timeout is <%u>\n", + ASYS_TEXT ("TAO (%P|%t) Timeout is <%u>\n"), msecs)); } } @@ -707,7 +707,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts, if (TAO_debug_level > 5) ACE_DEBUG ((LM_DEBUG, - "TAO: (%P|%t) Raising exception %s\n", + ASYS_TEXT ("TAO: (%P|%t) Raising exception %s\n"), buf.in ())); // @@ Think about a better way to raise the exception here, @@ -786,7 +786,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) this->max_wait_time_->msec (); ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Timeout on recv is <%u>\n", + ASYS_TEXT ("TAO (%P|%t) Timeout on recv is <%u>\n"), msecs)); } @@ -801,7 +801,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) this->max_wait_time_->msec (); ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Timeout after recv is <%u> status <%d>\n", + ASYS_TEXT ("TAO (%P|%t) Timeout after recv is <%u> status <%d>\n"), msecs, reply_error)); } @@ -998,7 +998,7 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) this->max_wait_time_->msec (); ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Timeout on recv is <%u>\n", + ASYS_TEXT ("TAO (%P|%t) Timeout on recv is <%u>\n"), msecs)); } @@ -1013,7 +1013,7 @@ TAO_GIOP_Oneway_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) this->max_wait_time_->msec (); ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Timeout after recv is <%u> status <%d>\n", + ASYS_TEXT ("TAO (%P|%t) Timeout after recv is <%u> status <%d>\n"), msecs, reply_error)); } diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 6f055ab3b6f..8e266bf50b7 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -344,7 +344,7 @@ CORBA_NVList::_tao_encode (TAO_OutputCDR &cdr, arg = "(nil)"; ACE_DEBUG ((LM_DEBUG, - "NVList::_tao_encode - parameter <%s>\n", + ASYS_TEXT ("NVList::_tao_encode - parameter <%s>\n"), arg)); } CORBA::TypeCode_var tc = nv->value ()->type (); @@ -388,7 +388,7 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming, CORBA::Environment &ACE_TRY_ENV) { if (TAO_debug_level > 3) - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) : NVList::_tao_decode\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n"))); // Then unmarshal each "in" and "inout" parameter. ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_); @@ -409,7 +409,7 @@ CORBA_NVList::_tao_decode (TAO_InputCDR &incoming, if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) : NVList::_tao_decode - %s\n", + ASYS_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"), 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 3726cf64f2f..6065b0f2ce6 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -197,7 +197,7 @@ CORBA_ORB::destroy (CORBA::Environment &ACE_TRY_ENV) if (TAO_debug_level >= 3) { ACE_DEBUG ((LM_DEBUG, - "CORBA::ORB::destroy() has been called on ORB <%s>.\n", + ASYS_TEXT ("CORBA::ORB::destroy() has been called on ORB <%s>.\n"), this->orb_core ()->orbid ())); } @@ -251,7 +251,7 @@ CORBA_ORB::create_list (CORBA::Long count, CORBA::NVList_ptr &new_list, CORBA_Environment &ACE_TRY_ENV) { - assert (CORBA::ULong (count) <= UINT_MAX); + ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX); // Create an empty list ACE_NEW_THROW_EX (new_list, @@ -537,8 +537,8 @@ CORBA_ORB::multicast_query (char *&buf, || acceptor.get_local_addr (my_addr) == -1) { ACE_ERROR ((LM_ERROR, - "acceptor.open () || " - "acceptor.get_local_addr () failed")); + ASYS_TEXT ("acceptor.open () || ") + ASYS_TEXT ("acceptor.get_local_addr () failed"))); result = -1; } else @@ -556,7 +556,7 @@ CORBA_ORB::multicast_query (char *&buf, if (multicast_addr.set (mde.c_str()) == -1) { ACE_ERROR ((LM_ERROR, - "ORB.cpp: Multicast address setting failed\n")); + ASYS_TEXT("ORB.cpp: Multicast address setting failed\n"))); stream.close (); dgram.close (); acceptor.close (); @@ -567,7 +567,7 @@ CORBA_ORB::multicast_query (char *&buf, if (dgram.open (ACE_Addr::sap_any) == -1) { ACE_ERROR ((LM_ERROR, - "Unable to open the Datagram!\n")); + ASYS_TEXT ("Unable to open the Datagram!\n"))); result = -1; } else @@ -605,19 +605,19 @@ CORBA_ORB::multicast_query (char *&buf, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "\nsent multicast request.")); + ASYS_TEXT ("\nsent multicast request."))); // Check for errors. if (result == -1) ACE_ERROR ((LM_ERROR, - "%p\n", - "error sending IIOP multicast")); + ASYS_TEXT ("%p\n"), + ASYS_TEXT ("error sending IIOP multicast"))); else { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "\n%s; Sent multicast." - "# of bytes sent is %d.\n", + ASYS_TEXT ("\n%s; Sent multicast.") + ASYS_TEXT ("# of bytes sent is %d.\n"), __FILE__, result)); // Wait for response until timeout. @@ -632,8 +632,8 @@ CORBA_ORB::multicast_query (char *&buf, &tv) == -1) { ACE_ERROR ((LM_ERROR, - "%p\n", - "multicast_query: unable to accept")); + ASYS_TEXT ("%p\n"), + ASYS_TEXT ("multicast_query: unable to accept"))); result = -1; } else @@ -649,9 +649,9 @@ CORBA_ORB::multicast_query (char *&buf, if (result != sizeof (ior_len)) { ACE_ERROR ((LM_ERROR, - "%p\n", - "multicast_query: unable to receive " - "ior length")); + ASYS_TEXT ("%p\n"), + ASYS_TEXT ("multicast_query: unable to receive ") + ASYS_TEXT ("ior length"))); result = -1; } else @@ -665,9 +665,9 @@ CORBA_ORB::multicast_query (char *&buf, if (buf == 0) { ACE_ERROR ((LM_ERROR, - "%p\n", - "multicast_query: unable to " - "allocate memory")); + ASYS_TEXT ("%p\n"), + ASYS_TEXT ("multicast_query: unable to ") + ASYS_TEXT ("allocate memory"))); result = -1; } } @@ -681,11 +681,11 @@ CORBA_ORB::multicast_query (char *&buf, &tv); if (result == -1) ACE_ERROR ((LM_ERROR, - "%p\n", - "error reading ior")); + ASYS_TEXT ( "%p\n"), + ASYS_TEXT ("error reading ior"))); else if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "%s: service resolved to IOR <%s>\n", + ASYS_TEXT ("%s: service resolved to IOR <%s>\n"), __FILE__, buf)); } @@ -1478,7 +1478,7 @@ CORBA::ORB_init (int &argc, if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) created new ORB <%s>\n", + ASYS_TEXT ("TAO (%P|%t) created new ORB <%s>\n"), orbid)); // Before returning remember to store the ORB into the table... @@ -1579,8 +1579,8 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO_Stub pointer in CORBA::ORB::object_to_string() " - "is zero.\n")); + ASYS_TEXT ("TAO_Stub pointer in CORBA::ORB::object_to_string() ") + ASYS_TEXT ("is zero.\n"))); ACE_THROW_RETURN (CORBA::MARSHAL ( CORBA_SystemException::_tao_minor_code ( @@ -1601,8 +1601,8 @@ CORBA_ORB::object_to_string (CORBA::Object_ptr obj, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TAO_Profile pointer in " - "CORBA::ORB::object_to_string() is zero.\n")); + ASYS_TEXT ("TAO_Profile pointer in ") + ASYS_TEXT ("CORBA::ORB::object_to_string() is zero.\n"))); ACE_THROW_RETURN (CORBA::MARSHAL ( CORBA_SystemException::_tao_minor_code ( @@ -1992,7 +1992,7 @@ CORBA_ORB::_tao_add_to_IOR_table (const ACE_CString &object_id, { if (CORBA::is_nil (obj)) ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t): Cannot add nil object to table <%s>\n", + ASYS_TEXT ("TAO (%P|%t): Cannot add nil object to table <%s>\n"), object_id.c_str ()), -1); @@ -2006,7 +2006,7 @@ CORBA_ORB::_tao_add_to_IOR_table (const ACE_CString &object_id, if (this->lookup_table_.add_ior (object_id, ior) != 0) ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t): Unable to add IOR to table <%s>\n", + ASYS_TEXT ("TAO (%P|%t): Unable to add IOR to table <%s>\n"), object_id.c_str ()), -1); @@ -2127,7 +2127,7 @@ void CORBA_ORB::unregister_value_factory (const char * /* repository_id */, CORBA_Environment &) { - ACE_ERROR((LM_ERROR, "(%N:%l) function not implemented\n")); + ACE_ERROR((LM_ERROR, ASYS_TEXT ("(%N:%l) function not implemented\n"))); // %! TODO } diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index 0d2245c1bb0..35b5a5a294f 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -293,7 +293,7 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (TAO_debug_level <= 0) TAO_debug_level = 1; ACE_DEBUG ((LM_DEBUG, - "TAO_debug_level == %d", TAO_debug_level)); + ASYS_TEXT ("TAO_debug_level == %d"), TAO_debug_level)); } } #endif /* TAO_DEBUG */ @@ -399,8 +399,8 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (this->orb_params ()->endpoints (endpts) != 0) { ACE_ERROR ((LM_ERROR, - "(%P|%t)\n" - "Invalid endpoint(s) specified:\n%s\n", + ASYS_TEXT ("(%P|%t)\n") + ASYS_TEXT ("Invalid endpoint(s) specified:\n%s\n"), endpts.c_str ())); ACE_THROW_RETURN (CORBA::BAD_PARAM (), -1); } @@ -424,8 +424,8 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // Issue a warning since this backward compatibilty support // may be dropped in future releases. ACE_DEBUG ((LM_WARNING, - "(%P|%t) \nWARNING: The `-ORBHost' option is obsolete.\n" - "In the future, use the `-ORBEndpoint' option.\n")); + ASYS_TEXT ("(%P|%t) \nWARNING: The `-ORBHost' option is obsolete.\n") + ASYS_TEXT ("In the future, use the `-ORBEndpoint' option.\n"))); host = current_arg; @@ -438,9 +438,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // Issue a warning since this backward compatibilty support // may be dropped in future releases. ACE_DEBUG ((LM_WARNING, - "(%P|%t) \nWARNING: The `-ORBNameServiceIOR' option " - "is obsolete.\n" - "Please use the `-ORBInitRef ' option instead.\n")); + ASYS_TEXT ("(%P|%t) \nWARNING: The `-ORBNameServiceIOR' option ") + ASYS_TEXT ("is obsolete.\n") + ASYS_TEXT ("Please use the `-ORBInitRef ' option instead.\n"))); // Construct an argument that would be equivalent to // "-ORBInitRef NameService=....." @@ -451,8 +451,8 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (this->orb_params ()->add_to_ior_table (init_ref) != 0) { ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) Unable to add the Name " - "Service IOR <%s> to the lookup table.\n", + ASYS_TEXT ("TAO (%P|%t) Unable to add the Name ") + ASYS_TEXT ("Service IOR <%s> to the lookup table.\n"), current_arg)); ACE_THROW_RETURN (CORBA::INTERNAL (), -1); } @@ -495,9 +495,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // Issue a warning since this backward compatibilty support // may be dropped in future releases. ACE_DEBUG ((LM_WARNING, - "(%P|%t) \nWARNING: The `-ORBTradingServiceIOR' " - "option is obsolete.\n" - "Please use the `-ORBInitRef' option instead.\n")); + ASYS_TEXT ("(%P|%t) \nWARNING: The `-ORBTradingServiceIOR' ") + ASYS_TEXT ("option is obsolete.\n") + ASYS_TEXT ("Please use the `-ORBInitRef' option instead.\n"))); // Construct an argument that would be equivalent to // "-ORBInitRef TradingService=....." @@ -510,8 +510,8 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (this->orb_params ()->add_to_ior_table (init_ref) != 0) { ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) Unable to add the Trading " - "Service IOR <%s> to the lookup table.\n", + ASYS_TEXT ("TAO (%P|%t) Unable to add the Trading ") + ASYS_TEXT ("Service IOR <%s> to the lookup table.\n"), current_arg)); ACE_THROW_RETURN (CORBA::INTERNAL (), -1); } @@ -535,9 +535,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // Issue a warning since this backward compatibilty support // may be dropped in future releases. ACE_DEBUG ((LM_WARNING, - "(%P|%t) \nWARNING: The `-ORBImplRepoServiceIOR' " - "option is obsolete.\n" - "Please use the `-ORBInitRef' option instead.\n")); + ASYS_TEXT ("(%P|%t) \nWARNING: The `-ORBImplRepoServiceIOR' ") + ASYS_TEXT ("option is obsolete.\n") + ASYS_TEXT ("Please use the `-ORBInitRef' option instead.\n"))); // Construct an argument that would be equivalent to // "-ORBInitRef ImplRepoService=....." @@ -550,9 +550,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (this->orb_params ()->add_to_ior_table (init_ref) != 0) { ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) Unable to add the " - "Implementation Repository IOR <%s> to " - "the lookup table.\n", + ASYS_TEXT ("TAO (%P|%t) Unable to add the ") + ASYS_TEXT ("Implementation Repository IOR <%s> to ") + ASYS_TEXT ("the lookup table.\n"), current_arg)); ACE_THROW_RETURN (CORBA::INTERNAL (), -1); } @@ -576,8 +576,8 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) old_style_endpoint = 1; ACE_DEBUG ((LM_WARNING, - "(%P|%t) \nWARNING: The `-ORBPort' option is obsolete.\n" - "In the future, use the `-ORBEndpoint' option.\n")); + ASYS_TEXT ("(%P|%t) \nWARNING: The `-ORBPort' option is obsolete.\n") + ASYS_TEXT ("In the future, use the `-ORBEndpoint' option.\n"))); // Specify the port number/name on which we should listen // We really shouldn't limit this to being specified as @@ -666,9 +666,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) { yes_implies_global = 1; ACE_DEBUG ((LM_WARNING, - "WARNING: using '-ORBCollocation YES' is obsolete " - "and implies '-ORBCollocation global'" - " Please use '-ORBCollocation global' instead.\n")); + ASYS_TEXT ("WARNING: using '-ORBCollocation YES' is obsolete ") + ASYS_TEXT ("and implies '-ORBCollocation global'") + ASYS_TEXT (" Please use '-ORBCollocation global' instead.\n"))); } if (yes_implies_global || @@ -694,9 +694,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // calls. { ACE_DEBUG ((LM_WARNING, - "WARNING: -ORBGlobalCollocation option is obsolete." - " Please use '-ORBCollocation global/per-orb/no'" - "instead.\n")); + ASYS_TEXT ("WARNING: -ORBGlobalCollocation option is obsolete.") + ASYS_TEXT (" Please use '-ORBCollocation global/per-orb/no'") + ASYS_TEXT ("instead.\n"))); char *opt = current_arg; if (ACE_OS::strcasecmp (opt, "YES") == 0) @@ -741,17 +741,17 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) // may be dropped in future releases. ACE_DEBUG ((LM_WARNING, - "(%P|%t) \nWARNING: The `host:port' pair style " - "for `-ORBPreconnect' is obsolete.\n" - "In the future, use the URL style.\n")); + ASYS_TEXT ("(%P|%t) \nWARNING: The `host:port' pair style ") + ASYS_TEXT ("for `-ORBPreconnect' is obsolete.\n") + ASYS_TEXT ("In the future, use the URL style.\n"))); preconnections = ACE_CString ("iiop://") + ACE_CString (preconnections); ACE_DEBUG ((LM_WARNING, - "(%P|%t) \nWARNING: The following preconnection " - "will be used:\n%s\n", + ASYS_TEXT ("(%P|%t) \nWARNING: The following preconnection ") + ASYS_TEXT ("will be used:\n%s\n"), preconnections.c_str())); this->orb_params ()->preconnects (preconnections); @@ -793,9 +793,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (this->orb_params ()->add_to_ior_table (init_ref) != 0) { ACE_ERROR ((LM_ERROR, - "Unable to add initial reference:\n" - "%s\n" - "to the initial reference lookup table.\n", + ASYS_TEXT ("Unable to add initial reference:\n") + ASYS_TEXT ("%s\n") + ASYS_TEXT ("to the initial reference lookup table.\n"), current_arg)); ACE_THROW_RETURN (CORBA::INTERNAL (), -1); } @@ -890,8 +890,8 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_WARNING, - "WARNING: Unknown \"-ORB\" option <%s>.\n" - " Removing it from the argument list.\n", + ASYS_TEXT ("WARNING: Unknown \"-ORB\" option <%s>.\n") + ASYS_TEXT (" Removing it from the argument list.\n"), current_arg)); arg_shifter.consume_arg (); } @@ -940,9 +940,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (result != 0 && errno != ENOENT) { ACE_ERROR ((LM_ERROR, - "(%P|%t) %p\n", - "ORB Core unable to initialize the " - "Service Configurator")); + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("ORB Core unable to initialize the ") + ASYS_TEXT ("Service Configurator"))); ACE_THROW_RETURN (CORBA::INITIALIZE (), -1); } @@ -954,8 +954,8 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (trf == 0) { ACE_ERROR ((LM_ERROR, - "(%P|%t) %p\n", - "ORB Core unable to find a Resource Factory instance")); + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("ORB Core unable to find a Resource Factory instance"))); ACE_THROW_RETURN (CORBA::INTERNAL (), -1); } @@ -977,8 +977,8 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (reactor == 0) { ACE_ERROR ((LM_ERROR, - "(%P|%t) %p\n", - "ORB Core unable to initialize reactor")); + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("ORB Core unable to initialize reactor"))); ACE_THROW_RETURN (CORBA::INITIALIZE (), -1); } @@ -987,9 +987,9 @@ TAO_ORB_Core::init (int &argc, char *argv[], CORBA::Environment &ACE_TRY_ENV) if (ssf == 0) { ACE_ERROR ((LM_ERROR, - "(%P|%t) %p\n", - "ORB Core unable to find a Server Strategy Factory " - "instance")); + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("ORB Core unable to find a Server Strategy Factory ") + ASYS_TEXT ("instance"))); ACE_THROW_RETURN (CORBA::INTERNAL (), -1); } @@ -1139,8 +1139,8 @@ TAO_ORB_Core::set_iiop_endpoint (int dotted_decimal_addresses, if (ACE_OS::hostname (name, MAXHOSTNAMELEN + 1) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p\n", - "failed to look up local host name"), + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("failed to look up local host name")), -1); } host.set (name, 1); @@ -1159,8 +1159,8 @@ TAO_ORB_Core::set_iiop_endpoint (int dotted_decimal_addresses, dotted_decimal_addresses) == -1) { ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p\n", - "failed in addr_to_string ()"), + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("failed in addr_to_string ()")), -1); } @@ -1180,7 +1180,7 @@ TAO_ORB_Core::fini (void) if (TAO_debug_level >= 3) { ACE_DEBUG ((LM_DEBUG, - "Destroying ORB <%s>\n", + ASYS_TEXT ("Destroying ORB <%s>\n"), this->orbid_)); } @@ -1254,10 +1254,10 @@ TAO_ORB_Core::resource_factory (void) // platforms. if (TAO_orbdebug) ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No Resource Factory found " - "in Service Repository.\n" - " Using default instance with GLOBAL resource " - "source specifier.\n")); + ASYS_TEXT ("(%P|%t) WARNING - No Resource Factory found ") + ASYS_TEXT ("in Service Repository.\n") + ASYS_TEXT (" Using default instance with GLOBAL resource ") + ASYS_TEXT ("source specifier.\n"))); TAO_Default_Resource_Factory *default_factory; ACE_NEW_RETURN (default_factory, @@ -1297,9 +1297,9 @@ TAO_ORB_Core::client_factory (void) // platforms. if (TAO_orbdebug) ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No Client Strategy Factory found " - "in Service Repository.\n" - " Using default instance.\n")); + ASYS_TEXT ("(%P|%t) WARNING - No Client Strategy Factory found ") + ASYS_TEXT ("in Service Repository.\n") + ASYS_TEXT (" Using default instance.\n"))); ACE_NEW_RETURN (this->client_factory_, TAO_Default_Client_Strategy_Factory, @@ -1336,9 +1336,9 @@ TAO_ORB_Core::server_factory (void) // Still don't have one, so let's allocate the default. if (TAO_orbdebug) ACE_ERROR ((LM_WARNING, - "(%P|%t) WARNING - No %s found in Service Repository." - " Using default instance.\n", - "Server Strategy Factory")); + ASYS_TEXT ("(%P|%t) WARNING - No %s found in Service Repository.") + ASYS_TEXT (" Using default instance.\n"), + ASYS_TEXT ("Server Strategy Factory"))); ACE_NEW_RETURN (this->server_factory_, TAO_Default_Server_Strategy_Factory, @@ -1592,7 +1592,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, { if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - start of run\n")); + ASYS_TEXT ("TAO (%P|%t) - start of run\n"))); TAO_Leader_Follower &leader_follower = this->leader_follower (); { @@ -1634,7 +1634,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, { if (TAO_debug_level >= 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - blocking on handle events\n")); + ASYS_TEXT ("TAO (%P|%t) - blocking on handle events\n"))); switch (r->handle_events (tv)) { case 0: // Timed out, so we return to caller. @@ -1664,13 +1664,13 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, if (leader_follower.elect_new_leader () == -1) ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) Failed to wake up " - "a follower thread\n"), + ASYS_TEXT ("TAO (%P|%t) Failed to wake up ") + ASYS_TEXT ("a follower thread\n")), -1); } if (TAO_debug_level >= 3) - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - end of run %d\n", result)); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("TAO (%P|%t) - end of run %d\n"), result)); return result; } @@ -1785,9 +1785,9 @@ TAO_ORB_Core::input_cdr_dblock_allocator (void) TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); if (tss == 0) ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p\n", - "TAO_ORB_Core::input_cdr_dblock_allocator (); " - "no more TSS keys"), + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("TAO_ORB_Core::input_cdr_dblock_allocator (); ") + ASYS_TEXT ("no more TSS keys")), 0); return this->input_cdr_dblock_allocator_i (tss); } @@ -1821,9 +1821,9 @@ TAO_ORB_Core::input_cdr_buffer_allocator (void) TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); if (tss == 0) ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p\n", - "TAO_ORB_Core::input_cdr_buffer_allocator (); " - "no more TSS keys"), + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("TAO_ORB_Core::input_cdr_buffer_allocator (); ") + ASYS_TEXT ("no more TSS keys")), 0); return this->input_cdr_buffer_allocator_i (tss); @@ -1850,9 +1850,9 @@ TAO_ORB_Core::output_cdr_dblock_allocator (void) TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); if (tss == 0) ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p\n", - "TAO_ORB_Core::output_cdr_dblock_allocator (); " - "no more TSS keys"), + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("TAO_ORB_Core::output_cdr_dblock_allocator (); ") + ASYS_TEXT ("no more TSS keys")), 0); if (tss->output_cdr_dblock_allocator_ == 0) @@ -1885,9 +1885,9 @@ TAO_ORB_Core::output_cdr_buffer_allocator (void) TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); if (tss == 0) ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p\n", - "TAO_ORB_Core::input_cdr_buffer_allocator (); " - "no more TSS keys"), + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("TAO_ORB_Core::input_cdr_buffer_allocator (); ") + ASYS_TEXT ("no more TSS keys")), 0); if (tss->output_cdr_buffer_allocator_ == 0) @@ -1923,9 +1923,9 @@ TAO_ORB_Core::create_input_cdr_data_block (size_t size) TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); if (tss == 0) ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) %p\n", - "TAO_ORB_Core::create_input_cdr_data_block (); " - "no more TSS keys"), + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("TAO_ORB_Core::create_input_cdr_data_block (); ") + ASYS_TEXT ("no more TSS keys")), 0); dblock_allocator = @@ -2016,8 +2016,8 @@ TAO_ORB_Core::get_thread_priority (CORBA::Short &priority) if (ACE_Thread::getprio (current, native_priority) == -1) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - ORB_Core::get_thread_priority: " - " ACE_Thread::get_prio\n")); + ASYS_TEXT ("TAO (%P|%t) - ORB_Core::get_thread_priority: ") + ASYS_TEXT (" ACE_Thread::get_prio\n"))); return -1; } @@ -2027,8 +2027,8 @@ TAO_ORB_Core::get_thread_priority (CORBA::Short &priority) if (priority_mapping->to_CORBA (native_priority, priority) == 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - ORB_Core::get_thread_priority: " - " Priority_Mapping::to_CORBA\n")); + ASYS_TEXT ("TAO (%P|%t) - ORB_Core::get_thread_priority: ") + ASYS_TEXT (" Priority_Mapping::to_CORBA\n"))); return -1; } diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 76e93af55dc..36a4e6de5e1 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -223,7 +223,7 @@ CORBA::Object::_key (CORBA::Environment &) if (this->_stubobj () && this->_stubobj ()->profile_in_use ()) return this->_stubobj ()->profile_in_use ()->_key (); - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) Null stub obj!!!\n"), 0); + ACE_ERROR_RETURN((LM_ERROR, ASYS_TEXT ("(%P|%t) Null stub obj!!!\n")), 0); } const TAO_ObjectKey & @@ -630,7 +630,7 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "WARNING: extracting object from default ORB_Core\n")); + ASYS_TEXT ("WARNING: extracting object from default ORB_Core\n"))); } } @@ -648,8 +648,8 @@ operator>> (TAO_InputCDR& cdr, CORBA_Object*& x) if (mp.profile_count () != profile_count) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) could not create all " - "the profiles\n")); + ASYS_TEXT ("TAO (%P|%t) could not create all ") + ASYS_TEXT ("the profiles\n"))); return 0; } diff --git a/TAO/tao/Operation_Table.cpp b/TAO/tao/Operation_Table.cpp index fdd2a299c57..d5992812b44 100644 --- a/TAO/tao/Operation_Table.cpp +++ b/TAO/tao/Operation_Table.cpp @@ -70,8 +70,8 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable (const TAO_operation_db_entry // @@ (ASG): what happens if bind fails ??? if (this->bind (db[i].opname_, db[i].skel_ptr_) == -1) ACE_ERROR ((LM_ERROR, - "(%P|%t) %p\n", - "bind failed")); + ASYS_TEXT ("(%P|%t) %p\n"), + ASYS_TEXT ("bind failed"))); } TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void) @@ -143,7 +143,7 @@ TAO_Linear_Search_OpTable::find (const char *opname, const TAO_operation_db_entry *entry = lookup (opname); if (entry == 0) ACE_ERROR_RETURN ((LM_ERROR, - "TAO_Linear_Search_Table:find failed\n"), + ASYS_TEXT ("TAO_Linear_Search_Table:find failed\n")), -1); // Valid entry. Figure out the skel_ptr. @@ -247,7 +247,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname, length); if (entry == 0) ACE_ERROR_RETURN ((LM_ERROR, - "TAO_Perfect_Hash_Table:find failed\n"), + ASYS_TEXT ("TAO_Perfect_Hash_Table:find failed\n")), -1); // Valid entry. Figure out the skel_ptr. @@ -290,7 +290,7 @@ TAO_Binary_Search_OpTable::find (const char *opname, if (entry == 0) ACE_ERROR_RETURN ((LM_ERROR, - "TAO_Binary_Search_Table:find failed\n"), + ASYS_TEXT ("TAO_Binary_Search_Table:find failed\n")), -1); // Valid entry. Figure out the skel_ptr. skelfunc = entry->skel_ptr_; diff --git a/TAO/tao/POA.cpp b/TAO/tao/POA.cpp index b400476a835..6ff8258a0ef 100644 --- a/TAO/tao/POA.cpp +++ b/TAO/tao/POA.cpp @@ -617,7 +617,7 @@ TAO_POA::is_servant_in_map (PortableServer::Servant servant) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%t) TAO_POA::is_servant_in_map: waiting for servant to deactivate\n")); + ASYS_TEXT ("(%t) TAO_POA::is_servant_in_map: waiting for servant to deactivate\n"))); ++this->waiting_servant_deactivation_; @@ -654,7 +654,7 @@ TAO_POA::is_user_id_in_map (const PortableServer::ObjectId &id) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%t) TAO_POA::is_user_id_in_map: waiting for servant to deactivate\n")); + ASYS_TEXT ("(%t) TAO_POA::is_user_id_in_map: waiting for servant to deactivate\n"))); ++this->waiting_servant_deactivation_; diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp index 5a56aa90a1b..17eb4e45972 100644 --- a/TAO/tao/POAS.cpp +++ b/TAO/tao/POAS.cpp @@ -223,7 +223,7 @@ void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, voi // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else @@ -519,7 +519,7 @@ void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, v // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else @@ -812,7 +812,7 @@ void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &re // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else @@ -1108,7 +1108,7 @@ void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &re // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else @@ -1405,7 +1405,7 @@ void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerReque // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else @@ -1700,7 +1700,7 @@ void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else @@ -1995,7 +1995,7 @@ void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerReques // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); + ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Bad operation <%s>\n"), opname)); ACE_THROW (CORBA_BAD_OPERATION ()); } else diff --git a/TAO/tao/Pluggable.cpp b/TAO/tao/Pluggable.cpp index 0f3156ec74d..3e8eccaedf5 100644 --- a/TAO/tao/Pluggable.cpp +++ b/TAO/tao/Pluggable.cpp @@ -262,7 +262,7 @@ TAO_Connector::make_mprofile (const char *string, if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - TAO_Connector::make_mprofile <%s>\n", + ASYS_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile <%s>\n"), string)); } diff --git a/TAO/tao/Pool_Per_Endpoint.cpp b/TAO/tao/Pool_Per_Endpoint.cpp index fda07a33f81..f8909a388ac 100644 --- a/TAO/tao/Pool_Per_Endpoint.cpp +++ b/TAO/tao/Pool_Per_Endpoint.cpp @@ -52,7 +52,7 @@ TAO_Pool_Per_Endpoint::run (CORBA::Environment &ACE_TRY_ENV) if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - creating thread at priority %d:%d\n", + ASYS_TEXT ("TAO (%P|%t) - creating thread at priority %d:%d\n"), priority, corba_priority)); #endif /* TAO_HAS_RT_CORBA */ if (this->activate (this->flags_, @@ -71,16 +71,16 @@ TAO_Pool_Per_Endpoint::svc (void) { if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - TAO_Pool_Per_Endpoint::svc: " - " using reactor <%x> in this thread\n", + ASYS_TEXT ("TAO (%P|%t) - TAO_Pool_Per_Endpoint::svc: ") + ASYS_TEXT (" using reactor <%x> in this thread\n"), this->orb_->orb_core ()->reactor ())); this->orb_->run (); if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - TAO_Pool_Per_Endpoint::svc: " - " ORB::run() finished\n")); + ASYS_TEXT ("TAO (%P|%t) - TAO_Pool_Per_Endpoint::svc: ") + ASYS_TEXT (" ORB::run() finished\n"))); return 0; } diff --git a/TAO/tao/Reactor_Per_Priority.cpp b/TAO/tao/Reactor_Per_Priority.cpp index e55729b3228..273901a85c8 100644 --- a/TAO/tao/Reactor_Per_Priority.cpp +++ b/TAO/tao/Reactor_Per_Priority.cpp @@ -42,8 +42,8 @@ TAO_Reactor_Per_Priority::reactor (void) { if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Reactor_Per_Priority::reactor: " - " cannot get priority for this thread\n")); + ASYS_TEXT ("TAO (%P|%t) - Reactor_Per_Priority::reactor: ") + ASYS_TEXT (" cannot get priority for this thread\n"))); return 0; } @@ -108,7 +108,7 @@ TAO_Reactor_Per_Priority::leader_follower_i (CORBA::Short priority) { if (TAO_debug_level > 3) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - new priority %d\n", + ASYS_TEXT ("TAO (%P|%t) - new priority %d\n"), priority)); // The priority is new, create an entry in the table. ACE_NEW_RETURN (leader_follower, diff --git a/TAO/tao/Reply_Dispatcher.cpp b/TAO/tao/Reply_Dispatcher.cpp index 9792935fcab..999398cdb7b 100644 --- a/TAO/tao/Reply_Dispatcher.cpp +++ b/TAO/tao/Reply_Dispatcher.cpp @@ -274,7 +274,7 @@ TAO_DII_Deferred_Reply_Dispatcher::dispatch_reply ( if (TAO_debug_level >= 4) { ACE_DEBUG ((LM_DEBUG, - "(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n")); + ASYS_TEXT ("(%P | %t):TAO_Asynch_Reply_Dispatcher::dispatch_reply:\n"))); } ACE_TRY_NEW_ENV diff --git a/TAO/tao/Request.cpp b/TAO/tao/Request.cpp index fa214e0d859..610d65b9484 100644 --- a/TAO/tao/Request.cpp +++ b/TAO/tao/Request.cpp @@ -94,7 +94,7 @@ CORBA_Request::CORBA_Request (CORBA::Object_ptr obj, CORBA_Request::~CORBA_Request (void) { - assert (refcount_ == 0); + ACE_ASSERT (refcount_ == 0); CORBA::release (this->target_); CORBA::string_free ((char*) this->opname_); @@ -219,7 +219,7 @@ CORBA_Request::handle_response (TAO_InputCDR &incoming, default: // @@ (JP) Don't know what to do about any of these yet. ACE_ERROR ((LM_ERROR, - "(%P|%t) unhandled reply status\n")); + ASYS_TEXT ("(%P|%t) unhandled reply status\n"))); } } diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 311dca5ec6c..7056e58e5fd 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -91,8 +91,8 @@ TAO_Stub::TAO_Stub (char *repository_id, if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO: (%P|%t) TAO_Stub created with default " - "ORB core\n")); + ASYS_TEXT ("TAO: (%P|%t) TAO_Stub created with default ") + ASYS_TEXT ("ORB core\n"))); } this->orb_core_ = TAO_ORB_Core_instance (); } @@ -109,7 +109,7 @@ TAO_Stub::TAO_Stub (char *repository_id, TAO_Stub::~TAO_Stub (void) { - assert (this->refcount_ == 0); + ACE_ASSERT (this->refcount_ == 0); if (this->forward_profiles_) reset_profiles (); @@ -182,7 +182,7 @@ TAO_Stub::hash (CORBA::ULong max, // we rely on the profile object that its address info if (profile_in_use_) return profile_in_use_->hash (max, ACE_TRY_ENV); - ACE_ERROR_RETURN((LM_ERROR, "(%P|%t) hash called on a null profile!\n"), 0); + ACE_ERROR_RETURN((LM_ERROR, ASYS_TEXT ("(%P|%t) hash called on a null profile!\n")), 0); } // Expensive comparison of objref data, to see if two objrefs diff --git a/TAO/tao/Stub.i b/TAO/tao/Stub.i index 3399a0b1232..969882d3da2 100644 --- a/TAO/tao/Stub.i +++ b/TAO/tao/Stub.i @@ -12,7 +12,7 @@ TAO_Stub::set_profile_in_use_i (TAO_Profile *pfile) if (pfile && (pfile->_incr_refcnt () == 0)) { ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) unable to increment profile ref!\n"), + ASYS_TEXT ("(%P|%t) unable to increment profile ref!\n")), 0); } diff --git a/TAO/tao/TAO.cpp b/TAO/tao/TAO.cpp index 0930f9b9291..2b762d43364 100644 --- a/TAO/tao/TAO.cpp +++ b/TAO/tao/TAO.cpp @@ -64,7 +64,7 @@ TAO_ORB_Manager::init (int &argc, if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), + ASYS_TEXT (" (%P|%t) Unable to initialize the POA.\n")), -1); // Get the POA object. @@ -118,7 +118,7 @@ TAO_ORB_Manager::init_child_poa (int& argc, if (init_result == -1) ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Error in init.\n"), + ASYS_TEXT (" (%P|%t) Error in init.\n")), -1); // Create the default policies - user-supplied ID, and persistent @@ -224,8 +224,8 @@ TAO_ORB_Manager::activate_under_child_poa (const char* object_name, { if (object_name == 0) ACE_ERROR_RETURN ((LM_ERROR, - "\n(%P|%t) TAO_ORB_Manager::register: " - "object_name is null!"), + ASYS_TEXT ("\n(%P|%t) TAO_ORB_Manager::register: ") + ASYS_TEXT ("object_name is null!")), 0); PortableServer::ObjectId_var id = @@ -282,8 +282,8 @@ TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV, if (status == -1) ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) TAO_ORB_Manager %p\n", - "run"), + ASYS_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"), + ASYS_TEXT ("run")), -1); return 0; } @@ -300,8 +300,8 @@ TAO_ORB_Manager::run (ACE_Time_Value &tv, if (status == -1) ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) TAO_ORB_Manager %p\n", - "run"), + ASYS_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"), + ASYS_TEXT ("run")), -1); return 0; } @@ -317,8 +317,8 @@ TAO_ORB_Manager::run (CORBA_Environment &ACE_TRY_ENV) if (status == -1) ACE_ERROR_RETURN ((LM_ERROR, - "(%P|%t) TAO_ORB_Manager %p\n", - "run"), + ASYS_TEXT ("(%P|%t) TAO_ORB_Manager %p\n"), + ASYS_TEXT ("run")), -1); return 0; } diff --git a/TAO/tao/Transport_Mux_Strategy.cpp b/TAO/tao/Transport_Mux_Strategy.cpp index 7d837cc2540..aee7e8c4c80 100644 --- a/TAO/tao/Transport_Mux_Strategy.cpp +++ b/TAO/tao/Transport_Mux_Strategy.cpp @@ -84,7 +84,7 @@ TAO_Exclusive_TMS::dispatch_reply (CORBA::ULong request_id, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n", + ASYS_TEXT ("TAO_Exclusive_TMS::dispatch_reply - <%d != %d>\n"), this->request_id_, request_id)); return 0; } @@ -203,8 +203,8 @@ TAO_Muxed_TMS::bind_dispatcher (CORBA::ULong request_id, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%P | %t):TAO_Muxed_TMS::bind_dispatcher: " - "bind dispatcher failed: result = %d\n", + ASYS_TEXT ("(%P | %t):TAO_Muxed_TMS::bind_dispatcher: ") + ASYS_TEXT ("bind dispatcher failed: result = %d\n"), result)); return -1; @@ -236,8 +236,8 @@ TAO_Muxed_TMS::dispatch_reply (CORBA::ULong request_id, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "(%P | %t):TAO_Muxed_TMS::dispatch_reply: " - "unbind dispatcher failed: result = %d\n", + ASYS_TEXT ("(%P | %t):TAO_Muxed_TMS::dispatch_reply: ") + ASYS_TEXT ("unbind dispatcher failed: result = %d\n"), result)); return -1; diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index da72eb2e871..e62bace6906 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -1943,8 +1943,8 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, || !stream.read_ulong (member_count)) // member count { ACE_DEBUG ((LM_DEBUG, - "TypeCode::private_member_label -- " - "error reading from stream")); + ASYS_TEXT ("TypeCode::private_member_label -- ") + ASYS_TEXT ("error reading from stream"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); } @@ -2018,8 +2018,8 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, { if (TAO_debug_level > 0) ACE_ERROR ((LM_ERROR, - "TypeCode::private_member_label " - "error getting typecode for member %d\n", + ASYS_TEXT ("TypeCode::private_member_label ") + ASYS_TEXT ("error getting typecode for member %d\n"), i)); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), 0); diff --git a/TAO/tao/ValueBase.cpp b/TAO/tao/ValueBase.cpp index 188466baca0..6037f7bb9c3 100644 --- a/TAO/tao/ValueBase.cpp +++ b/TAO/tao/ValueBase.cpp @@ -134,7 +134,7 @@ CORBA_ValueBase::_tao_unmarshal (TAO_InputCDR &, // new_object->_tao_unmarshal_v () // new_object->_tao_unmarshal_post () - ACE_DEBUG ((LM_DEBUG, "unimpl. CORBA::ValueBase::_tao_unmarshal\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("unimpl. CORBA::ValueBase::_tao_unmarshal\n"))); return 0; // %! } @@ -177,7 +177,7 @@ CORBA_ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, if (!TAO_OBV_GIOP_Flags::is_value_tag (value_tag)) { - ACE_DEBUG ((LM_DEBUG, "!CORBA::ValueBase::_tao_unmarshal_pre not value_tag\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("!CORBA::ValueBase::_tao_unmarshal_pre not value_tag\n"))); return 0; } @@ -200,7 +200,7 @@ CORBA_ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm, ->lookup_value_factory (repo_id_stream.in()); if (factory == 0) // %! except.! { - ACE_DEBUG ((LM_ERROR, "(%N:%l) OBV factory is null !!!\n")); + ACE_DEBUG ((LM_ERROR, ASYS_TEXT ("(%N:%l) OBV factory is null !!!\n"))); return 0; } diff --git a/TAO/tao/Wait_Strategy.cpp b/TAO/tao/Wait_Strategy.cpp index 4e0a4365ea4..44f87747eec 100644 --- a/TAO/tao/Wait_Strategy.cpp +++ b/TAO/tao/Wait_Strategy.cpp @@ -174,7 +174,7 @@ TAO_Exclusive_Wait_On_Leader_Follower::sending_request (TAO_ORB_Core *orb_core, this->calling_thread_ = ACE_Thread::self (); if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO (%P|%t) - sending request for <%x>\n", + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("TAO (%P|%t) - sending request for <%x>\n"), this->transport_)); } @@ -388,15 +388,15 @@ TAO_Exclusive_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, if (leader_follower.elect_new_leader () == -1) ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t): TAO_Wait_On_LF::wait - " - "Failed to unset the leader and wake up a " - "new follower.\n"), + ASYS_TEXT ("TAO (%P|%t): TAO_Wait_On_LF::wait - ") + ASYS_TEXT ("Failed to unset the leader and wake up a ") + ASYS_TEXT ("new follower.\n")), -1); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t): TAO_Wait_On_LF::wait - " - "handle_events failed.\n"), + ASYS_TEXT ("TAO (%P|%t): TAO_Wait_On_LF::wait - ") + ASYS_TEXT ("handle_events failed.\n")), -1); // Return an error if there was a problem receiving the reply... @@ -450,8 +450,8 @@ TAO_Exclusive_Wait_On_Leader_Follower::handle_input (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Wait_On_LF::handle_input, " - "unexpected on <%x>\n", + ASYS_TEXT ("TAO (%P|%t) - Wait_On_LF::handle_input, ") + ASYS_TEXT ("unexpected on <%x>\n"), this->transport_)); return -1; } @@ -468,8 +468,8 @@ TAO_Exclusive_Wait_On_Leader_Follower::handle_input (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Wait_On_LF::handle_input, " - "handle_client_input == -1\n")); + ASYS_TEXT ("TAO (%P|%t) - Wait_On_LF::handle_input, ") + ASYS_TEXT ("handle_client_input == -1\n"))); this->reply_received_ = -1; } @@ -611,7 +611,7 @@ TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - wait (follower) on Transport <%x>, cond <%x>\n", + ASYS_TEXT ("TAO (%P|%t) - wait (follower) on Transport <%x>, cond <%x>\n"), this->transport_, cond)); @@ -625,8 +625,8 @@ TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, { if (leader_follower.add_follower (cond) == -1) ACE_ERROR ((LM_ERROR, - "TAO (%P|%t) TAO_Muxed_Wait_On_Leader_Follower::wait - " - "add_follower failed for <%x>\n", + ASYS_TEXT ("TAO (%P|%t) TAO_Muxed_Wait_On_Leader_Follower::wait - ") + ASYS_TEXT ("add_follower failed for <%x>\n"), cond)); } @@ -640,8 +640,8 @@ TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, { if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - wait (follower) on <%x> " - "cond == 0 || cond->wait () == -1 : cond = %d\n", + ASYS_TEXT ("TAO (%P|%t) - wait (follower) on <%x> ") + ASYS_TEXT ("cond == 0 || cond->wait () == -1 : cond = %d\n"), this->transport_, (cond == 0) ? 0 : cond)); return -1; } @@ -655,8 +655,8 @@ TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, { if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - wait (follower) on <%x> " - "cond == 0 || cond->wait (tv) == -1\n", + ASYS_TEXT ("TAO (%P|%t) - wait (follower) on <%x> ") + ASYS_TEXT ("cond == 0 || cond->wait (tv) == -1\n"), this->transport_)); return -1; } @@ -677,7 +677,7 @@ TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - done (follower) on <%x>, reply_received %d\n", + ASYS_TEXT ("TAO (%P|%t) - done (follower) on <%x>, reply_received %d\n"), this->transport_, reply_received)); // Now somebody woke us up to become a leader or to handle @@ -716,7 +716,7 @@ TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - wait (leader):to enter reactor event loop on <%x>\n", + ASYS_TEXT ("TAO (%P|%t) - wait (leader):to enter reactor event loop on <%x>\n"), this->transport_)); while (result > 0 && reply_received == 0) @@ -724,7 +724,7 @@ TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - wait : (leader) : done with reactor event loop on <%x>\n", + ASYS_TEXT ("TAO (%P|%t) - wait : (leader) : done with reactor event loop on <%x>\n"), this->transport_)); } @@ -740,14 +740,14 @@ TAO_Muxed_Wait_On_Leader_Follower::wait (ACE_Time_Value *max_wait_time, if (leader_follower.elect_new_leader () == -1) ACE_ERROR_RETURN ((LM_ERROR, - "TAO:%N:%l:(%P|%t):TAO_Muxed_Wait_On_Leader_Follower::send_request: " - "Failed to unset the leader and wake up a new follower.\n"), + ASYS_TEXT ("TAO:%N:%l:(%P|%t):TAO_Muxed_Wait_On_Leader_Follower::send_request: ") + ASYS_TEXT ("Failed to unset the leader and wake up a new follower.\n")), -1); if (result == -1) ACE_ERROR_RETURN ((LM_ERROR, - "TAO:%N:%l:(%P|%t):TAO_Muxed_Wait_On_Leader_Follower::wait: " - "handle_events failed.\n"), + ASYS_TEXT ("TAO:%N:%l:(%P|%t):TAO_Muxed_Wait_On_Leader_Follower::wait: ") + ASYS_TEXT ("handle_events failed.\n")), -1); // Return an error if there was a problem receiving the reply... @@ -788,7 +788,7 @@ TAO_Muxed_Wait_On_Leader_Follower::handle_input (void) if (TAO_debug_level >= 5) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - reading reply on <%x>\n", + ASYS_TEXT ("TAO (%P|%t) - reading reply on <%x>\n"), this->transport_)); // Receive any data that is available, without blocking... @@ -803,8 +803,8 @@ TAO_Muxed_Wait_On_Leader_Follower::handle_input (void) { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) - Wait_On_LF::handle_input, " - "handle_client_input == -1\n")); + ASYS_TEXT ("TAO (%P|%t) - Wait_On_LF::handle_input, ") + ASYS_TEXT ("handle_client_input == -1\n"))); // this->reply_received_ = -1; } diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index aaaeefb9bb0..4ec66535ec4 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -88,7 +88,7 @@ TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::append detected error\n")); + ASYS_TEXT ("TAO_Marshal_Primitive::append detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), @@ -130,7 +130,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Any::append detected error\n")); + ASYS_TEXT ("TAO_Marshal_Any::append detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), @@ -212,8 +212,8 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode: " - "Bad kind_ value in CDR stream\n")); + ASYS_TEXT ("TAO_Marshal_TypeCode: ") + ASYS_TEXT ("Bad kind_ value in CDR stream\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), CORBA::TypeCode::TRAVERSE_STOP); @@ -226,7 +226,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::append detected error\n")); + ASYS_TEXT ("TAO_Marshal_TypeCode::append detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), @@ -307,7 +307,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, return CORBA::TypeCode::TRAVERSE_CONTINUE; if (TAO_debug_level > 0) - ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_ObjRef::append detected error\n")); + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("TAO_Marshal_ObjRef::append detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), @@ -349,7 +349,7 @@ TAO_Marshal_Struct::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::encode detected error\n")); + ASYS_TEXT ("TAO_Marshal_Struct::encode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), @@ -539,7 +539,7 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::append detected error")); + ASYS_TEXT ("TAO_Marshal_TypeCode::append detected error"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), @@ -590,7 +590,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, // error exit if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "marshaling TAO_Marshal_Sequence::append detected error\n")); + ASYS_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP); @@ -635,7 +635,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, // error exit if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Sequence::append detected error")); + ASYS_TEXT ("TAO_Marshal_Sequence::append detected error"))); ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP); @@ -669,7 +669,7 @@ TAO_Marshal_Alias::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::append detected error\n")); + ASYS_TEXT ("TAO_Marshal_Alias::append detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -716,7 +716,7 @@ TAO_Marshal_Except::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except::append detected error\n")); + ASYS_TEXT ("TAO_Marshal_Except::append detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -746,7 +746,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_WString::append detected error\n")); + ASYS_TEXT ("TAO_Marshal_WString::append detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index b5f1ec542ee..f9392425bc4 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -117,7 +117,7 @@ TAO_Marshal_Primitive::decode (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_Primitive::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -222,7 +222,7 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Any::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_Any::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), retval); } @@ -500,8 +500,8 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode:decode: " - "Bad kind_ value in CDR stream\n")); + ASYS_TEXT ("TAO_Marshal_TypeCode:decode: ") + ASYS_TEXT ("Bad kind_ value in CDR stream\n"))); ACE_THROW_RETURN ( CORBA::BAD_TYPECODE (), CORBA::TypeCode::TRAVERSE_STOP); } } @@ -510,7 +510,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_TypeCode::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -694,7 +694,7 @@ TAO_Marshal_Struct::decode (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_Struct::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -933,7 +933,7 @@ TAO_Marshal_String::decode (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_String::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_String::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -1300,7 +1300,7 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr tc, // error exit if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Sequence::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_Sequence::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP); } @@ -1397,7 +1397,7 @@ TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_Except::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -1520,7 +1520,7 @@ TAO_Marshal_Except::decode (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_Except::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -1566,7 +1566,7 @@ TAO_Marshal_WString::decode (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_WString::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_WString::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp index bfcd28b3295..5db017583e1 100644 --- a/TAO/tao/deep_free.cpp +++ b/TAO/tao/deep_free.cpp @@ -130,7 +130,7 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::deep_free detected error\n")); + ASYS_TEXT ("TAO_Marshal_Primitive::deep_free detected error\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -159,7 +159,7 @@ TAO_Marshal_Primitive::deep_free (CORBA::TypeCode_ptr tc, default: if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::deep_free detected error\n")); + ASYS_TEXT ("TAO_Marshal_Primitive::deep_free detected error\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -177,7 +177,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::deep_free detected error\n")); + ASYS_TEXT ("TAO_Marshal_Struct::deep_free detected error\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -303,7 +303,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::deep_free detected error\n")); + ASYS_TEXT ("TAO_Marshal_Struct::deep_free detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -502,7 +502,7 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::deep_free detected error\n")); + ASYS_TEXT ("TAO_Marshal_Struct::deep_free detected error\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -647,7 +647,7 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Sequence::deep_free detected error\n")); + ASYS_TEXT ("TAO_Marshal_Sequence::deep_free detected error\n"))); // error exit ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP); } @@ -669,7 +669,7 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::deep_free detected error\n")); + ASYS_TEXT ("TAO_Marshal_Alias::deep_free detected error\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -749,7 +749,7 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr tc, // We should never reach here. if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::decode detected error\n")); + ASYS_TEXT ("TAO_Marshal_Alias::decode detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } @@ -776,7 +776,7 @@ TAO_Marshal_Except::deep_free (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except::deep_free detected error\n")); + ASYS_TEXT ("TAO_Marshal_Except::deep_free detected error\n"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); } diff --git a/TAO/tao/default_client.cpp b/TAO/tao/default_client.cpp index 219c8fbbf74..c889dd18ab9 100644 --- a/TAO/tao/default_client.cpp +++ b/TAO/tao/default_client.cpp @@ -77,9 +77,9 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, char ** argv) "-ORBIIOPProfileLock") == 0) { ACE_DEBUG ((LM_DEBUG, - "WARNING: The -ORBIIOPProfileLock option" - " is deprecated and will be removed.\n" - " Please use -ORBProfileLock instead\n")); + ASYS_TEXT ("WARNING: The -ORBIIOPProfileLock option") + ASYS_TEXT (" is deprecated and will be removed.\n") + ASYS_TEXT (" Please use -ORBProfileLock instead\n"))); curarg++; if (curarg < argc) { diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index 011cc356f13..511b7a366ee 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -84,8 +84,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) "-ORBReactorLock") == 0) { ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Resource obsolete -ORBReactorLock " - "option, please use -ORBReactorType\n")); + ASYS_TEXT ("TAO_Default_Resource obsolete -ORBReactorLock ") + ASYS_TEXT ("option, please use -ORBReactorType\n"))); curarg++; if (curarg < argc) { @@ -129,8 +129,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->reactor_registry_type_ = TAO_REACTOR_PER_PRIORITY; else ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - unknown argument" - " <%s> for -ORBReactorRegistry\n", name)); + ASYS_TEXT ("TAO_Default_Factory - unknown argument") + ASYS_TEXT (" <%s> for -ORBReactorRegistry\n"), name)); } } @@ -154,16 +154,16 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) reactor_type_ = TAO_REACTOR_FL; #else ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - FlReactor" - " not supported on this platform\n")); + ASYS_TEXT ("TAO_Default_Factory - FlReactor") + ASYS_TEXT (" not supported on this platform\n"))); #endif /* ACE_HAS_FL */ else if (ACE_OS::strcasecmp (name, "tk_reactor") == 0) #if defined(ACE_HAS_TK) reactor_type_ = TAO_REACTOR_TK; #else ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - TkReactor" - " not supported on this platform\n")); + ASYS_TEXT ("TAO_Default_Factory - TkReactor") + ASYS_TEXT (" not supported on this platform\n"))); #endif /* ACE_HAS_TK */ else if (ACE_OS::strcasecmp (name, "wfmo") == 0) @@ -189,8 +189,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) reactor_type_ = TAO_REACTOR_TP; else ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - unknown argument" - " <%s> for -ORBreactortype\n", name)); + ASYS_TEXT ("TAO_Default_Factory - unknown argument") + ASYS_TEXT (" <%s> for -ORBreactortype\n"), name)); } } @@ -230,7 +230,7 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) -1); if (pset->insert (item) == -1) ACE_ERROR ((LM_ERROR, - "(%P|%t) Unable to add protocol factories for %s: %p\n", + ASYS_TEXT ("(%P|%t) Unable to add protocol factories for %s: %p\n"), argv[curarg])); } } @@ -257,8 +257,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->connection_caching_type_ = TAO_Resource_Factory::NOOP; else ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - unknown argument" - " <%s> for -ORBConnectionCachingStrategy\n", name)); + ASYS_TEXT ("TAO_Default_Factory - unknown argument") + ASYS_TEXT (" <%s> for -ORBConnectionCachingStrategy\n"), name)); } } @@ -270,8 +270,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->purge_percentage_ = ACE_OS::atoi (argv[curarg]); else ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - unknown argument" - "for -ORBPurgePercentage\n")); + ASYS_TEXT ("TAO_Default_Factory - unknown argument") + ASYS_TEXT ("for -ORBPurgePercentage\n"))); } else if (ACE_OS::strcasecmp (argv[curarg], @@ -293,8 +293,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->sched_policy_ = ACE_SCHED_RR; else ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - unknown argument" - " <%s> for -ORBSchedPolicy\n", name)); + ASYS_TEXT ("TAO_Default_Factory - unknown argument") + ASYS_TEXT (" <%s> for -ORBSchedPolicy\n"), name)); } } @@ -314,8 +314,8 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->priority_mapping_type_ = TAO_PRIORITY_MAPPING_DIRECT; else ACE_DEBUG ((LM_DEBUG, - "TAO_Default_Factory - unknown argument" - " <%s> for -ORBPriorityMapping\n", name)); + ASYS_TEXT ("TAO_Default_Factory - unknown argument") + ASYS_TEXT (" <%s> for -ORBPriorityMapping\n"), name)); } } @@ -351,9 +351,9 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) { if (TAO_orbdebug) ACE_ERROR ((LM_WARNING, - "TAO (%P|%t) No %s found in Service Repository. " - "Using default instance IIOP Protocol Factory.\n", - "IIOP Protocol Factory")); + ASYS_TEXT ("TAO (%P|%t) No %s found in Service Repository. ") + ASYS_TEXT ("Using default instance IIOP Protocol Factory.\n"), + ASYS_TEXT ("IIOP Protocol Factory"))); ACE_NEW_RETURN (protocol_factory, TAO_IIOP_Protocol_Factory, @@ -371,8 +371,8 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) delete protocol_factory; ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) Unable to add " - "<%s> to protocol factory set.\n", + ASYS_TEXT ("TAO (%P|%t) Unable to add ") + ASYS_TEXT ("<%s> to protocol factory set.\n"), item->protocol_name ().c_str ()), -1); } @@ -380,7 +380,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Loaded default protocol <IIOP_Factory>\n")); + ASYS_TEXT ("TAO (%P|%t) Loaded default protocol <IIOP_Factory>\n"))); } #if defined (TAO_HAS_UIOP) @@ -432,7 +432,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) if ((*factory)->factory () == 0) { ACE_ERROR_RETURN ((LM_ERROR, - "TAO (%P|%t) Unable to load protocol <%s>, %p\n", + ASYS_TEXT ("TAO (%P|%t) Unable to load protocol <%s>, %p\n"), name.c_str (), ""), -1); } @@ -440,7 +440,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void) if (TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) Loaded protocol <%s>\n", + ASYS_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"), name.c_str ())); } } @@ -558,7 +558,7 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const break; case TAO_REACTOR_MSGWFMO: -#if defined(ACE_WIN32) +#if defined(ACE_WIN32) && !defined (ACE_HAS_WINCE) ACE_NEW_RETURN (impl, ACE_Msg_WFMO_Reactor, 0); #endif /* ACE_WIN32 && !ACE_HAS_WINCE */ break; diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp index ca82d0294e1..bb0a10ddde2 100644 --- a/TAO/tao/default_server.cpp +++ b/TAO/tao/default_server.cpp @@ -332,8 +332,8 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) "-ORBDemuxStrategy") == 0) { ACE_DEBUG ((LM_DEBUG, - "Warning: -ORBDemuxStrategy is deprecated. Please use " - "-ORBSystemidPolicyDemuxStrategy or -ORBUseridPolicyDemuxStrategy instead.\n")); + ASYS_TEXT ("Warning: -ORBDemuxStrategy is deprecated. Please use ") + ASYS_TEXT ("-ORBSystemidPolicyDemuxStrategy or -ORBUseridPolicyDemuxStrategy instead.\n"))); curarg++; } else if (ACE_OS::strcasecmp (argv[curarg], @@ -373,9 +373,9 @@ TAO_Default_Server_Strategy_Factory::parse_args (int argc, char *argv[]) "-ORBConnectorLock") == 0) { ACE_DEBUG ((LM_DEBUG, - "TAO (%P|%t) WARNING: the " - "-ORBConnectorLock option is in the client " - "strategy factory now\n")); + ASYS_TEXT ("TAO (%P|%t) WARNING: the ") + ASYS_TEXT ("-ORBConnectorLock option is in the client ") + ASYS_TEXT ("strategy factory now\n"))); } else if (ACE_OS::strcasecmp (argv[curarg], diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index e90366adb7d..74e6dcabd53 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -84,7 +84,7 @@ TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr tc, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Primitive::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_Primitive::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -197,8 +197,8 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::skip: " - "Bad kind_ value in CDR stream")); + ASYS_TEXT ("TAO_Marshal_TypeCode::skip: ") + ASYS_TEXT ("Bad kind_ value in CDR stream"))); ACE_THROW_RETURN (CORBA::BAD_TYPECODE (), CORBA::TypeCode::TRAVERSE_STOP); } @@ -210,7 +210,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_TypeCode::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -244,7 +244,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Principal::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_Principal::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -306,7 +306,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_ObjRef::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_ObjRef::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -344,7 +344,7 @@ TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Struct::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_Struct::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -522,7 +522,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_TypeCode::skip detected error")); + ASYS_TEXT ("TAO_Marshal_TypeCode::skip detected error"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -573,7 +573,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, // error exit if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Sequence::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_Sequence::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP); } @@ -611,7 +611,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, // error exit if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Sequence::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_Sequence::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (), CORBA::TypeCode::TRAVERSE_STOP); } @@ -646,7 +646,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Alias::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_Alias::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -693,7 +693,7 @@ TAO_Marshal_Except::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_Except::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_Except::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); @@ -730,7 +730,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, - "TAO_Marshal_WString::skip detected error\n")); + ASYS_TEXT ("TAO_Marshal_WString::skip detected error\n"))); ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); |