diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-28 08:30:48 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-04-28 08:30:48 +0000 |
| commit | 5e929ce6147c86740c0633f04d46535eea430996 (patch) | |
| tree | 40f643bee582e87ac7e1724f1f88722df66066db /TAO/tao | |
| parent | 022dc3000a2d8ba053a44d39c9425103ce97464e (diff) | |
| download | ATCD-5e929ce6147c86740c0633f04d46535eea430996.tar.gz | |
Fixed SystemException constructor's signature
Diffstat (limited to 'TAO/tao')
33 files changed, 459 insertions, 459 deletions
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 52e9b34e54d..78c9fc1dc9e 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -60,7 +60,7 @@ CORBA_Any::type (CORBA::TypeCode_ptr tc, } else { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } } diff --git a/TAO/tao/CDR_Interpreter.cpp b/TAO/tao/CDR_Interpreter.cpp index 56e7d3b8812..c2635c5c435 100644 --- a/TAO/tao/CDR_Interpreter.cpp +++ b/TAO/tao/CDR_Interpreter.cpp @@ -287,7 +287,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, || kind <= CORBA::tk_void || kind == CORBA::tk_except) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -303,7 +303,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, // Pull encapsulation length out of the stream. if (stream->read_ulong (temp) == 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -326,7 +326,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, if (nested.good_bit () == 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -345,7 +345,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, if (stream->rd_ptr () != nested.rd_ptr ()) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } return size; @@ -373,7 +373,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, case CORBA::tk_wstring: if (stream->read_ulong (len) == 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } tc->length_ = len; @@ -384,7 +384,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, case CORBA::tk_sequence: if (stream->read_ulong (len) == 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } tc->length_ = len; @@ -401,7 +401,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment_i (CORBA::TypeCode_ptr tc, else if (TAO_CDR_Interpreter::table_[kind].skipper_ != 0 && TAO_CDR_Interpreter::table_[kind].skipper_ (stream) == 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -421,7 +421,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, CORBA::ULong temp; if (stream->read_ulong (temp) == 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -456,7 +456,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, || offset >= -8 || ((-offset) & 0x03) != 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -467,7 +467,7 @@ TAO_CDR_Interpreter::calc_nested_size_and_alignment (CORBA::TypeCode_ptr tc, // Fetch indirected-to TCKind. if (!indirected_stream.read_ulong (temp)) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } kind = (CORBA::TCKind) temp; @@ -531,7 +531,7 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream, || !stream->skip_string () || !stream->read_ulong (members)) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -545,7 +545,7 @@ TAO_CDR_Interpreter::calc_struct_and_except_attributes (TAO_InputCDR *stream, // Skip name of the member. if (!stream->skip_string ()) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -645,7 +645,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->skip_string () // type ID || !stream->skip_string ()) { // typedef name - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -672,7 +672,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->read_ulong (temp) // default used || !stream->read_ulong (members)) { // member count - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -701,7 +701,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->read_short (s)) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } } @@ -715,7 +715,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->read_long (l)) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } } @@ -728,14 +728,14 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->read_char (c)) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } } break; default: - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -743,7 +743,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, if (!stream->skip_string ()) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -756,7 +756,7 @@ TAO_CDR_Interpreter::calc_key_union_attributes (TAO_InputCDR *stream, TAO_InputCDR temp (*stream); if (calc_union_attr_is_var_sized_member (&temp, var_sized_member) == -1) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -837,7 +837,7 @@ TAO_CDR_Interpreter::calc_alias_attributes (TAO_InputCDR *stream, if (!stream->skip_string () // type ID || !stream->skip_string ()) // typedef name { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -869,7 +869,7 @@ TAO_CDR_Interpreter::calc_array_attributes (TAO_InputCDR *stream, if (stream->read_ulong (member_count) == 0 || member_count > UINT_MAX) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -894,7 +894,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream, CORBA::ULong temp; if (stream->read_ulong (temp) == 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -911,7 +911,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream, || offset >= -8 || ((-offset) & 0x03) != 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } // Notice how we change the sign of the offset to estimate the @@ -923,7 +923,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream, if (indirected_stream.read_ulong (temp) == 0 || temp == ~0u) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } } @@ -933,7 +933,7 @@ TAO_CDR_Interpreter::calc_seq_attributes (TAO_InputCDR *stream, // Skip the rest of the stream because we don't use it. if (stream->skip_bytes (stream->length ()) == 0) { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } @@ -988,7 +988,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_ushort (discrim) != 0) retval = (discrim == *(CORBA::UShort *)value); else - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } break; @@ -1000,7 +1000,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_ulong (discrim) != 0) retval = (discrim == *(CORBA::ULong *)value); else - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } break; @@ -1011,7 +1011,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_ulong (discrim) != 0) retval = (discrim == *(unsigned *)value); else - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } break; @@ -1022,7 +1022,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_boolean (discrim) != 0) retval = (discrim == *(CORBA::Boolean *)value); else - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } break; @@ -1033,7 +1033,7 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_char (discrim) != 0) retval = (discrim == *(CORBA::Char *)value); else - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } break; @@ -1044,12 +1044,12 @@ TAO_CDR_Interpreter::match_value (CORBA::TCKind kind, if (tc_stream->read_wchar (discrim) != 0) retval = (discrim == *(CORBA::WChar *)value); else - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } break; default: - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } return retval; diff --git a/TAO/tao/Connect.cpp b/TAO/tao/Connect.cpp index 02bd1b5c9dd..9da2df0b262 100644 --- a/TAO/tao/Connect.cpp +++ b/TAO/tao/Connect.cpp @@ -301,7 +301,7 @@ TAO_Server_Connection_Handler::handle_message (TAO_InputCDR &input, // If ObjectID not in table or reference is nil raise OBJECT_NOT_EXIST. if (CORBA::is_nil (object_reference) || status == -1) - ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); // ObjectID present in the table with an associated NON-NULL reference. // Throw a forward request exception. @@ -699,7 +699,7 @@ TAO_Server_Connection_Handler::handle_input (ACE_HANDLE) default: // Unknown message ACE_DEBUG ((LM_DEBUG, "(%P|%t) Illegal message received by server\n")); - ACE_TRY_THROW (CORBA::COMM_FAILURE (CORBA::COMPLETED_NO)); + ACE_TRY_THROW (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); // NOTREACHED case TAO_GIOP::CommunicationError: diff --git a/TAO/tao/CurrentS.cpp b/TAO/tao/CurrentS.cpp index 21c556940be..891e51e092a 100644 --- a/TAO/tao/CurrentS.cpp +++ b/TAO/tao/CurrentS.cpp @@ -101,7 +101,7 @@ void POA_CORBA::Current::_dispatch (CORBA::ServerRequest &req, void *context, CO // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); } else diff --git a/TAO/tao/DynEnum_i.cpp b/TAO/tao/DynEnum_i.cpp index 3df444c0a02..649b69a810c 100644 --- a/TAO/tao/DynEnum_i.cpp +++ b/TAO/tao/DynEnum_i.cpp @@ -218,202 +218,202 @@ void TAO_DynEnum_i::insert_boolean (CORBA::Boolean, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_octet (CORBA::Octet, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_char (CORBA::Char, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_short (CORBA::Short, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_ushort (CORBA::UShort, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_long (CORBA::Long, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_ulong (CORBA::ULong, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_float (CORBA::Float, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_double (CORBA::Double, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_string (const char *, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_reference (CORBA::Object_ptr, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_typecode (CORBA::TypeCode_ptr, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_longlong (CORBA::LongLong, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_ulonglong (CORBA::ULongLong, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_wchar (CORBA::WChar, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } void TAO_DynEnum_i::insert_any (const CORBA::Any&, CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } CORBA::Boolean TAO_DynEnum_i::get_boolean (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::Octet TAO_DynEnum_i::get_octet (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::Char TAO_DynEnum_i::get_char (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::Short TAO_DynEnum_i::get_short (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::UShort TAO_DynEnum_i::get_ushort (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::Long TAO_DynEnum_i::get_long (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::ULong TAO_DynEnum_i::get_ulong (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::Float TAO_DynEnum_i::get_float (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::Double TAO_DynEnum_i::get_double (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } char * TAO_DynEnum_i::get_string (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::Object_ptr TAO_DynEnum_i::get_reference (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::TypeCode_ptr TAO_DynEnum_i::get_typecode (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::LongLong TAO_DynEnum_i::get_longlong (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); #if defined (ACE_LACKS_LONGLONG_T) CORBA::LongLong tmp = {0, 0}; @@ -426,21 +426,21 @@ TAO_DynEnum_i::get_longlong (CORBA::Environment &env) CORBA::ULongLong TAO_DynEnum_i::get_ulonglong (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::WChar TAO_DynEnum_i::get_wchar (CORBA::Environment &env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } CORBA::Any_ptr TAO_DynEnum_i::get_any (CORBA::Environment& env) { - env.exception (new CORBA::BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index d1882cd0f86..a1ec3fecbfc 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -257,7 +257,7 @@ TAO_DynUnion_i::to_any (CORBA::Environment& ACE_TRY_ENV) ACE_NEW_THROW_EX (retval, CORBA_Any (this->type (ACE_TRY_ENV), in_cdr.start ()), - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; } @@ -1269,37 +1269,37 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_short: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Short>, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_long: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Long>, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_ushort: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::UShort>, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_ulong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::ULong>, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_boolean: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Boolean>, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_char: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::Char>, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; @@ -1308,7 +1308,7 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_longlong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::LongLong>, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; @@ -1317,19 +1317,19 @@ TAO_DynUnion_i::get_extractor (CORBA::TCKind kind, case CORBA::tk_ulonglong: ACE_NEW_THROW_EX (retval, DU_Extractor<CORBA::ULongLong>, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_wchar: ACE_NEW_THROW_EX (retval, WChar_extractor, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; case CORBA::tk_enum: ACE_NEW_THROW_EX (retval, Enum_extractor, - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); return retval; default: diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index a7a916232f4..6a81f23aa9f 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -68,7 +68,7 @@ TAO_IIOP_Connector::connect (TAO_Profile *profile, // iiop_profile->addr_to_string (), // "errno")); // -// TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (CORBA::COMPLETED_NO), env); +// TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env); // } // } // else diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp index 243be46125a..a98c68e194e 100644 --- a/TAO/tao/IIOP_Profile.cpp +++ b/TAO/tao/IIOP_Profile.cpp @@ -407,12 +407,12 @@ TAO_IIOP_Profile::parse_string (const char *string, string += 5; } else - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); if (this->version_.major != TAO_IIOP_Profile::DEF_IIOP_MAJOR || this->version_.minor > TAO_IIOP_Profile::DEF_IIOP_MINOR) { - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); } // Pull off the "hostname:port/" part of the objref @@ -424,7 +424,7 @@ TAO_IIOP_Profile::parse_string (const char *string, if (cp == 0) { - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); } if (this->host_) @@ -453,7 +453,7 @@ TAO_IIOP_Profile::parse_string (const char *string, if (cp == 0) { CORBA::string_free (this->host_); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); } this->port_ = (CORBA::UShort) ACE_OS::atoi (start); diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp index b68e6904a83..4fbe4a81dcb 100644 --- a/TAO/tao/Invocation.cpp +++ b/TAO/tao/Invocation.cpp @@ -135,14 +135,14 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, // assert (this->stub_ != 0); if (this->stub_ == 0) - ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); // Get a pointer to the connector registry, which might be in // thread-specific storage, depending on the concurrency model. TAO_Connector_Registry *conn_reg = this->orb_core_->connector_registry (); if (conn_reg == 0) - ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); // @@ It seems like this is the right spot to re-order the profiles // based on the policies in the ORB. @@ -171,7 +171,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, // Try moving to the next profile and starting over, if that // fails then we must raise the TRANSIENT exception. if (this->stub_->next_profile_retry () == 0) - ACE_THROW (CORBA::TRANSIENT (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const TAO_ObjectKey& key = this->profile_->object_key(); @@ -201,7 +201,7 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, if (TAO_GIOP::start_message (message_type, this->out_stream_, this->orb_core_) == 0) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_START_MSG); @@ -243,11 +243,11 @@ TAO_GIOP_Invocation::start (CORBA::Boolean is_roundtrip, break; default: - ACE_THROW (CORBA::INTERNAL (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } if (!this->out_stream_.good_bit ()) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_TIMEPROBE (TAO_GIOP_INVOCATION_START_REQUEST_HDR); } @@ -322,7 +322,7 @@ TAO_GIOP_Invocation::invoke (CORBA::Boolean is_roundtrip, { if (this->transport_ == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), TAO_INVOKE_EXCEPTION); int result = @@ -417,7 +417,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // @@ If a forward exception or a LOCATION_FORWARD reply is sent // then the request couldn't have completed. But we need to // re-validate this to ensure "at most once" semantics. - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), TAO_INVOKE_EXCEPTION); } @@ -434,7 +434,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // @@ If a forward exception or a LOCATION_FORWARD reply is sent // then the request couldn't have completed. But we need to // re-validate this to ensure "at most once" semantics. - ACE_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), TAO_INVOKE_EXCEPTION); } @@ -464,7 +464,7 @@ TAO_GIOP_Invocation::location_forward (TAO_InputCDR &inp_stream, // get created on a per-call basis. For now we'll play it safe. if (this->stub_->next_profile () == 0) - ACE_THROW_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), TAO_INVOKE_EXCEPTION); return TAO_INVOKE_RESTART; @@ -500,7 +500,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions, // failed, but the connection seems to be still // valid! // this->transport_->close_connection (); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), TAO_INVOKE_EXCEPTION); } @@ -530,7 +530,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions, CORBA_Exception *exception; ACE_NEW_THROW_EX (exception, CORBA_UnknownUserException (any), - CORBA::NO_MEMORY (CORBA::COMPLETED_YES)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); ACE_CHECK_RETURN (TAO_INVOKE_EXCEPTION); // @@ Think about a better way to raise the exception here, @@ -545,7 +545,7 @@ TAO_GIOP_Twoway_Invocation::invoke (CORBA::ExceptionList &exceptions, // @@ It would seem like if the remote exception is a // UserException we can assume that the request was // completed. - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), TAO_INVOKE_EXCEPTION); } @@ -586,7 +586,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts, // failed, but the connection seems to be still // valid! // this->transport_->close_connection (); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), TAO_INVOKE_EXCEPTION); } @@ -605,7 +605,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts, CORBA::Exception_ptr exception = excepts[i].alloc (); if (exception == 0) - ACE_THROW_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_YES), + ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), TAO_INVOKE_EXCEPTION); this->inp_stream_.decode (exception->_type (), @@ -627,7 +627,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts, // If we couldn't find the right exception, report it as // CORBA::UNKNOWN. - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), TAO_INVOKE_EXCEPTION); } @@ -736,7 +736,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) // invocation may perfectly work. this->close_connection (); - ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), + ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_EXCEPTION); } @@ -781,7 +781,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) // is a problem, but we haven't lost synchronization with the // server or anything. this->transport_->close_connection (); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_EXCEPTION); } @@ -796,7 +796,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) this->transport_->close_connection (); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO: (%P|%t) bad Response header\n")); - ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), + ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_EXCEPTION); } @@ -849,7 +849,7 @@ TAO_GIOP_Twoway_Invocation::invoke_i (CORBA::Environment &ACE_TRY_ENV) // failed, but the connection seems to be still // valid! this->transport_->close_connection (); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_EXCEPTION); } @@ -903,7 +903,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) // to refactor them. if (this->transport_ == 0) - ACE_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), TAO_INVOKE_EXCEPTION); int result = @@ -923,7 +923,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) // works? Or is that something that a higher level component // should decide? Remember that LocateRequests are part of // the strategy to establish a connection. - ACE_THROW_RETURN (CORBA::TRANSIENT (CORBA::COMPLETED_MAYBE), + ACE_THROW_RETURN (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_EXCEPTION); } @@ -985,7 +985,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) this->close_connection (); - ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), + ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_EXCEPTION); } @@ -1004,7 +1004,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) this->transport_->close_connection (); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO: (%P|%t) bad Response header\n")); - ACE_THROW_RETURN (CORBA::COMM_FAILURE (CORBA::COMPLETED_MAYBE), + ACE_THROW_RETURN (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), TAO_INVOKE_EXCEPTION); } @@ -1014,7 +1014,7 @@ TAO_GIOP_Locate_Request_Invocation::invoke (CORBA::Environment &ACE_TRY_ENV) break; case TAO_GIOP_UNKNOWN_OBJECT: - ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_YES), + ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), TAO_INVOKE_EXCEPTION); // NOTREACHED diff --git a/TAO/tao/LSOCK_Connector.cpp b/TAO/tao/LSOCK_Connector.cpp index c80df552f55..0ca41d74150 100644 --- a/TAO/tao/LSOCK_Connector.cpp +++ b/TAO/tao/LSOCK_Connector.cpp @@ -73,7 +73,7 @@ TAO_LSOCK_Connector::connect (TAO_Profile *profile, // lsock_profile->addr_to_string (), // "errno")); // -// TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (CORBA::COMPLETED_NO), env); +// TAO_THROW_ENV_RETURN_VOID (CORBA::TRANSIENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env); // } // } // else diff --git a/TAO/tao/LSOCK_Profile.cpp b/TAO/tao/LSOCK_Profile.cpp index d9c6000100f..0b2be8dd4fb 100644 --- a/TAO/tao/LSOCK_Profile.cpp +++ b/TAO/tao/LSOCK_Profile.cpp @@ -389,12 +389,12 @@ TAO_LSOCK_Profile::parse_string (const char *string, string += 5; } else - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); if (this->version_.major != TAO_LSOCK_Profile::DEF_LSOCK_MAJOR || this->version_.minor > TAO_LSOCK_Profile::DEF_LSOCK_MINOR) { - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); } // Pull off the "rendezvous_pointname:" part of the objref @@ -406,7 +406,7 @@ TAO_LSOCK_Profile::parse_string (const char *string, if (cp == 0) { - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); } if (this->rendezvous_point_) @@ -435,7 +435,7 @@ TAO_LSOCK_Profile::parse_string (const char *string, if (cp == 0) { CORBA::string_free (this->rendezvous_point_); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), -1); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), -1); } this->object_addr_.set (this->rendezvous_point_); diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp index 45e6a3bd331..87d941e18c1 100644 --- a/TAO/tao/Marshal.cpp +++ b/TAO/tao/Marshal.cpp @@ -86,7 +86,7 @@ TAO_Marshal_Factory::make_marshal_object (CORBA::TypeCode_ptr tc, { if (tc && tc->kind_ >= 0 && tc->kind_ < CORBA::TC_KIND_COUNT) return this->mobj_table_[tc->kind_].obj_; - TAO_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), 0); + TAO_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); } diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index e08f3fd1fdf..a69a317dde0 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -201,7 +201,7 @@ Messaging::RebindMode Messaging::RebindPolicy::rebind_mode ( { Messaging::RebindMode _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -273,7 +273,7 @@ Messaging::SyncScope Messaging::SyncScopePolicy::synchronization ( { Messaging::SyncScope _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -375,7 +375,7 @@ Messaging::PriorityRange Messaging::RequestPriorityPolicy::priority_range ( _tao_retval.min = 0; _tao_retval.max = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -449,7 +449,7 @@ Messaging::PriorityRange Messaging::ReplyPriorityPolicy::priority_range ( _tao_retval.min = 0; _tao_retval.max = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -525,7 +525,7 @@ TimeBase::UtcT Messaging::RequestStartTimePolicy::start_time ( _tao_retval.inacchi = 0; _tao_retval.tdf = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -601,7 +601,7 @@ TimeBase::UtcT Messaging::RequestEndTimePolicy::end_time ( _tao_retval.inacchi = 0; _tao_retval.tdf = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -677,7 +677,7 @@ TimeBase::UtcT Messaging::ReplyStartTimePolicy::start_time ( _tao_retval.inacchi = 0; _tao_retval.tdf = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -753,7 +753,7 @@ TimeBase::UtcT Messaging::ReplyEndTimePolicy::end_time ( _tao_retval.inacchi = 0; _tao_retval.tdf = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -825,7 +825,7 @@ TimeBase::TimeT Messaging::RelativeRequestTimeoutPolicy::relative_expiry ( { TimeBase::TimeT _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -897,7 +897,7 @@ TimeBase::TimeT Messaging::RelativeRoundtripTimeoutPolicy::relative_expiry ( { TimeBase::TimeT _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -999,7 +999,7 @@ Messaging::RoutingTypeRange Messaging::RoutingPolicy::routing_range ( _tao_retval.min = Messaging::ROUTE_NONE; _tao_retval.max = Messaging::ROUTE_NONE; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -1071,7 +1071,7 @@ CORBA::UShort Messaging::MaxHopsPolicy::max_hops ( { CORBA::UShort _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -1143,7 +1143,7 @@ Messaging::Ordering Messaging::QueueOrderPolicy::allowed_orders ( { Messaging::Ordering _tao_retval = 0; ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &env) @@ -1457,7 +1457,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1483,7 +1483,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -1493,7 +1493,7 @@ CORBA::Object_ptr Messaging::Poller::operation_target ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -1505,7 +1505,7 @@ char * Messaging::Poller::operation_name ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1531,7 +1531,7 @@ char * Messaging::Poller::operation_name ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -1541,7 +1541,7 @@ char * Messaging::Poller::operation_name ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -1553,7 +1553,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1579,7 +1579,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -1589,7 +1589,7 @@ Messaging::ReplyHandler_ptr Messaging::Poller::associated_handler ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -1601,7 +1601,7 @@ void Messaging::Poller::associated_handler ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1621,7 +1621,7 @@ void Messaging::Poller::associated_handler ( if (!( (_tao_out << associated_handler) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); int _invoke_status = _tao_call.invoke (0, 0, ACE_TRY_ENV); @@ -1633,7 +1633,7 @@ void Messaging::Poller::associated_handler ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_YES)); + ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } break; @@ -1650,7 +1650,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1676,7 +1676,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -1686,7 +1686,7 @@ CORBA::Boolean Messaging::Poller::is_from_poller ( if (!( (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -1698,7 +1698,7 @@ CORBA::Object_ptr Messaging::Poller::target ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1724,7 +1724,7 @@ CORBA::Object_ptr Messaging::Poller::target ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -1734,7 +1734,7 @@ CORBA::Object_ptr Messaging::Poller::target ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -1746,7 +1746,7 @@ char * Messaging::Poller::op_name ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1772,7 +1772,7 @@ char * Messaging::Poller::op_name ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -1782,7 +1782,7 @@ char * Messaging::Poller::op_name ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } diff --git a/TAO/tao/MessagingS.cpp b/TAO/tao/MessagingS.cpp index e467c0002da..ee6bc341a6c 100644 --- a/TAO/tao/MessagingS.cpp +++ b/TAO/tao/MessagingS.cpp @@ -61,7 +61,7 @@ void* POA_Messaging::RebindPolicy::_downcast ( void POA_Messaging::RebindPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::RebindPolicy::_interface_repository_id (void) const @@ -158,7 +158,7 @@ void* POA_Messaging::SyncScopePolicy::_downcast ( void POA_Messaging::SyncScopePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::SyncScopePolicy::_interface_repository_id (void) const @@ -255,7 +255,7 @@ void* POA_Messaging::RequestPriorityPolicy::_downcast ( void POA_Messaging::RequestPriorityPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::RequestPriorityPolicy::_interface_repository_id (void) const @@ -352,7 +352,7 @@ void* POA_Messaging::ReplyPriorityPolicy::_downcast ( void POA_Messaging::ReplyPriorityPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::ReplyPriorityPolicy::_interface_repository_id (void) const @@ -449,7 +449,7 @@ void* POA_Messaging::RequestStartTimePolicy::_downcast ( void POA_Messaging::RequestStartTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::RequestStartTimePolicy::_interface_repository_id (void) const @@ -546,7 +546,7 @@ void* POA_Messaging::RequestEndTimePolicy::_downcast ( void POA_Messaging::RequestEndTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::RequestEndTimePolicy::_interface_repository_id (void) const @@ -643,7 +643,7 @@ void* POA_Messaging::ReplyStartTimePolicy::_downcast ( void POA_Messaging::ReplyStartTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::ReplyStartTimePolicy::_interface_repository_id (void) const @@ -740,7 +740,7 @@ void* POA_Messaging::ReplyEndTimePolicy::_downcast ( void POA_Messaging::ReplyEndTimePolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::ReplyEndTimePolicy::_interface_repository_id (void) const @@ -837,7 +837,7 @@ void* POA_Messaging::RelativeRequestTimeoutPolicy::_downcast ( void POA_Messaging::RelativeRequestTimeoutPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::RelativeRequestTimeoutPolicy::_interface_repository_id (void) const @@ -934,7 +934,7 @@ void* POA_Messaging::RelativeRoundtripTimeoutPolicy::_downcast ( void POA_Messaging::RelativeRoundtripTimeoutPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::RelativeRoundtripTimeoutPolicy::_interface_repository_id (void) const @@ -1031,7 +1031,7 @@ void* POA_Messaging::RoutingPolicy::_downcast ( void POA_Messaging::RoutingPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::RoutingPolicy::_interface_repository_id (void) const @@ -1128,7 +1128,7 @@ void* POA_Messaging::MaxHopsPolicy::_downcast ( void POA_Messaging::MaxHopsPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::MaxHopsPolicy::_interface_repository_id (void) const @@ -1225,7 +1225,7 @@ void* POA_Messaging::QueueOrderPolicy::_downcast ( void POA_Messaging::QueueOrderPolicy::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::QueueOrderPolicy::_interface_repository_id (void) const @@ -1319,7 +1319,7 @@ void* POA_Messaging::ReplyHandler::_downcast ( void POA_Messaging::ReplyHandler::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_Messaging::ReplyHandler::_interface_repository_id (void) const @@ -1500,7 +1500,7 @@ void POA_Messaging::Poller::_get_operation_target_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1523,7 +1523,7 @@ void POA_Messaging::Poller::_get_operation_name_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1546,7 +1546,7 @@ void POA_Messaging::Poller::_get_associated_handler_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1563,7 +1563,7 @@ void POA_Messaging::Poller::_set_associated_handler_skel ( if (!( (_tao_in >> associated_handler.out ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); _tao_impl->associated_handler ( associated_handler.in (), @@ -1592,7 +1592,7 @@ void POA_Messaging::Poller::_get_is_from_poller_skel ( if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1615,7 +1615,7 @@ void POA_Messaging::Poller::_get_target_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1638,7 +1638,7 @@ void POA_Messaging::Poller::_get_op_name_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1732,7 +1732,7 @@ void POA_Messaging::Poller::_dispatch (CORBA::ServerRequest &req, void *context, if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp index 39356702387..34f842d93f0 100644 --- a/TAO/tao/NVList.cpp +++ b/TAO/tao/NVList.cpp @@ -226,7 +226,7 @@ CORBA_NVList::add_element (CORBA::Flags flags, CORBA::Environment &env) if (ACE_BIT_DISABLED (flags, CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT)) { - env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return 0; } diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index caaa6f3a202..d01baf45c81 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -908,7 +908,7 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key, CORBA::Environment &ACE_TRY_ENV) { if (this->open () == -1) - ACE_THROW_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); CORBA::String id = 0; @@ -927,7 +927,7 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key, TAO_MProfile *mp; ACE_NEW_THROW_EX (mp, TAO_MProfile (1), - CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (stub); TAO_ORB_Parameters *orb_params = @@ -939,14 +939,14 @@ CORBA_ORB::create_stub_object (const TAO_ObjectKey &key, orb_params->addr ().get_port_number (), key, orb_params->addr ()), - CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (stub); mp->give_profile (pfile); ACE_NEW_THROW_EX (stub, TAO_Stub (id, mp, this->orb_core_), - CORBA::NO_MEMORY (CORBA::COMPLETED_MAYBE)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (stub); return stub; @@ -971,7 +971,7 @@ CORBA_ORB::key_to_object (const TAO_ObjectKey &key, if (CORBA::is_nil (new_obj)) { data->_decr_refcnt (); - env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::Object::_nil (); } @@ -1178,7 +1178,7 @@ CORBA_ORB::init_orb_globals (CORBA::Environment &ACE_TRY_ENV) sizeof (CORBA::WChar), sizeof (void *))); - ACE_THROW (CORBA::INITIALIZE (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INITIALIZE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } } CORBA_ORB::orb_init_count_++; @@ -1221,7 +1221,7 @@ CORBA::ORB_init (int &argc, // Check for errors and return 0 if error. if (result == -1) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); } // This (init_orb_globals) must come *after* ORB Core initialization. @@ -1396,7 +1396,7 @@ CORBA_ORB::ior_string_to_object (const char *str, if (tmp [0] && !isspace (tmp [0])) { - ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), CORBA::Object::_nil ()); } diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 211ba7b6c18..5a9cc182a71 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -82,7 +82,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -103,7 +103,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, if (!( (_tao_out << type_id) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); int _invoke_status = _tao_call.invoke (0, 0, ACE_TRY_ENV); @@ -115,7 +115,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -124,7 +124,7 @@ CORBA_Object::_is_a (const CORBA::Char *type_id, if (!( (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -161,7 +161,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -187,7 +187,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -198,7 +198,7 @@ CORBA_Object::_non_existent (CORBA::Environment &ACE_TRY_ENV) if (!( (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); return _tao_retval; } @@ -268,7 +268,7 @@ CORBA_Object::_create_request (CORBA::Context_ptr ctx, // is a no-no. if (ctx) { - TAO_THROW(CORBA::NO_IMPLEMENT (CORBA::COMPLETED_NO)); + TAO_THROW(CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } request = new CORBA::Request (this, operation, arg_list, result, req_flags); } @@ -293,7 +293,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -317,7 +317,7 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -331,10 +331,10 @@ CORBA_Object::_get_interface (CORBA::Environment &ACE_TRY_ENV) if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); #else ACE_UNUSED_ARG (_tao_retval); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); #endif } diff --git a/TAO/tao/Object_Adapter.cpp b/TAO/tao/Object_Adapter.cpp index c43a5029d23..08bc5f1bb29 100644 --- a/TAO/tao/Object_Adapter.cpp +++ b/TAO/tao/Object_Adapter.cpp @@ -351,7 +351,7 @@ TAO_Object_Adapter::locate_poa (const TAO_ObjectKey &key, if (result != 0) { - ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } } diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp index a8141979cd6..cfb4b2aaf65 100644 --- a/TAO/tao/POAC.cpp +++ b/TAO/tao/POAC.cpp @@ -294,7 +294,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -320,7 +320,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -328,7 +328,7 @@ PortableServer::ThreadPolicyValue PortableServer::ThreadPolicy::value(CORBA::Env } TAO_InputCDR &_tao_in = _tao_call.inp_stream (); if (! (_tao_in >> _tao_retval)) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -422,7 +422,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA: TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -448,7 +448,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA: // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -458,7 +458,7 @@ PortableServer::LifespanPolicyValue PortableServer::LifespanPolicy::value(CORBA: if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -550,7 +550,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -576,7 +576,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -586,7 +586,7 @@ PortableServer::IdUniquenessPolicyValue PortableServer::IdUniquenessPolicy::valu if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -677,7 +677,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -703,7 +703,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -713,7 +713,7 @@ PortableServer::IdAssignmentPolicyValue PortableServer::IdAssignmentPolicy::valu if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -807,7 +807,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -833,7 +833,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -843,7 +843,7 @@ PortableServer::ImplicitActivationPolicyValue PortableServer::ImplicitActivation if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -935,7 +935,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -961,7 +961,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -971,7 +971,7 @@ PortableServer::ServantRetentionPolicyValue PortableServer::ServantRetentionPoli if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -1063,7 +1063,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -1089,7 +1089,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -1099,7 +1099,7 @@ PortableServer::RequestProcessingPolicyValue PortableServer::RequestProcessingPo if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -1156,7 +1156,7 @@ PortableServer::POAManager_ptr PortableServer::POAManager::_narrow ( return PortableServer::POAManager::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POAManager::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::POAManager::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1343,7 +1343,7 @@ PortableServer::AdapterActivator_ptr PortableServer::AdapterActivator::_narrow ( return PortableServer::AdapterActivator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::AdapterActivator::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::AdapterActivator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1404,7 +1404,7 @@ PortableServer::ServantManager_ptr PortableServer::ServantManager::_narrow ( return PortableServer::ServantManager::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantManager::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::ServantManager::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1465,7 +1465,7 @@ PortableServer::ServantActivator_ptr PortableServer::ServantActivator::_narrow ( return PortableServer::ServantActivator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantActivator::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::ServantActivator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1527,7 +1527,7 @@ PortableServer::ServantLocator_ptr PortableServer::ServantLocator::_narrow ( return PortableServer::ServantLocator::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::ServantLocator::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::ServantLocator::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -1591,7 +1591,7 @@ PortableServer::POA_ptr PortableServer::POA::_narrow ( return PortableServer::POA::_nil (); if (!obj->_is_collocated () || !obj->_servant()) // This can only be colocated - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POA::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::POA::_nil ()); TAO_Stub *stub = obj->_stubobj (); stub->_incr_refcnt (); @@ -3175,7 +3175,7 @@ CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext = &_tc_TAO_tc_Portabl PortableServer::POA_ptr PortableServer::Current::get_POA (CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), PortableServer::POA::_nil ()); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), PortableServer::POA::_nil ()); } PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Environment &ACE_TRY_ENV) @@ -3189,7 +3189,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); ACE_NEW_RETURN (_tao_retval, PortableServer::ObjectId, _tao_retval); @@ -3216,7 +3216,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -3226,7 +3226,7 @@ PortableServer::ObjectId * PortableServer::Current::get_object_id (CORBA::Enviro if (!( (_tao_in >> *_tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } diff --git a/TAO/tao/POAS.cpp b/TAO/tao/POAS.cpp index 448f5629f12..bc5f5b6a527 100644 --- a/TAO/tao/POAS.cpp +++ b/TAO/tao/POAS.cpp @@ -123,7 +123,7 @@ void POA_PortableServer::ThreadPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } void POA_PortableServer::ThreadPolicy::_is_a_skel ( @@ -216,7 +216,7 @@ void POA_PortableServer::ThreadPolicy::_dispatch (CORBA::ServerRequest &req, voi if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -402,7 +402,7 @@ void POA_PortableServer::LifespanPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -496,7 +496,7 @@ void POA_PortableServer::LifespanPolicy::_dispatch (CORBA::ServerRequest &req, v if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -679,7 +679,7 @@ void POA_PortableServer::IdUniquenessPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -773,7 +773,7 @@ void POA_PortableServer::IdUniquenessPolicy::_dispatch (CORBA::ServerRequest &re if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -956,7 +956,7 @@ void POA_PortableServer::IdAssignmentPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1050,7 +1050,7 @@ void POA_PortableServer::IdAssignmentPolicy::_dispatch (CORBA::ServerRequest &re if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -1235,7 +1235,7 @@ void POA_PortableServer::ImplicitActivationPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1329,7 +1329,7 @@ void POA_PortableServer::ImplicitActivationPolicy::_dispatch (CORBA::ServerReque if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -1512,7 +1512,7 @@ void POA_PortableServer::ServantRetentionPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1606,7 +1606,7 @@ void POA_PortableServer::ServantRetentionPolicy::_dispatch (CORBA::ServerRequest if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -1789,7 +1789,7 @@ void POA_PortableServer::RequestProcessingPolicy::_get_value_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -1883,7 +1883,7 @@ void POA_PortableServer::RequestProcessingPolicy::_dispatch (CORBA::ServerReques if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -2048,7 +2048,7 @@ void POA_PortableServer::POAManager::_dispatch (CORBA::ServerRequest &req, void if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -2233,7 +2233,7 @@ void POA_PortableServer::AdapterActivator::_dispatch (CORBA::ServerRequest &req, if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -2376,7 +2376,7 @@ void POA_PortableServer::ServantManager::_dispatch (CORBA::ServerRequest &req, v if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -2509,7 +2509,7 @@ void POA_PortableServer::ServantActivator::_dispatch (CORBA::ServerRequest &req, if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -2675,7 +2675,7 @@ void POA_PortableServer::ServantLocator::_dispatch (CORBA::ServerRequest &req, v if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -2844,7 +2844,7 @@ void POA_PortableServer::POA::_dispatch (CORBA::ServerRequest &req, void *contex if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -3326,7 +3326,7 @@ void POA_PortableServer::Current::get_POA_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -3349,7 +3349,7 @@ void POA_PortableServer::Current::get_object_id_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -3443,7 +3443,7 @@ void POA_PortableServer::Current::_dispatch (CORBA::ServerRequest &req, void *co if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 35fe452ad26..852a0f95889 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -199,7 +199,7 @@ CORBA::PolicyType CORBA_Policy::policy_type ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -225,7 +225,7 @@ CORBA::PolicyType CORBA_Policy::policy_type ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -235,7 +235,7 @@ CORBA::PolicyType CORBA_Policy::policy_type ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -247,7 +247,7 @@ CORBA_Policy_ptr CORBA_Policy::copy ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -273,7 +273,7 @@ CORBA_Policy_ptr CORBA_Policy::copy ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -283,7 +283,7 @@ CORBA_Policy_ptr CORBA_Policy::copy ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -294,7 +294,7 @@ void CORBA_Policy::destroy ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -320,7 +320,7 @@ void CORBA_Policy::destroy ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_YES)); + ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } break; @@ -446,7 +446,7 @@ CORBA_PolicyList * CORBA_PolicyManager::get_policy_overrides ( { CORBA_PolicyList* _tao_retval = 0; ACE_UNUSED_ARG(_tao_retval); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); } void CORBA_PolicyManager::set_policy_overrides ( @@ -455,7 +455,7 @@ void CORBA_PolicyManager::set_policy_overrides ( CORBA::Environment &ACE_TRY_ENV ) { - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } CORBA::Boolean CORBA_PolicyManager::_is_a (const CORBA::Char *value, CORBA::Environment &env) diff --git a/TAO/tao/PolicyS.cpp b/TAO/tao/PolicyS.cpp index 1f4e66e3761..9f3263aba96 100644 --- a/TAO/tao/PolicyS.cpp +++ b/TAO/tao/PolicyS.cpp @@ -127,7 +127,7 @@ void POA_CORBA::Policy::_get_policy_type_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -150,7 +150,7 @@ void POA_CORBA::Policy::copy_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -255,7 +255,7 @@ void POA_CORBA::Policy::_dispatch (CORBA::ServerRequest &req, void *context, COR // find the skeleton corresponding to this opname if (this->_find (opname, skel) == -1) { - env.exception (new CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + env.exception (new CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); } else @@ -371,7 +371,7 @@ void* POA_CORBA::PolicyManager::_downcast ( void POA_CORBA::PolicyManager::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { // @@ TODO - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_CORBA::PolicyManager::_interface_repository_id (void) const @@ -486,7 +486,7 @@ void* POA_CORBA::PolicyCurrent::_downcast ( void POA_CORBA::PolicyCurrent::_dispatch (CORBA::ServerRequest &req, void *context, CORBA::Environment &ACE_TRY_ENV) { - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } const char* POA_CORBA::PolicyCurrent::_interface_repository_id (void) const diff --git a/TAO/tao/Policy_Manager.cpp b/TAO/tao/Policy_Manager.cpp index ab5aab9c9e4..a4b776e3117 100644 --- a/TAO/tao/Policy_Manager.cpp +++ b/TAO/tao/Policy_Manager.cpp @@ -20,7 +20,7 @@ TAO_Policy_Manager_Impl::set_policy_overrides ( // @@ The spec does not say what to do on this case. if (set_add != CORBA::SET_OVERRIDE && set_add != CORBA::ADD_OVERRIDE) - ACE_THROW (CORBA::BAD_PARAM (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); CORBA::InvalidPolicies invalid_policies; invalid_policies.indices.length (policies.length ()); diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 029fec18db6..c2fe7d66370 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -80,7 +80,7 @@ CORBA::Boolean CORBA_Pollable::is_ready ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -100,7 +100,7 @@ CORBA::Boolean CORBA_Pollable::is_ready ( if (!( (_tao_out << timeout) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); int _invoke_status = _tao_call.invoke (0, 0, ACE_TRY_ENV); @@ -112,7 +112,7 @@ CORBA::Boolean CORBA_Pollable::is_ready ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -122,7 +122,7 @@ CORBA::Boolean CORBA_Pollable::is_ready ( if (!( (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -134,7 +134,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -160,7 +160,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -170,7 +170,7 @@ CORBA_PollableSet_ptr CORBA_Pollable::create_pollable_set ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -413,7 +413,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -439,7 +439,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -449,7 +449,7 @@ CORBA::DIIPollable_ptr CORBA_PollableSet::create_dii_pollable ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -461,7 +461,7 @@ void CORBA_PollableSet::add_pollable ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -481,7 +481,7 @@ void CORBA_PollableSet::add_pollable ( if (!( (_tao_out << potential) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); int _invoke_status = _tao_call.invoke (0, 0, ACE_TRY_ENV); @@ -493,7 +493,7 @@ void CORBA_PollableSet::add_pollable ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_YES)); + ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } break; @@ -516,7 +516,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -536,7 +536,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll ( if (!( (_tao_out << timeout) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); int _invoke_status = _tao_call.invoke (_tao_CORBA_PollableSet_poll_exceptiondata, 1, ACE_TRY_ENV); @@ -548,7 +548,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -558,7 +558,7 @@ CORBA_Pollable_ptr CORBA_PollableSet::poll ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } @@ -575,7 +575,7 @@ void CORBA_PollableSet::remove ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW (CORBA::INV_OBJREF (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -595,7 +595,7 @@ void CORBA_PollableSet::remove ( if (!( (_tao_out << potential) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); int _invoke_status = _tao_call.invoke (_tao_CORBA_PollableSet_remove_exceptiondata, 1, ACE_TRY_ENV); @@ -607,7 +607,7 @@ void CORBA_PollableSet::remove ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_YES)); + ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)); } break; @@ -624,7 +624,7 @@ CORBA::UShort CORBA_PollableSet::number_left ( TAO_Stub *istub = this->_stubobj (); if (istub == 0) - ACE_THROW_RETURN (CORBA::INV_OBJREF (CORBA::COMPLETED_NO), _tao_retval); + ACE_THROW_RETURN (CORBA::INV_OBJREF (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), _tao_retval); TAO_GIOP_Twoway_Invocation _tao_call ( @@ -650,7 +650,7 @@ CORBA::UShort CORBA_PollableSet::number_left ( // cannot happen if (_invoke_status != TAO_INVOKE_OK) { - ACE_THROW_RETURN (CORBA::UNKNOWN (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); } break; @@ -660,7 +660,7 @@ CORBA::UShort CORBA_PollableSet::number_left ( if (!( (_tao_in >> _tao_retval) )) - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_YES), _tao_retval); + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval); return _tao_retval; } diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp index b2f0e9c5b99..082b0f7fd1d 100644 --- a/TAO/tao/PollableS.cpp +++ b/TAO/tao/PollableS.cpp @@ -129,7 +129,7 @@ void POA_CORBA::Pollable::is_ready_skel ( if (!( (_tao_in >> timeout) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); _tao_retval = _tao_impl->is_ready ( timeout, @@ -142,7 +142,7 @@ void POA_CORBA::Pollable::is_ready_skel ( if (!( (_tao_out << CORBA::Any::from_boolean (_tao_retval)) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -165,7 +165,7 @@ void POA_CORBA::Pollable::create_pollable_set_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -256,7 +256,7 @@ void POA_CORBA::Pollable::_dispatch (CORBA::ServerRequest &req, void *context, C if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -501,7 +501,7 @@ void POA_CORBA::DIIPollable::_dispatch (CORBA::ServerRequest &req, void *context if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); @@ -657,7 +657,7 @@ void POA_CORBA::PollableSet::create_dii_pollable_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -674,7 +674,7 @@ void POA_CORBA::PollableSet::add_pollable_skel ( if (!( (_tao_in >> potential.out ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); _tao_impl->add_pollable ( potential.in (), @@ -698,7 +698,7 @@ void POA_CORBA::PollableSet::poll_skel ( if (!( (_tao_in >> timeout) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); _tao_retval = _tao_impl->poll ( timeout, @@ -711,7 +711,7 @@ void POA_CORBA::PollableSet::poll_skel ( if (!( (_tao_out << _tao_retval.in ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -728,7 +728,7 @@ void POA_CORBA::PollableSet::remove_skel ( if (!( (_tao_in >> potential.out ()) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); _tao_impl->remove ( potential.in (), @@ -757,7 +757,7 @@ void POA_CORBA::PollableSet::number_left_skel ( if (!( (_tao_out << _tao_retval) )) - ACE_THROW (CORBA::MARSHAL (CORBA::COMPLETED_NO) ); + ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO) ); } @@ -848,7 +848,7 @@ void POA_CORBA::PollableSet::_dispatch (CORBA::ServerRequest &req, void *context if (this->_find (opname, skel) == -1) { ACE_ERROR ((LM_ERROR, "Bad operation <%s>\n", opname)); - ACE_THROW (CORBA_BAD_OPERATION (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA_BAD_OPERATION (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } else skel (req, this, context, ACE_TRY_ENV); diff --git a/TAO/tao/Server_Request.cpp b/TAO/tao/Server_Request.cpp index 95aceb59a51..16a4aa0fd10 100644 --- a/TAO/tao/Server_Request.cpp +++ b/TAO/tao/Server_Request.cpp @@ -122,7 +122,7 @@ IIOP_ServerRequest::parse_header_std (CORBA::Environment &ACE_TRY_ENV) } if (!hdr_status) - ACE_THROW (CORBA::COMM_FAILURE (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } @@ -164,7 +164,7 @@ IIOP_ServerRequest::parse_header_lite (CORBA::Environment &ACE_TRY_ENV) } if (!hdr_status) - ACE_THROW (CORBA::COMM_FAILURE (CORBA::COMPLETED_NO)); + ACE_THROW (CORBA::COMM_FAILURE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } @@ -317,7 +317,7 @@ IIOP_ServerRequest::arguments (CORBA::NVList_ptr &list, ACE_ERROR ((LM_ERROR, "IIOP_ServerRequest::arguments - " "%d bytes left in buffer\n", incoming_->length ())); - env.exception (new CORBA::BAD_PARAM (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } } @@ -334,7 +334,7 @@ IIOP_ServerRequest::set_result (const CORBA::Any &value, // setting a result when another result already exists or if an exception // exists is an error if (this->retval_ || this->exception_) - env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_INV_ORDER (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); else { this->retval_ = new CORBA::Any (value); @@ -348,7 +348,7 @@ IIOP_ServerRequest::set_exception (const CORBA::Any &value, CORBA::Environment &env) { if (this->retval_ || this->exception_) - env.exception (new CORBA::BAD_INV_ORDER (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_INV_ORDER (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); else { // Try to narrow to ForwardRequest diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 37d3772097d..dfc7e67b32c 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -379,7 +379,7 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV, return; // Shouldn't happen if (status != TAO_INVOKE_OK) - ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE)); + ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); // The only case left is status == TAO_INVOKE_OK, exit the // loop. We cannot retry because at this point we either @@ -482,7 +482,7 @@ TAO_Stub::do_static_call (CORBA::Environment &ACE_TRY_ENV, return; // Shouldn't happen if (status != TAO_INVOKE_OK) - ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE)); + ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); break; } @@ -586,7 +586,7 @@ TAO_Stub::do_dynamic_call (const char *opname, return; // Shouldn't happen if (status != TAO_INVOKE_OK) - ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE)); + ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); // The only case left is status == TAO_INVOKE_OK, exit the // loop. We cannot retry because at this point we either @@ -770,7 +770,7 @@ TAO_Stub::do_dynamic_call (const char *opname, return; // Shouldn't happen if (status != TAO_INVOKE_OK) - ACE_THROW (CORBA::UNKNOWN (CORBA::COMPLETED_MAYBE)); + ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); break; } diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 3cf4e064ee0..126daf19787 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -1240,7 +1240,7 @@ CORBA_TypeCode::private_name (CORBA::Environment &env) const return this->private_state_->tc_name_; } else - TAO_THROW_ENV_RETURN (CORBA::INTERNAL (CORBA::COMPLETED_NO), env, (CORBA::String)0); + TAO_THROW_ENV_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::String)0); } // No other typecodes ever have type IDs. default: @@ -1284,7 +1284,7 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &env) const if (!stream.skip_string () // ID || !stream.skip_string () // struct name || !stream.read_ulong (members)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); this->private_state_->tc_member_count_known_ = 1; this->private_state_->tc_member_count_ = members; @@ -1310,14 +1310,14 @@ CORBA_TypeCode::private_member_count (CORBA::Environment &env) const || !skip_typecode (stream) // discriminant TC || !stream.read_ulong (members) // default used || !stream.read_ulong (members)) // real member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); this->private_state_->tc_member_count_known_ = 1; this->private_state_->tc_member_count_ = members; return this->private_state_->tc_member_count_; } default: - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } ACE_NOTREACHED (return 0); } @@ -1369,13 +1369,13 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount]; if (this->private_state_->tc_member_type_list_ == 0) - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); // skip the id, name, and member_count part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // typedef name || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); // compute the typecodes for all the members and // return the required one. @@ -1383,7 +1383,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, // the ith entry will have the typecode of the ith guy { if (!stream.skip_string ()) // skip the name - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); CORBA::TypeCode::traverse_status status = stream.decode (CORBA::_tc_TypeCode, // the typecode will be @@ -1404,7 +1404,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } this->private_state_->tc_member_type_list_known_ = 1; @@ -1436,16 +1436,16 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, // @@EXC@@ Need to check allocation failure. this->private_state_->tc_member_type_list_ = new CORBA::TypeCode_ptr [mcount]; if (this->private_state_->tc_member_type_list_ == 0) - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); // skip the id, name, and discrimant type part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // typedef name || !skip_typecode (stream)) // skip typecode for discriminant - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (CORBA::TypeCode_ptr)0); else if (!stream.read_ulong (temp) // default used || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); // Always big enough because labels can only be of a // few different types of which "long" has the // largest size. @@ -1467,7 +1467,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, if (status != CORBA::TypeCode::TRAVERSE_CONTINUE || !stream.skip_string ()) // skip the name - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); status = stream.decode (CORBA::_tc_TypeCode, // get the typecode &private_state_->tc_member_type_list_[i], @@ -1476,7 +1476,7 @@ CORBA_TypeCode::private_member_type (CORBA::ULong index, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } this->private_state_->tc_member_type_list_known_ = 1; @@ -1533,20 +1533,20 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index, if (this->private_state_->tc_member_name_list_ == 0) // no memory for the member_list - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); // skip the id, name, and member_count part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // enum name || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); // compute the typecodes for all the members and // return the required one. for (CORBA::ULong i = 0; i < mcount; i++) // now skip this name if (!stream.read_string (this->private_state_->tc_member_name_list_ [i])) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); this->private_state_->tc_member_name_list_known_ = 1; @@ -1580,20 +1580,20 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index, if (this->private_state_->tc_member_name_list_ == 0) // no memory for the member_list - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); // skip the id, name, and member_count part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // struct/except name || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); // compute the typecodes for all the members and // return the required one. for (CORBA::ULong i = 0; i < mcount; i++) if (!stream.read_string (this->private_state_->tc_member_name_list_ [i]) || !skip_typecode (stream)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); this->private_state_->tc_member_name_list_known_ = 1; @@ -1626,16 +1626,16 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index, if (this->private_state_->tc_member_name_list_ == 0) // no memory for the member_list - TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); // skip the id, name, and discrimant type part if (!stream.skip_string () // type ID, hidden || !stream.skip_string () // typedef name || !skip_typecode (stream)) // skip typecode for discriminant - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, (char *)0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, (char *)0); else if (!stream.read_ulong (temp) // default used || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); else { CORBA::Long scratch; // always big enough because labels can @@ -1656,12 +1656,12 @@ CORBA_TypeCode::private_member_name (CORBA::ULong index, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); // skip typecode for member if (!stream.read_string (this->private_state_->tc_member_name_list_ [i]) || (!skip_typecode (stream))) // skip typecode - TAO_THROW_ENV_RETURN ( CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN ( CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } this->private_state_->tc_member_name_list_known_ = 1; @@ -1709,7 +1709,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, ACE_DEBUG ((LM_DEBUG, "TypeCode::private_member_label -- " "error reading from stream")); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), 0); + ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); } // Double checked locking... @@ -1730,7 +1730,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, CORBA::Any_ptr* label_list; ACE_NEW_THROW_EX (label_list, CORBA::Any_ptr [member_count], - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); // get the discriminant TC @@ -1775,7 +1775,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, // @@EXC@@ Need to check memory allocation failure. ACE_NEW_THROW_EX (label_list[i], CORBA::Any (tc, out.begin ()), - CORBA::NO_MEMORY (CORBA::COMPLETED_NO)); + CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (0); if (stream.skip_string () == 0 @@ -1786,7 +1786,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n, "TypeCode::private_member_label " "error getting typecode for member %d\n", i)); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), 0); } } @@ -1821,7 +1821,7 @@ CORBA_TypeCode::private_discriminator_type (CORBA::Environment &env) const || stream.decode (CORBA::_tc_TypeCode, &this->private_state_->tc_discriminator_type_, this, env) != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); this->private_state_->tc_discriminator_type_known_ = 1; return this->private_state_->tc_discriminator_type_; @@ -1845,7 +1845,7 @@ CORBA_TypeCode::private_default_index (CORBA::Environment &env) const || !stream.skip_string () // typedef name || !skip_typecode (stream) // skip discriminant || !stream.read_long (this->private_state_->tc_default_index_used_)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); this->private_state_->tc_default_index_used_known_ = 1; return this->private_state_->tc_default_index_used_; @@ -1870,7 +1870,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &env) const // skip the typecode of the element and get the bounds if (!skip_typecode (stream) // skip typecode || !stream.read_ulong (this->private_state_->tc_length_)) - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); else { this->private_state_->tc_length_known_ = 1; @@ -1894,7 +1894,7 @@ CORBA_TypeCode::private_length (CORBA::Environment &env) const return this->private_state_->tc_length_; } else - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } ACE_NOTREACHED (break); @@ -1929,7 +1929,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) // element type - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); else { this->private_state_->tc_content_type_known_ = 1; @@ -1948,7 +1948,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const if (!stream.skip_string () // typeID || !stream.skip_string ()) // name - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); status = stream.decode (CORBA::_tc_TypeCode, &this->private_state_->tc_content_type_, this, @@ -1956,7 +1956,7 @@ CORBA_TypeCode::private_content_type (CORBA::Environment &env) const TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); else { this->private_state_->tc_content_type_known_ = 1; @@ -2040,7 +2040,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const if (!stream.skip_string () // ID || !stream.skip_string () // struct name || !stream.read_ulong (members)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); return 3 + 2 * members; } @@ -2056,7 +2056,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const if (!stream.skip_string () // ID || !stream.skip_string () // typedef name || !stream.read_ulong (members)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); return 3 + members; } @@ -2074,7 +2074,7 @@ CORBA_TypeCode::param_count (CORBA::Environment &env) const || !skip_typecode (stream) // discriminant TC || !stream.read_ulong (members) // default used || !stream.read_ulong (members)) // real member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); return 5 + 3 * members; } @@ -2118,11 +2118,11 @@ CORBA_TypeCode::ulong_param (CORBA::ULong n, this->byte_order_); if (!skip_typecode (stream)) - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); // Then comes the "bounds" parameter. if (!stream.read_ulong (temp)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); return temp; } @@ -2134,7 +2134,7 @@ CORBA_TypeCode::ulong_param (CORBA::ULong n, break; return this->length_; } - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } // Internal hack, used until member_type (), discriminator_type (), @@ -2183,7 +2183,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); return tc; case CORBA::tk_alias: // #1 is a tc @@ -2191,13 +2191,13 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, break; if (!stream.skip_string () // type ID, hidden || !stream.skip_string ()) // typedef name - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); status = stream.decode (CORBA::_tc_TypeCode, &tc, this, env); TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); return tc; case CORBA::tk_except: @@ -2210,7 +2210,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, || !stream.skip_string () // typedef name || !stream.read_ulong (temp)) // member count - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); temp = (n - 3) / 2; @@ -2219,10 +2219,10 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, // skip to the member being asked if (!stream.skip_string () // member name || !skip_typecode (stream)) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); if (!stream.skip_string ()) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); status = stream.decode (CORBA::_tc_TypeCode, &tc, @@ -2231,7 +2231,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); return tc; case CORBA::tk_union: // #6 and up are tc, index from 0 @@ -2240,7 +2240,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, if (!stream.skip_string () // type ID, hidden || !stream.skip_string ()) // typedef name - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); status = stream.decode (CORBA::_tc_TypeCode, &tc, this, @@ -2248,12 +2248,12 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) // TC - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); if (!stream.read_ulong (temp) // default used || !stream.read_ulong (temp)) // member count { CORBA::release (tc); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } if (n == 2) @@ -2268,7 +2268,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, for (i = 0; i < temp; i++) { status = stream.decode (tc, &scratch, this, env); // member label - // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE @@ -2276,7 +2276,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, || !skip_typecode (stream)) { // member typecode CORBA::release (tc); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } } // member label @@ -2289,7 +2289,7 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, if (status != CORBA::TypeCode::TRAVERSE_CONTINUE || !stream.skip_string ()) // member name - TAO_TRY_THROW (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + TAO_TRY_THROW (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); } TAO_CATCHANY { @@ -2306,11 +2306,11 @@ CORBA_TypeCode::typecode_param (CORBA::ULong n, TAO_CHECK_ENV_RETURN (env, 0); if (status != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); return tc; } - TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_PARAM (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); } // Tell user the size of an instance of the data type described by @@ -2320,7 +2320,7 @@ size_t CORBA::TypeCode::private_size (CORBA::Environment &env) { if (kind_ >= CORBA::TC_KIND_COUNT) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); env.clear (); @@ -2358,7 +2358,7 @@ CORBA::TypeCode::private_alignment (CORBA::Environment &env) env.clear (); if (kind_ >= CORBA::TC_KIND_COUNT) - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), env, 0); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, 0); // Double checked locking... ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index 8ccdf1047e1..2594fc4871a 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -90,7 +90,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -131,7 +131,7 @@ TAO_Marshal_Any::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Any::append detected error\n")); CORBA::release (elem_tc); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); } return retval; } @@ -205,7 +205,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode: " "Bad kind_ value in CDR stream\n")); - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -218,7 +218,7 @@ TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode::append detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -296,7 +296,7 @@ TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr, { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_ObjRef::append detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -342,7 +342,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -466,7 +466,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } break; default: - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; }// end of switch @@ -487,13 +487,13 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } // end of for loop @@ -507,31 +507,31 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -561,7 +561,7 @@ TAO_Marshal_String::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode::append detected error")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -612,7 +612,7 @@ TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "marshaling TAO_Marshal_Sequence::append detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -657,7 +657,7 @@ TAO_Marshal_Array::append (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::append detected error")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -691,7 +691,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -745,7 +745,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -776,7 +776,7 @@ TAO_Marshal_WString::append (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_WString::append detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index af8c87882f4..c40b8785e48 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -118,7 +118,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")); - TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, + TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } } @@ -218,7 +218,7 @@ TAO_Marshal_Any::decode (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Any::decode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); } return retval; } @@ -309,7 +309,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, // have nonempty parameter lists ... default: // Error: missed a case! - env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; // Some have "simple" parameter lists ... some of these @@ -389,7 +389,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, { if (parent_typecode == 0) { - env.exception (new CORBA::INTERNAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -514,7 +514,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, } else // bad kind_ value to be decoded { - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode:decode: " @@ -530,7 +530,7 @@ TAO_Marshal_TypeCode::decode (CORBA::TypeCode_ptr, if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode::decode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -552,7 +552,7 @@ TAO_Marshal_Principal::decode (CORBA::TypeCode_ptr, if ((*stream >> x) == 0) { *(CORBA_Principal_ptr*)data = CORBA::Principal::_nil (); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -576,7 +576,7 @@ TAO_Marshal_ObjRef::decode (CORBA::TypeCode_ptr, if ((*stream >> object) == 0) { *(CORBA_Object_ptr*)data = CORBA::Object::_nil (); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -723,7 +723,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -859,7 +859,7 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr tc, } break; default: - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; }// end of switch @@ -881,13 +881,13 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr tc, } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } // end of for loop @@ -902,31 +902,31 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr tc, } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -961,7 +961,7 @@ TAO_Marshal_String::decode (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_String::decode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1182,7 +1182,7 @@ TAO_Marshal_Sequence::decode (CORBA::TypeCode_ptr tc, // If an error was detected but no exception was raised then raise a // marshal exception. if (env.exception () == 0) - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -1333,7 +1333,7 @@ TAO_Marshal_Array::decode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::decode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -1430,7 +1430,7 @@ TAO_Marshal_Alias::decode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Alias::decode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1560,7 +1560,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1607,7 +1607,7 @@ TAO_Marshal_WString::decode (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_WString::decode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp index ffe038745ee..948a2f6db92 100644 --- a/TAO/tao/deep_free.cpp +++ b/TAO/tao/deep_free.cpp @@ -129,7 +129,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")); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } my_kind = tc->kind (env); @@ -158,7 +158,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")); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } return CORBA::TypeCode::TRAVERSE_CONTINUE; } @@ -175,7 +175,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")); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -274,7 +274,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")); - TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } return CORBA::TypeCode::TRAVERSE_CONTINUE; } @@ -307,7 +307,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, discrim_tc = tc->discriminator_type (env); // Get the discriminator type // @@EXC@@ Why are we changing the exception thrown here? - // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); discrim_val = base_union->_discriminant (); @@ -319,12 +319,12 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, default_index = tc->default_index (env); // now get ready to marshal the actual union value // @@EXC@@ Why are we changing the exception thrown here? - // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); member_count = tc->member_count (env); // @@EXC@@ Why are we changing the exception thrown here? - // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); // check which label value matches with the discriminator @@ -335,7 +335,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, { member_label = tc->member_label (i, env); // @@EXC@@ Why are we changing the exception thrown here? - // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); // do the matching @@ -379,7 +379,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, discrim_matched = 1; break; default: - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO), + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, CORBA::TypeCode::TRAVERSE_STOP); }// end of switch @@ -387,7 +387,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, // get the member typecode member_tc = tc->member_type (i, env); // @@EXC@@ Why are we changing the exception thrown here? - // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + // if (env.exception ()) TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); if (default_index >= 0 && default_index-- == 0) @@ -408,7 +408,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, CORBA::TypeCode::TRAVERSE_STOP); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), + TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); @@ -433,7 +433,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, CORBA::TypeCode::TRAVERSE_STOP); if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE) - TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), + TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); @@ -491,7 +491,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")); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } bounds = tc->length (env); @@ -638,7 +638,7 @@ TAO_Marshal_Array::deep_free (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::deep_free detected error\n")); // error exit - TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), env, CORBA::TypeCode::TRAVERSE_STOP); } ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP); } @@ -659,7 +659,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")); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } // get element type @@ -740,7 +740,7 @@ TAO_Marshal_Alias::deep_free (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Alias::decode detected error\n")); - TAO_THROW_ENV_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } ACE_NOTREACHED (return CORBA::TypeCode::TRAVERSE_STOP); } @@ -766,7 +766,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")); - TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); + TAO_THROW_ENV_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), env, CORBA::TypeCode::TRAVERSE_STOP); } // XXX: Exceptions are currently leaked because of bugs lurking // in this area. Keep in mind that there are two things to diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index 03bda8a8ecc..0d43165b0c5 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -99,7 +99,7 @@ TAO_Marshal_Primitive::encode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Primitive::encode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -149,7 +149,7 @@ TAO_Marshal_Any::encode (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Any::encode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -219,7 +219,7 @@ TAO_Marshal_TypeCode::encode (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode::encode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -238,7 +238,7 @@ TAO_Marshal_Principal::encode (CORBA::TypeCode_ptr, if ((*stream << p) == 0) { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } return CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -265,7 +265,7 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr, if ((*stream << obj) == 0) { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } return CORBA::TypeCode::TRAVERSE_CONTINUE; @@ -400,7 +400,7 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Struct::encode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -546,7 +546,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, ACE_DEBUG ((LM_DEBUG, "Union::encode - " "Bad discriminant type\n")); - ACE_THROW_RETURN (CORBA::BAD_TYPECODE (CORBA::COMPLETED_MAYBE), + ACE_THROW_RETURN (CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE), CORBA::TypeCode::TRAVERSE_STOP); }// end of switch @@ -581,7 +581,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, "Union::encode - failed. " "No match and no default case\n")); - ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), + ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO), CORBA::TypeCode::TRAVERSE_STOP); } @@ -822,7 +822,7 @@ TAO_Marshal_Sequence::encode (CORBA::TypeCode_ptr tc, // If an error was detected but no exception was raised then raise a // marshal exception. if (env.exception () == 0) - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -972,7 +972,7 @@ TAO_Marshal_Array::encode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::encode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -1056,7 +1056,7 @@ TAO_Marshal_Alias::encode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Alias::encode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -1178,7 +1178,7 @@ TAO_Marshal_Except::encode (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Except::encode detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 6f35b47df85..a2e1d9b43b4 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -85,7 +85,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -202,7 +202,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode::skip: " "Bad kind_ value in CDR stream")); - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -214,7 +214,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode::skip detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -247,7 +247,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Principal::skip detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -333,7 +333,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "error decoding IIOP host/port")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -341,7 +341,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, if (str.skip (TC_opaque, env) != CORBA::TypeCode::TRAVERSE_CONTINUE) { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -354,7 +354,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_ObjRef::skip detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -396,7 +396,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -519,7 +519,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } break; default: - env.exception (new CORBA::BAD_TYPECODE (CORBA::COMPLETED_NO)); + env.exception (new CORBA::BAD_TYPECODE (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; }// end of switch @@ -539,13 +539,13 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } // end of for loop @@ -557,25 +557,25 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } else { - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -607,7 +607,7 @@ TAO_Marshal_String::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_TypeCode::skip detected error")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -657,7 +657,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::skip detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -696,7 +696,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr tc, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_Sequence::skip detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_NO)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); return CORBA::TypeCode::TRAVERSE_STOP; } @@ -731,7 +731,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -784,7 +784,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")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } @@ -822,7 +822,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr, if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "TAO_Marshal_WString::skip detected error\n")); - env.exception (new CORBA::MARSHAL (CORBA::COMPLETED_MAYBE)); + env.exception (new CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_MAYBE)); return CORBA::TypeCode::TRAVERSE_STOP; } } |