diff options
Diffstat (limited to 'TAO/tao/CodecFactory.cpp')
| -rw-r--r-- | TAO/tao/CodecFactory.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/TAO/tao/CodecFactory.cpp b/TAO/tao/CodecFactory.cpp index 9a4b57e4dfa..29e51369bf3 100644 --- a/TAO/tao/CodecFactory.cpp +++ b/TAO/tao/CodecFactory.cpp @@ -14,10 +14,10 @@ TAO_CodecFactory::TAO_CodecFactory (void) } IOP::Codec_ptr -TAO_CodecFactory::create_codec (const IOP::Encoding & enc, - CORBA::Environment &ACE_TRY_ENV) +TAO_CodecFactory::create_codec (const IOP::Encoding & enc + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, - IOP::CodecFactory::UnknownEncoding)) + IOP::CodecFactory::UnknownEncoding)) { // @todo: Ideally we should have some sort of CodecFactory // registry to make it possible to add factories @@ -36,30 +36,30 @@ TAO_CodecFactory::create_codec (const IOP::Encoding & enc, // value (0) is used instead. case 0 /* IOP::ENCODING_CDR_ENCAPS */: if (enc.major_version < 1) - { - // There is no such thing as a "0.x" CDR encapsulation. - ACE_THROW_RETURN (CORBA::BAD_PARAM ( + { + // There is no such thing as a "0.x" CDR encapsulation. + ACE_THROW_RETURN (CORBA::BAD_PARAM ( CORBA_SystemException::_tao_minor_code ( - TAO_DEFAULT_MINOR_CODE, - EINVAL), - CORBA::COMPLETED_NO), - IOP::Codec::_nil ()); - } + TAO_DEFAULT_MINOR_CODE, + EINVAL), + CORBA::COMPLETED_NO), + IOP::Codec::_nil ()); + } ACE_NEW_THROW_EX (codec, - TAO_CDR_Encaps_Codec (enc.major_version, - enc.minor_version), - CORBA::NO_MEMORY ( + TAO_CDR_Encaps_Codec (enc.major_version, + enc.minor_version), + CORBA::NO_MEMORY ( CORBA_SystemException::_tao_minor_code ( TAO_DEFAULT_MINOR_CODE, - ENOMEM), - CORBA::COMPLETED_MAYBE)); + ENOMEM), + CORBA::COMPLETED_MAYBE)); ACE_CHECK_RETURN (IOP::Codec::_nil ()); break; default: ACE_THROW_RETURN (IOP::CodecFactory::UnknownEncoding (), - IOP::Codec::_nil ()); + IOP::Codec::_nil ()); } |