summaryrefslogtreecommitdiff
path: root/TAO/tao/CodecFactory
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/CodecFactory')
-rw-r--r--TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp16
-rw-r--r--TAO/tao/CodecFactory/CDR_Encaps_Codec.h17
-rw-r--r--TAO/tao/CodecFactory/CodecFactory.cpp1
-rw-r--r--TAO/tao/CodecFactory/CodecFactory.h3
-rw-r--r--TAO/tao/CodecFactory/CodecFactory_impl.cpp14
-rw-r--r--TAO/tao/CodecFactory/CodecFactory_impl.h13
6 files changed, 14 insertions, 50 deletions
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index b12e8f8af6f..4ccaf78f25a 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -16,6 +16,7 @@
#include "ace/Auto_Ptr.h"
#include "ace/OS_NS_string.h"
+#include "ace/CORBA_macros.h"
ACE_RCSID (CodecFactory,
@@ -43,13 +44,9 @@ TAO_CDR_Encaps_Codec::~TAO_CDR_Encaps_Codec (void)
}
CORBA::OctetSeq *
-TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::Codec::InvalidTypeForEncoding))
+TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data)
{
- this->check_type_for_encoding (data
- );
+ this->check_type_for_encoding (data);
// ----------------------------------------------------------------
@@ -107,8 +104,6 @@ TAO_CDR_Encaps_Codec::encode (const CORBA::Any & data
CORBA::Any *
TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
)
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::Codec::FormatMismatch))
{
// @todo How do we check for a format mismatch so that we can throw
// a IOP::Codec::FormatMismatch exception?
@@ -170,8 +165,6 @@ TAO_CDR_Encaps_Codec::decode (const CORBA::OctetSeq & data
CORBA::OctetSeq *
TAO_CDR_Encaps_Codec::encode_value (const CORBA::Any & data
)
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::Codec::InvalidTypeForEncoding))
{
this->check_type_for_encoding (data
);
@@ -258,9 +251,6 @@ CORBA::Any *
TAO_CDR_Encaps_Codec::decode_value (const CORBA::OctetSeq & data,
CORBA::TypeCode_ptr tc
)
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::Codec::FormatMismatch,
- IOP::Codec::TypeMismatch))
{
// The ACE_CDR::mb_align() call can shift the rd_ptr by up
// to ACE_CDR::MAX_ALIGNMENT-1 bytes. Similarly, the offset
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
index 5d051df1f75..90bb723f642 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.h
@@ -59,32 +59,23 @@ public:
/// Encode the given data, including the TypeCode, into an octet
/// sequence.
virtual CORBA::OctetSeq * encode (const CORBA::Any & data
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::Codec::InvalidTypeForEncoding));
+ );
/// Extract the TypeCode and the value from the octet sequence and
/// place them into an Any.
virtual CORBA::Any * decode (const CORBA::OctetSeq & data
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::Codec::FormatMismatch));
+ );
/// Encode the given data, excluding the TypeCode, into an octet
/// sequence.
virtual CORBA::OctetSeq * encode_value (const CORBA::Any & data
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::Codec::InvalidTypeForEncoding));
+ );
/// Extract the value from the octet sequence, based on the given
/// TypeCode, and place it into an Any.
virtual CORBA::Any * decode_value (const CORBA::OctetSeq & data,
CORBA::TypeCode_ptr tc
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::Codec::FormatMismatch,
- IOP::Codec::TypeMismatch));
+ );
protected:
diff --git a/TAO/tao/CodecFactory/CodecFactory.cpp b/TAO/tao/CodecFactory/CodecFactory.cpp
index 454a4e11df0..e9ce1b47003 100644
--- a/TAO/tao/CodecFactory/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory.cpp
@@ -26,7 +26,6 @@ TAO_CodecFactory_Loader::create_object (
int,
ACE_TCHAR *[]
)
- ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::Object_ptr obj = CORBA::Object::_nil ();
ACE_NEW_RETURN (obj,
diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h
index 2c49a66f1ea..817edeb3d4f 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -39,8 +39,7 @@ public:
virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
int argc,
ACE_TCHAR *argv []
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ );
/// Used to force the initialization of the ORB code.
static int Initializer (void);
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.cpp b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
index e63b609e9c8..cbfd52ccc13 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -9,6 +9,7 @@
#include "tao/ORB_Core.h"
#include "tao/Codeset_Manager.h"
#include "ace/Codeset_Symbols.h"
+#include "ace/CORBA_macros.h"
ACE_RCSID (CodecFactory_impl,
CodecFactory,
@@ -22,11 +23,7 @@ TAO_CodecFactory::TAO_CodecFactory (TAO_ORB_Core * orb_core)
}
IOP::Codec_ptr
-TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::CodecFactory::UnknownEncoding,
- IOP::CodecFactory::UnsupportedCodeset))
+TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc)
{
TAO_Codeset_Translator_Base *char_trans = 0;
TAO_Codeset_Translator_Base *wchar_trans = 0;
@@ -69,10 +66,7 @@ TAO_CodecFactory::create_codec_with_codesets (const IOP::Encoding_1_2 & enc
}
IOP::Codec_ptr
-TAO_CodecFactory::create_codec (const IOP::Encoding & enc
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::CodecFactory::UnknownEncoding))
+TAO_CodecFactory::create_codec (const IOP::Encoding & enc)
{
return this->create_codec_i (enc.major_version,
enc.minor_version,
@@ -89,8 +83,6 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
TAO_Codeset_Translator_Base * char_trans,
TAO_Codeset_Translator_Base * wchar_trans
)
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::CodecFactory::UnknownEncoding))
{
// @todo: Ideally we should have some sort of CodecFactory
// registry to make it possible to add factories
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index 1aa638deb0f..2a871e4e895 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -53,16 +53,11 @@ public:
/// Create a Coder/Decoder for the given type of encoding.
virtual IOP::Codec_ptr create_codec (const IOP::Encoding & enc
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::CodecFactory::UnknownEncoding));
+ );
/// Create a Coder/Decoder for the given type of encoding and codesets.
virtual IOP::Codec_ptr create_codec_with_codesets (const IOP::Encoding_1_2 & enc
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::CodecFactory::UnknownEncoding,
- IOP::CodecFactory::UnsupportedCodeset));
+ );
private:
/// Prevent copying through the copy constructor and the assignment
@@ -75,9 +70,7 @@ private:
IOP::EncodingFormat encoding_format,
TAO_Codeset_Translator_Base * char_trans,
TAO_Codeset_Translator_Base * wchar_trans
- )
- ACE_THROW_SPEC ((CORBA::SystemException,
- IOP::CodecFactory::UnknownEncoding));
+ );
private:
/// Pointer to the ORB Core.
View Lorry Controller Status