diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-11 04:52:32 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-11 04:52:32 +0000 |
| commit | 5bfcbc87a7a32c588f3c2703465683114c827b15 (patch) | |
| tree | 20f09f16fd2bce3010b7cc99fbf036d732c7c8e1 /TAO/tao/CDR.i | |
| parent | be336f052416767ee8356c206aed3b404ea0d863 (diff) | |
| download | ATCD-5bfcbc87a7a32c588f3c2703465683114c827b15.tar.gz | |
Standardized env name
Diffstat (limited to 'TAO/tao/CDR.i')
| -rw-r--r-- | TAO/tao/CDR.i | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/TAO/tao/CDR.i b/TAO/tao/CDR.i index c4ac921066c..b5e394a0e7a 100644 --- a/TAO/tao/CDR.i +++ b/TAO/tao/CDR.i @@ -343,16 +343,16 @@ ACE_INLINE CORBA::TypeCode::traverse_status TAO_OutputCDR::encode (CORBA::TypeCode_ptr tc, const void *data, const void *data2, - CORBA::Environment &env) + CORBA::Environment &TAO_IN_ENV) { TAO_Marshal_Object *mobj = - this->factory_->make_marshal_object (tc, env); - TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); + this->factory_->make_marshal_object (tc, TAO_IN_ENV); + TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (!mobj) return CORBA::TypeCode::TRAVERSE_STOP; - return mobj->encode (tc, data, data2, this, env); + return mobj->encode (tc, data, data2, this, TAO_IN_ENV); } ACE_INLINE int @@ -666,32 +666,30 @@ ACE_INLINE CORBA::TypeCode::traverse_status TAO_InputCDR::decode (CORBA::TypeCode_ptr tc, const void *data, const void *data2, - CORBA::Environment &env) + CORBA::Environment &TAO_IN_ENV) { TAO_Marshal_Object *mobj = - this->factory_->make_marshal_object (tc, env); - - TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); + this->factory_->make_marshal_object (tc, TAO_IN_ENV); + TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (!mobj) return CORBA::TypeCode::TRAVERSE_STOP; - return mobj->decode (tc, data, data2, this, env); + return mobj->decode (tc, data, data2, this, TAO_IN_ENV); } ACE_INLINE CORBA::TypeCode::traverse_status TAO_InputCDR::skip (CORBA::TypeCode_ptr tc, - CORBA::Environment &env) + CORBA::Environment &TAO_IN_ENV) { TAO_Marshal_Object *mobj = - this->factory_->make_marshal_object (tc, env); - - TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); + this->factory_->make_marshal_object (tc, TAO_IN_ENV); + TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (mobj == 0) return CORBA::TypeCode::TRAVERSE_STOP; - return mobj->skip (tc, this, env); + return mobj->skip (tc, this, TAO_IN_ENV); } ACE_INLINE size_t @@ -1174,15 +1172,14 @@ TAO_OutputCDR::append_wstring (TAO_InputCDR &stream) ACE_INLINE CORBA::TypeCode::traverse_status TAO_OutputCDR::append (CORBA::TypeCode_ptr tc, TAO_InputCDR *src, - CORBA::Environment &env) + CORBA::Environment &TAO_IN_ENV) { TAO_Marshal_Object *mobj = - this->factory_->make_marshal_object (tc, env); - - TAO_CHECK_ENV_RETURN (env, CORBA::TypeCode::TRAVERSE_STOP); + this->factory_->make_marshal_object (tc, TAO_IN_ENV); + TAO_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); if (mobj == 0) return CORBA::TypeCode::TRAVERSE_STOP; - return mobj->append (tc, src, this, env); + return mobj->append (tc, src, this, TAO_IN_ENV); } |