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/CDR_Interpreter.cpp | |
parent | 022dc3000a2d8ba053a44d39c9425103ce97464e (diff) | |
download | ATCD-5e929ce6147c86740c0633f04d46535eea430996.tar.gz |
Fixed SystemException constructor's signature
Diffstat (limited to 'TAO/tao/CDR_Interpreter.cpp')
-rw-r--r-- | TAO/tao/CDR_Interpreter.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
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; |