diff options
Diffstat (limited to 'TAO/tao/CDR_Encaps_Codec.cpp')
| -rw-r--r-- | TAO/tao/CDR_Encaps_Codec.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/TAO/tao/CDR_Encaps_Codec.cpp b/TAO/tao/CDR_Encaps_Codec.cpp index 211a9cb1d7c..760922e4928 100644 --- a/TAO/tao/CDR_Encaps_Codec.cpp +++ b/TAO/tao/CDR_Encaps_Codec.cpp @@ -16,7 +16,7 @@ ACE_RCSID (TAO_CodecFactory, TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major, - CORBA::Octet minor) + CORBA::Octet minor) : major_ (major), minor_ (minor) { @@ -27,13 +27,13 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void) } CORBA::OctetSeq * -TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data, - CORBA::Environment &ACE_TRY_ENV) +TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::InvalidTypeForEncoding)) + IOP::Codec::InvalidTypeForEncoding)) { - this->check_type_for_encoding (data, - ACE_TRY_ENV); + this->check_type_for_encoding (data + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // ---------------------------------------------------------------- @@ -74,10 +74,10 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data, } CORBA::Any * -TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data, - CORBA::Environment &ACE_TRY_ENV) +TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::FormatMismatch)) + IOP::Codec::FormatMismatch)) { // @todo How do we check for a format mismatch so that we can throw // a IOP::Codec::FormatMismatch exception? @@ -116,13 +116,13 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data, } CORBA::OctetSeq * -TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data, - CORBA::Environment &ACE_TRY_ENV) +TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::InvalidTypeForEncoding)) + IOP::Codec::InvalidTypeForEncoding)) { - this->check_type_for_encoding (data, - ACE_TRY_ENV); + this->check_type_for_encoding (data + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // ---------------------------------------------------------------- @@ -137,8 +137,8 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data, TAO_Marshal_Object::perform_append (tc.in (), &input, - &cdr, - ACE_TRY_ENV); + &cdr + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // TAO extension: replace the contents of the octet sequence with @@ -171,16 +171,16 @@ TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data, return safe_octet_seq._retn (); } - ACE_THROW_RETURN (CORBA::MARSHAL (), 0); + ACE_THROW_RETURN (CORBA::MARSHAL (), 0); } CORBA::Any * TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, - CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV) + CORBA::TypeCode_ptr tc + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - IOP::Codec::FormatMismatch, - IOP::Codec::TypeMismatch)) + IOP::Codec::FormatMismatch, + IOP::Codec::TypeMismatch)) { // @todo How do we check for a type mismatch so that we can // throw a IOP::Codec::TypeMismatch exception? @@ -215,7 +215,7 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, // Skip over the next argument. CORBA::TypeCode::traverse_status status = - TAO_Marshal_Object::perform_skip (tc, &cdr, ACE_TRY_ENV); + TAO_Marshal_Object::perform_skip (tc, &cdr TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ Should we throw a // IOP::Codec::TypeMismatch exception // here if this fails? @@ -279,8 +279,8 @@ TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data, void TAO_CDR_Encaps_Codec::check_type_for_encoding ( - const CORBA::Any & data, - CORBA::Environment &ACE_TRY_ENV) + const CORBA::Any & data + TAO_ENV_ARG_DECL) { // @@ TODO: Are there any other conditions we need to check? |