diff options
Diffstat (limited to 'TAO/tao')
27 files changed, 517 insertions, 216 deletions
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp index 0b6eef1cf32..559bcf730a1 100644 --- a/TAO/tao/BoundsC.cpp +++ b/TAO/tao/BoundsC.cpp @@ -41,7 +41,8 @@ // Default constructor. CORBA::Bounds::Bounds (void) - : CORBA_UserException ("IDL:omg.org/CORBA/Bounds:1.0") + : CORBA_UserException ("IDL:omg.org/CORBA/Bounds:1.0", + "Bounds") { } @@ -52,7 +53,8 @@ CORBA::Bounds::~Bounds (void) // Copy constructor. CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException (_tao_excp._rep_id (), + _tao_excp._name ()) { } @@ -73,7 +75,7 @@ void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer) CORBA::Bounds * CORBA::Bounds::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/Bounds:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (Bounds *, exc); } diff --git a/TAO/tao/BoundsC.i b/TAO/tao/BoundsC.i index 85b84da1e7b..f9bccb90aa5 100644 --- a/TAO/tao/BoundsC.i +++ b/TAO/tao/BoundsC.i @@ -26,7 +26,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::Bounds &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp index 0201005610e..72c7de73bbb 100644 --- a/TAO/tao/ClientRequestInfo_i.cpp +++ b/TAO/tao/ClientRequestInfo_i.cpp @@ -154,7 +154,7 @@ TAO_ClientRequestInfo_i::received_exception_id ( 0); } - return CORBA::string_dup (this->caught_exception_->_id ()); + return CORBA::string_dup (this->caught_exception_->_rep_id ()); } IOP::TaggedComponent * diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp index 5d771f6daf7..da91919ac68 100644 --- a/TAO/tao/DynamicAny/DynamicAnyC.cpp +++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp @@ -342,7 +342,10 @@ const char* DynamicAny::DynAny::_interface_repository_id (void) const // Default constructor. DynamicAny::DynAny::InvalidValue::InvalidValue (void) - : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0") + : CORBA_UserException ( + "IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", + "InvalidValue" + ) { } @@ -353,7 +356,10 @@ DynamicAny::DynAny::InvalidValue::~InvalidValue (void) // Copy constructor. DynamicAny::DynAny::InvalidValue::InvalidValue (const ::DynamicAny::DynAny::InvalidValue &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -368,7 +374,7 @@ DynamicAny::DynAny::InvalidValue::operator= (const ::DynamicAny::DynAny::Invalid DynamicAny::DynAny::InvalidValue * DynamicAny::DynAny::InvalidValue::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/InvalidValue:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InvalidValue *, exc); } @@ -420,7 +426,10 @@ void DynamicAny::DynAny::InvalidValue::_tao_decode ( // Default constructor. DynamicAny::DynAny::TypeMismatch::TypeMismatch (void) - : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0") + : CORBA_UserException ( + "IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", + "TypeMismatch" + ) { } @@ -431,7 +440,10 @@ DynamicAny::DynAny::TypeMismatch::~TypeMismatch (void) // Copy constructor. DynamicAny::DynAny::TypeMismatch::TypeMismatch (const ::DynamicAny::DynAny::TypeMismatch &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -446,7 +458,7 @@ DynamicAny::DynAny::TypeMismatch::operator= (const ::DynamicAny::DynAny::TypeMis DynamicAny::DynAny::TypeMismatch * DynamicAny::DynAny::TypeMismatch::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAny/TypeMismatch:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (TypeMismatch *, exc); } @@ -3653,7 +3665,10 @@ const char* DynamicAny::DynAnyFactory::_interface_repository_id (void) const // Default constructor. DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (void) - : CORBA_UserException ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0") + : CORBA_UserException ( + "IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", + "InconsistentTypeCode" + ) { } @@ -3664,7 +3679,10 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::~InconsistentTypeCode (void) // Copy constructor. DynamicAny::DynAnyFactory::InconsistentTypeCode::InconsistentTypeCode (const ::DynamicAny::DynAnyFactory::InconsistentTypeCode &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -3679,7 +3697,7 @@ DynamicAny::DynAnyFactory::InconsistentTypeCode::operator= (const ::DynamicAny:: DynamicAny::DynAnyFactory::InconsistentTypeCode * DynamicAny::DynAnyFactory::InconsistentTypeCode::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/DynamicAny/DynAnyFactory/InconsistentTypeCode:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InconsistentTypeCode *, exc); } diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp index 92e560b019a..f313206f320 100644 --- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp +++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp @@ -6,13 +6,15 @@ ACE_RCSID(DynamicInterface, Unknown_User_Exception, "$Id$") CORBA_UnknownUserException::CORBA_UnknownUserException (void) - : CORBA_UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0"), + : CORBA_UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0", + "UnknownUserException"), exception_ (0) { } CORBA_UnknownUserException::CORBA_UnknownUserException (CORBA_Any &ex) - : CORBA_UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0") + : CORBA_UserException ("IDL:omg.org/CORBA/UnknownUserException:1.0", + "UnknownUserException") { ACE_NEW (this->exception_, CORBA_Any (ex)); @@ -21,7 +23,8 @@ CORBA_UnknownUserException::CORBA_UnknownUserException (CORBA_Any &ex) CORBA_UnknownUserException::CORBA_UnknownUserException ( const CORBA_UnknownUserException& e ) - : CORBA_UserException (e._id ()) + : CORBA_UserException (e._rep_id (), + e._name ()) { ACE_NEW (this->exception_, CORBA_Any (*e.exception_)); diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp index 27d15b5fbca..1b94053e5ea 100644 --- a/TAO/tao/Environment.cpp +++ b/TAO/tao/Environment.cpp @@ -147,7 +147,7 @@ CORBA::Environment::exception_type (void) const // are system exceptions ... except for a couple that are related to // TypeCodes. - const char *id = this->exception_->_id (); + const char *id = this->exception_->_rep_id (); if ((ACE_OS::strncmp (id, sysex_prefix, @@ -166,7 +166,7 @@ CORBA_Environment::exception_id (void) const if (this->exception_ == 0) return 0; - return this->exception_->_id (); + return this->exception_->_rep_id (); } // Diagnostic utility routine: describe the exception onto the @@ -178,7 +178,7 @@ CORBA::Environment::print_exception (const char *info, { if (this->exception_) { - const char *id = this->exception_->_id (); + const char *id = this->exception_->_rep_id (); ACE_DEBUG ((LM_ERROR, ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"), diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index 4f50cd2cb56..b6dc365d14e 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -41,49 +41,71 @@ extern CORBA::TypeCode_ptr TC_completion_status; // **************************************************************** -CORBA_Exception::CORBA_Exception (const char *repository_id) - : id_ (CORBA::string_dup (repository_id)) +CORBA_Exception::CORBA_Exception (const char *repository_id, + const char *local_name) + : id_ (CORBA::string_dup (repository_id)), + name_ ( CORBA::string_dup (local_name)) { - ACE_ASSERT (this->id_ != 0); + ACE_ASSERT (this->id_ != 0 && this->name_ != 0); } CORBA_Exception::CORBA_Exception (const CORBA_Exception &src) - : id_ (CORBA::string_dup (src.id_)) + : id_ (CORBA::string_dup (src.id_)), + name_ (CORBA::string_dup (src.name_)) { - ACE_ASSERT (this->id_ != 0); + ACE_ASSERT (this->id_ != 0 && this->name_ != 0); } // NOTE: It's this code, not anything defined in a subclass, which is // responsible for releasing any storage owned by the exception. It -// can do this because it's got the typecode. +// can do this because it's got the local name and the id. CORBA_Exception::CORBA_Exception (void) - : id_ (0) + : id_ (0), + name_ (0) { } CORBA_Exception::~CORBA_Exception (void) { CORBA::string_free (this->id_); + CORBA::string_free (this->name_); } CORBA_Exception & CORBA_Exception::operator= (const CORBA_Exception &src) { if (this->id_) - CORBA::string_free (this->id_); + { + CORBA::string_free (this->id_); + } + this->id_ = CORBA::string_dup (src.id_); ACE_ASSERT (this->id_ != 0); + if (this->name_) + { + CORBA::string_free (this->name_); + } + + this->name_ = CORBA::string_dup (src.name_); + ACE_ASSERT (this->name_ != 0); + return *this; } const char * -CORBA_Exception::_id (void) const +CORBA_Exception::_rep_id (void) const { return this->id_; } +const char * +CORBA_Exception::_name (void) const +{ + return this->name_; +} + CORBA::TypeCode_ptr CORBA_Exception::_type (void) const { @@ -133,23 +155,7 @@ CORBA_Exception::_tao_any_destructor (void *x) ostream& operator<< (ostream &os, const CORBA_Exception &e) { - const char *p = 0; - - CORBA::TypeCode_ptr tc = e._type (); - - if (tc != CORBA::TypeCode::_nil ()) - { - p = tc->name (); - } - - if (p != 0 && *p != '\0') - { - os << p << " (" << e._id () << ')'; - } - else - { - os << e._id (); - } + os << e._name () << " (" << e._rep_id () << ')'; return os; } @@ -162,8 +168,10 @@ CORBA_UserException::CORBA_UserException (void) { } -CORBA_UserException::CORBA_UserException (const char *repository_id) - : CORBA_Exception (repository_id) +CORBA_UserException::CORBA_UserException (const char *repository_id, + const char *local_name) + : CORBA_Exception (repository_id, + local_name) { } @@ -190,8 +198,11 @@ CORBA_UserException* CORBA_UserException::_downcast (CORBA_Exception* exception) { if (exception->_is_a ("IDL:omg.org/CORBA/UserException:1.0")) - return ACE_dynamic_cast (CORBA_UserException *, - exception); + { + return ACE_dynamic_cast (CORBA_UserException *, + exception); + } + return 0; } @@ -202,7 +213,7 @@ CORBA_UserException::_info (void) const // within it ... ACE_CString user_exception_info = "user exception, ID '"; - user_exception_info += this->_id (); + user_exception_info += this->_rep_id (); user_exception_info += "'"; return user_exception_info; } @@ -221,9 +232,11 @@ CORBA_SystemException::CORBA_SystemException (void) } CORBA_SystemException::CORBA_SystemException (const char *repository_id, + const char *local_name, CORBA::ULong code, CORBA::CompletionStatus completed) - : CORBA_Exception (repository_id), + : CORBA_Exception (repository_id, + local_name), minor_ (code), completed_ (completed) { @@ -263,8 +276,11 @@ CORBA_SystemException* CORBA_SystemException::_downcast (CORBA_Exception* exception) { if (exception->_is_a ("IDL:omg.org/CORBA/SystemException:1.0")) - return ACE_dynamic_cast (CORBA_SystemException *, - exception); + { + return ACE_dynamic_cast (CORBA_SystemException *, + exception); + } + return 0; } @@ -272,10 +288,13 @@ void CORBA_SystemException::_tao_encode (TAO_OutputCDR &cdr ACE_ENV_ARG_DECL) const { - if (cdr.write_string (this->_id ()) + if (cdr.write_string (this->_rep_id ()) && cdr.write_ulong (this->minor ()) && cdr.write_ulong (this->completed ())) - return; + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } @@ -294,6 +313,7 @@ CORBA_SystemException::_tao_decode (TAO_InputCDR &cdr this->completed_ = CORBA::CompletionStatus (tmp); return; } + ACE_THROW (CORBA::MARSHAL ()); } @@ -386,7 +406,7 @@ CORBA_SystemException::_info (void) const // exception value so it can be queried. ACE_CString info = "system exception, ID '"; - info += this->_id (); + info += this->_rep_id (); info += "'\n"; CORBA::ULong VMCID = @@ -1046,7 +1066,7 @@ TAO_Exceptions::init (ACE_ENV_SINGLE_ARG_DECL) #undef TAO_SYSTEM_EXCEPTION TAO_Exceptions::make_unknown_user_typecode (CORBA::_tc_UnknownUserException - ACE_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA_SystemException * @@ -1116,6 +1136,7 @@ STANDARD_EXCEPTION_LIST #define TAO_SYSTEM_EXCEPTION(name) \ CORBA_##name :: CORBA_##name (void) \ : CORBA_SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ + #name, \ TAO_DEFAULT_MINOR_CODE, \ CORBA::COMPLETED_NO) \ { \ diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 4649d70b29c..a72219a7101 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -72,7 +72,10 @@ public: // = These are TAO-specific extensions. /// Return the repository ID of the Exception. - const char *_id (void) const; + const char *_rep_id (void) const; + + /// Return the name of the Exception. + const char *_name (void) const; /// Will be overridden in the concrete derived classes. virtual CORBA::TypeCode_ptr _type (void) const; @@ -81,7 +84,8 @@ public: virtual int _is_a (const char* repository_id) const; /// Constructor from a respository id. - CORBA_Exception (const char* repository_id); + CORBA_Exception (const char *repository_id, + const char *local_name); /// Print the exception <ex> to output determined by <f>. This /// function is not CORBA compliant. @@ -130,8 +134,9 @@ protected: // Default constructor is protected. private: - /// Storage of our repository id. + /// Storage of our repository id and local name. char *id_; + char *name_; }; #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -168,7 +173,8 @@ public: // = TAO specific extension. /// Constructor from a repository id. - CORBA_UserException (const char* repository_id); + CORBA_UserException (const char *repository_id, + const char *local_name); virtual int _is_a (const char *interface_id) const; @@ -253,14 +259,16 @@ protected: /// Constructor using a repository id. CORBA_SystemException (const char *repository_id, + const char *local_name, CORBA::ULong code, CORBA::CompletionStatus completed); /// Return the exception description associated with the given OMG /// minor code. static const char *_tao_get_omg_exception_description ( - const CORBA::SystemException &exc, - CORBA::ULong minor_code); + const CORBA::SystemException &exc, + CORBA::ULong minor_code + ); private: /// Minor code. @@ -282,7 +290,10 @@ public: \ CORBA_ ## name (void); \ CORBA_ ## name (CORBA::ULong code, \ CORBA::CompletionStatus completed) \ - : CORBA_SystemException ("IDL:omg.org/CORBA/" #name ":1.0", code, completed) \ + : CORBA_SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ + #name, \ + code, \ + completed) \ { } \ static CORBA_##name * _downcast (CORBA_Exception* exception); \ virtual int _is_a (const char* type_id) const; \ @@ -371,7 +382,8 @@ public: /// Create a CORBA::SystemException given the interface repository ID. static CORBA_SystemException *create_system_exception ( const char *id - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS + ); /** diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp index 3a8d2632cd8..7ddabe6bed5 100644 --- a/TAO/tao/IOPC.cpp +++ b/TAO/tao/IOPC.cpp @@ -1899,7 +1899,8 @@ const char* IOP::Codec::_interface_repository_id (void) const // Default constructor. IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void) - : CORBA_UserException ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0") + : CORBA_UserException ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", + "InvalidTypeForEncoding") { } @@ -1910,7 +1911,8 @@ IOP::Codec::InvalidTypeForEncoding::~InvalidTypeForEncoding (void) // Copy constructor. IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (const ::IOP::Codec::InvalidTypeForEncoding &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException (_tao_excp._rep_id (), + _tao_excp._name ()) { } @@ -1931,7 +1933,7 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_po IOP::Codec::InvalidTypeForEncoding * IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InvalidTypeForEncoding *, exc); } @@ -2028,7 +2030,8 @@ CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const // Default constructor. IOP::Codec::FormatMismatch::FormatMismatch (void) - : CORBA_UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0") + : CORBA_UserException ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", + "FormatMismatch") { } @@ -2039,7 +2042,8 @@ IOP::Codec::FormatMismatch::~FormatMismatch (void) // Copy constructor. IOP::Codec::FormatMismatch::FormatMismatch (const ::IOP::Codec::FormatMismatch &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException (_tao_excp._rep_id (), + _tao_excp._name ()) { } @@ -2060,7 +2064,7 @@ void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer) IOP::Codec::FormatMismatch * IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (FormatMismatch *, exc); } @@ -2153,7 +2157,8 @@ CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const // Default constructor. IOP::Codec::TypeMismatch::TypeMismatch (void) - : CORBA_UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0") + : CORBA_UserException ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", + "TypeMismatch") { } @@ -2164,7 +2169,8 @@ IOP::Codec::TypeMismatch::~TypeMismatch (void) // Copy constructor. IOP::Codec::TypeMismatch::TypeMismatch (const ::IOP::Codec::TypeMismatch &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException (_tao_excp._rep_id (), + _tao_excp._name ()) { } @@ -2185,7 +2191,7 @@ void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer) IOP::Codec::TypeMismatch * IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (TypeMismatch *, exc); } @@ -2732,7 +2738,8 @@ const char* IOP::CodecFactory::_interface_repository_id (void) const // Default constructor. IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void) - : CORBA_UserException ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0") + : CORBA_UserException ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", + "UnknownEncoding") { } @@ -2743,7 +2750,8 @@ IOP::CodecFactory::UnknownEncoding::~UnknownEncoding (void) // Copy constructor. IOP::CodecFactory::UnknownEncoding::UnknownEncoding (const ::IOP::CodecFactory::UnknownEncoding &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException (_tao_excp._rep_id (), + _tao_excp._name ()) { } @@ -2764,7 +2772,7 @@ void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_po IOP::CodecFactory::UnknownEncoding * IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (UnknownEncoding *, exc); } diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp index a49cc3789cd..943dcaf54c3 100644 --- a/TAO/tao/IORManipulation/IORC.cpp +++ b/TAO/tao/IORManipulation/IORC.cpp @@ -41,7 +41,10 @@ // Default constructor. TAO_IOP::EmptyProfileList::EmptyProfileList (void) - : CORBA_UserException ("IDL:TAO_IOP/EmptyProfileList:1.0") + : CORBA_UserException ( + "IDL:TAO_IOP/EmptyProfileList:1.0", + "EmptyProfileList" + ) { } @@ -52,7 +55,10 @@ TAO_IOP::EmptyProfileList::~EmptyProfileList (void) // Copy constructor. TAO_IOP::EmptyProfileList::EmptyProfileList (const ::TAO_IOP::EmptyProfileList &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -73,7 +79,7 @@ void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer) TAO_IOP::EmptyProfileList * TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (EmptyProfileList *, exc); } @@ -177,7 +183,10 @@ CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const // Default constructor. TAO_IOP::NotFound::NotFound (void) - : CORBA_UserException ("IDL:TAO_IOP/NotFound:1.0") + : CORBA_UserException ( + "IDL:TAO_IOP/NotFound:1.0", + "NotFound" + ) { } @@ -188,7 +197,10 @@ TAO_IOP::NotFound::~NotFound (void) // Copy constructor. TAO_IOP::NotFound::NotFound (const ::TAO_IOP::NotFound &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -209,7 +221,7 @@ void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer) TAO_IOP::NotFound * TAO_IOP::NotFound::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (NotFound *, exc); } @@ -309,7 +321,10 @@ CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const // Default constructor. TAO_IOP::Duplicate::Duplicate (void) - : CORBA_UserException ("IDL:TAO_IOP/Duplicate:1.0") + : CORBA_UserException ( + "IDL:TAO_IOP/Duplicate:1.0", + "Duplicate" + ) { } @@ -320,7 +335,10 @@ TAO_IOP::Duplicate::~Duplicate (void) // Copy constructor. TAO_IOP::Duplicate::Duplicate (const ::TAO_IOP::Duplicate &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -341,7 +359,7 @@ void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer) TAO_IOP::Duplicate * TAO_IOP::Duplicate::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (Duplicate *, exc); } @@ -441,7 +459,10 @@ CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const // Default constructor. TAO_IOP::Invalid_IOR::Invalid_IOR (void) - : CORBA_UserException ("IDL:TAO_IOP/Invalid_IOR:1.0") + : CORBA_UserException ( + "IDL:TAO_IOP/Invalid_IOR:1.0", + "Invalid_IOR" + ) { } @@ -452,7 +473,10 @@ TAO_IOP::Invalid_IOR::~Invalid_IOR (void) // Copy constructor. TAO_IOP::Invalid_IOR::Invalid_IOR (const ::TAO_IOP::Invalid_IOR &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -473,7 +497,7 @@ void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *_tao_void_pointer) TAO_IOP::Invalid_IOR * TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (Invalid_IOR *, exc); } @@ -573,7 +597,10 @@ CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const // Default constructor. TAO_IOP::MultiProfileList::MultiProfileList (void) - : CORBA_UserException ("IDL:TAO_IOP/MultiProfileList:1.0") + : CORBA_UserException ( + "IDL:TAO_IOP/MultiProfileList:1.0", + "MultiProfileList" + ) { } @@ -584,7 +611,10 @@ TAO_IOP::MultiProfileList::~MultiProfileList (void) // Copy constructor. TAO_IOP::MultiProfileList::MultiProfileList (const ::TAO_IOP::MultiProfileList &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -605,7 +635,7 @@ void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer) TAO_IOP::MultiProfileList * TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (MultiProfileList *, exc); } diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.i index c544b793ca9..a87fece232f 100644 --- a/TAO/tao/IORManipulation/IORC.i +++ b/TAO/tao/IORManipulation/IORC.i @@ -430,7 +430,7 @@ TAO_IOP::TAO_IOR_Manipulation::IORList_out::operator[] (CORBA::ULong index) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::EmptyProfileList &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; @@ -444,7 +444,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::EmptyProfileList&) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::NotFound &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; @@ -458,7 +458,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::NotFound&) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Duplicate &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; @@ -472,7 +472,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::Duplicate&) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::Invalid_IOR &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; @@ -486,7 +486,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,TAO_IOP::Invalid_IOR&) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const TAO_IOP::MultiProfileList &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp index c2f25f49be8..6b84ca74907 100644 --- a/TAO/tao/IORTable/IORTableC.cpp +++ b/TAO/tao/IORTable/IORTableC.cpp @@ -41,7 +41,10 @@ // Default constructor. IORTable::AlreadyBound::AlreadyBound (void) - : CORBA_UserException ("IDL:IORTable/AlreadyBound:1.0") + : CORBA_UserException ( + "IDL:IORTable/AlreadyBound:1.0", + "AlreadyBound" + ) { } @@ -52,7 +55,10 @@ IORTable::AlreadyBound::~AlreadyBound (void) // Copy constructor. IORTable::AlreadyBound::AlreadyBound (const ::IORTable::AlreadyBound &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -73,7 +79,7 @@ void IORTable::AlreadyBound::_tao_any_destructor (void *_tao_void_pointer) IORTable::AlreadyBound * IORTable::AlreadyBound::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (AlreadyBound *, exc); } @@ -135,7 +141,10 @@ void IORTable::AlreadyBound::_tao_decode ( // Default constructor. IORTable::NotFound::NotFound (void) - : CORBA_UserException ("IDL:IORTable/NotFound:1.0") + : CORBA_UserException ( + "IDL:IORTable/NotFound:1.0", + "NotFound" + ) { } @@ -146,7 +155,10 @@ IORTable::NotFound::~NotFound (void) // Copy constructor. IORTable::NotFound::NotFound (const ::IORTable::NotFound &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -167,7 +179,7 @@ void IORTable::NotFound::_tao_any_destructor (void *_tao_void_pointer) IORTable::NotFound * IORTable::NotFound::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (NotFound *, exc); } diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.i index 2de74162f1b..a87e7d21564 100644 --- a/TAO/tao/IORTable/IORTableC.i +++ b/TAO/tao/IORTable/IORTableC.i @@ -44,7 +44,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::AlreadyBound &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; @@ -58,7 +58,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,IORTable::AlreadyBound&) ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IORTable::NotFound &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp index 106bc2961e6..96391e5665d 100644 --- a/TAO/tao/ORB.cpp +++ b/TAO/tao/ORB.cpp @@ -82,7 +82,8 @@ int CORBA_ORB::orb_init_count_ = 0; // **************************************************************** CORBA::ORB::InvalidName::InvalidName (void) - : CORBA_UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0") + : CORBA_UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", + "InvalidName") { } @@ -93,7 +94,8 @@ CORBA::ORB::InvalidName::~InvalidName (void) // Copy constructor. CORBA::ORB::InvalidName::InvalidName (const ::CORBA::ORB::InvalidName &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException (_tao_excp._rep_id (), + _tao_excp._name ()) { } @@ -108,7 +110,7 @@ CORBA::ORB::InvalidName::operator= (const ::CORBA::ORB::InvalidName &_tao_excp) CORBA::ORB::InvalidName * CORBA::ORB::InvalidName::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/ORB/InvalidName:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InvalidName *, exc); } diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp index 65fa77af286..1bc7e2f2f61 100644 --- a/TAO/tao/PolicyC.cpp +++ b/TAO/tao/PolicyC.cpp @@ -97,7 +97,8 @@ TAO_NAMESPACE_DEFINE (const CORBA::Short, UNSUPPORTED_POLICY_VALUE, 4) TAO_NAMESPACE_END // Default constructor. CORBA::PolicyError::PolicyError (void) - : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0") + : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0", + "PolicyError") { } @@ -108,7 +109,10 @@ CORBA::PolicyError::~PolicyError (void) // Copy constructor. CORBA::PolicyError::PolicyError (const ::CORBA::PolicyError &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { this->reason = _tao_excp.reason; } @@ -131,7 +135,7 @@ void CORBA::PolicyError::_tao_any_destructor (void *_tao_void_pointer) CORBA::PolicyError * CORBA::PolicyError::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PolicyError:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (PolicyError *, exc); } @@ -194,7 +198,8 @@ void CORBA::PolicyError::_tao_decode ( CORBA::PolicyError::PolicyError ( CORBA::PolicyErrorCode _tao_reason ) - : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0") + : CORBA_UserException ("IDL:omg.org/CORBA/PolicyError:1.0", + "PolicyError") { this->reason = _tao_reason; } @@ -362,7 +367,10 @@ void CORBA::InvalidPolicies::_tao_seq_UShort::_tao_any_destructor (void *_tao_vo // Default constructor. CORBA::InvalidPolicies::InvalidPolicies (void) - : CORBA_UserException ("IDL:omg.org/CORBA/InvalidPolicies:1.0") + : CORBA_UserException ( + "IDL:omg.org/CORBA/InvalidPolicies:1.0", + "InvalidPolicies" + ) { } @@ -373,7 +381,10 @@ CORBA::InvalidPolicies::~InvalidPolicies (void) // Copy constructor. CORBA::InvalidPolicies::InvalidPolicies (const ::CORBA::InvalidPolicies &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { this->indices = _tao_excp.indices; } @@ -396,7 +407,7 @@ void CORBA::InvalidPolicies::_tao_any_destructor (void *_tao_void_pointer) CORBA::InvalidPolicies * CORBA::InvalidPolicies::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/InvalidPolicies:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InvalidPolicies *, exc); } @@ -459,7 +470,10 @@ void CORBA::InvalidPolicies::_tao_decode ( CORBA::InvalidPolicies::InvalidPolicies ( const CORBA::InvalidPolicies::_tao_seq_UShort & _tao_indices ) - : CORBA_UserException ("IDL:omg.org/CORBA/InvalidPolicies:1.0") + : CORBA_UserException ( + "IDL:omg.org/CORBA/InvalidPolicies:1.0", + "InvalidPolicies" + ) { this->indices = _tao_indices; } diff --git a/TAO/tao/PolicyC.i b/TAO/tao/PolicyC.i index d08fdf8d44f..5ee64975e3f 100644 --- a/TAO/tao/PolicyC.i +++ b/TAO/tao/PolicyC.i @@ -238,7 +238,7 @@ CORBA::Policy::Policy ( ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::PolicyError &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) { // now marshal the members (if any) if ( @@ -281,7 +281,7 @@ CORBA::Boolean TAO_Export operator>> ( ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::InvalidPolicies &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) { // now marshal the members (if any) if ( diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp index 7030688d7a5..c289b24a51d 100644 --- a/TAO/tao/PollableC.cpp +++ b/TAO/tao/PollableC.cpp @@ -958,7 +958,10 @@ const char* CORBA::PollableSet::_interface_repository_id (void) const // Default constructor. CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void) - : CORBA_UserException ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0") + : CORBA_UserException ( + "IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", + "NoPossiblePollable" + ) { } @@ -969,7 +972,10 @@ CORBA::PollableSet::NoPossiblePollable::~NoPossiblePollable (void) // Copy constructor. CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (const ::CORBA::PollableSet::NoPossiblePollable &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -984,7 +990,7 @@ CORBA::PollableSet::NoPossiblePollable::operator= (const ::CORBA::PollableSet::N CORBA::PollableSet::NoPossiblePollable * CORBA::PollableSet::NoPossiblePollable::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/NoPossiblePollable:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (NoPossiblePollable *, exc); } @@ -1036,7 +1042,10 @@ void CORBA::PollableSet::NoPossiblePollable::_tao_decode ( // Default constructor. CORBA::PollableSet::UnknownPollable::UnknownPollable (void) - : CORBA_UserException ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0") + : CORBA_UserException ( + "IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", + "UnknownPollable" + ) { } @@ -1047,7 +1056,10 @@ CORBA::PollableSet::UnknownPollable::~UnknownPollable (void) // Copy constructor. CORBA::PollableSet::UnknownPollable::UnknownPollable (const ::CORBA::PollableSet::UnknownPollable &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -1062,7 +1074,7 @@ CORBA::PollableSet::UnknownPollable::operator= (const ::CORBA::PollableSet::Unkn CORBA::PollableSet::UnknownPollable * CORBA::PollableSet::UnknownPollable::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/PollableSet/UnknownPollable:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (UnknownPollable *, exc); } diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 8da105c782d..cb7649721d5 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -342,7 +342,10 @@ const char* PortableInterceptor::Interceptor::_interface_repository_id (void) co // Default constructor. PortableInterceptor::ForwardRequest::ForwardRequest (void) - : CORBA_UserException ("IDL:PortableInterceptor/ForwardRequest:1.0") + : CORBA_UserException ( + "IDL:PortableInterceptor/ForwardRequest:1.0", + "ForwardRequest" + ) { } @@ -353,7 +356,10 @@ PortableInterceptor::ForwardRequest::~ForwardRequest (void) // Copy constructor. PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ()); this->permanent = _tao_excp.permanent; @@ -378,7 +384,7 @@ void PortableInterceptor::ForwardRequest::_tao_any_destructor (void *_tao_void_p PortableInterceptor::ForwardRequest * PortableInterceptor::ForwardRequest::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ForwardRequest:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ForwardRequest:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (ForwardRequest *, exc); } @@ -442,7 +448,10 @@ PortableInterceptor::ForwardRequest::ForwardRequest ( const CORBA::Object_ptr _tao_forward, CORBA::Boolean _tao_permanent ) - : CORBA_UserException ("IDL:PortableInterceptor/ForwardRequest:1.0") + : CORBA_UserException ( + "IDL:PortableInterceptor/ForwardRequest:1.0", + "ForwardRequest" + ) { this->forward = CORBA::Object::_duplicate (_tao_forward); this->permanent = _tao_permanent; @@ -610,7 +619,10 @@ TAO_NAMESPACE_END // Default constructor. PortableInterceptor::InvalidSlot::InvalidSlot (void) - : CORBA_UserException ("IDL:PortableInterceptor/InvalidSlot:1.0") + : CORBA_UserException ( + "IDL:PortableInterceptor/InvalidSlot:1.0", + "InvalidSlot" + ) { } @@ -621,7 +633,10 @@ PortableInterceptor::InvalidSlot::~InvalidSlot (void) // Copy constructor. PortableInterceptor::InvalidSlot::InvalidSlot (const ::PortableInterceptor::InvalidSlot &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -642,7 +657,7 @@ void PortableInterceptor::InvalidSlot::_tao_any_destructor (void *_tao_void_poin PortableInterceptor::InvalidSlot * PortableInterceptor::InvalidSlot::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableInterceptor/InvalidSlot:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:PortableInterceptor/InvalidSlot:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InvalidSlot *, exc); } @@ -3827,7 +3842,10 @@ const char* PortableInterceptor::ORBInitInfo::_interface_repository_id (void) co // Default constructor. PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (void) - : CORBA_UserException ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0") + : CORBA_UserException ( + "IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0", + "DuplicateName" + ) { } @@ -3838,7 +3856,10 @@ PortableInterceptor::ORBInitInfo::DuplicateName::~DuplicateName (void) // Copy constructor. PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName (const ::PortableInterceptor::ORBInitInfo::DuplicateName &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { this->name = CORBA::string_dup (_tao_excp.name.in ()); } @@ -3855,7 +3876,7 @@ PortableInterceptor::ORBInitInfo::DuplicateName::operator= (const ::PortableInte PortableInterceptor::ORBInitInfo::DuplicateName * PortableInterceptor::ORBInitInfo::DuplicateName::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (DuplicateName *, exc); } @@ -3908,14 +3929,20 @@ void PortableInterceptor::ORBInitInfo::DuplicateName::_tao_decode ( PortableInterceptor::ORBInitInfo::DuplicateName::DuplicateName ( const char * _tao_name ) - : CORBA_UserException ("IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0") + : CORBA_UserException ( + "IDL:PortableInterceptor/ORBInitInfo/DuplicateName:1.0", + "DuplicateName" + ) { this->name = CORBA::string_dup (_tao_name); } // Default constructor. PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (void) - : CORBA_UserException ("IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0") + : CORBA_UserException ( + "IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0", + "InvalidName" + ) { } @@ -3926,7 +3953,10 @@ PortableInterceptor::ORBInitInfo::InvalidName::~InvalidName (void) // Copy constructor. PortableInterceptor::ORBInitInfo::InvalidName::InvalidName (const ::PortableInterceptor::ORBInitInfo::InvalidName &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -3941,7 +3971,7 @@ PortableInterceptor::ORBInitInfo::InvalidName::operator= (const ::PortableInterc PortableInterceptor::ORBInitInfo::InvalidName * PortableInterceptor::ORBInitInfo::InvalidName::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:PortableInterceptor/ORBInitInfo/InvalidName:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InvalidName *, exc); } diff --git a/TAO/tao/PortableInterceptorC.i b/TAO/tao/PortableInterceptorC.i index f706c559e21..0874ea77d99 100644 --- a/TAO/tao/PortableInterceptorC.i +++ b/TAO/tao/PortableInterceptorC.i @@ -122,7 +122,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableInterceptor::ForwardRequest &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) { // now marshal the members (if any) if ( @@ -152,7 +152,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableInterceptor::Fo ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableInterceptor::InvalidSlot &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp index 9745b20a8e2..bd55dd836e9 100644 --- a/TAO/tao/PortableServer/ImplRepoC.cpp +++ b/TAO/tao/PortableServer/ImplRepoC.cpp @@ -4983,7 +4983,10 @@ const char* ImplementationRepository::Administration::_interface_repository_id ( // Default constructor. ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (void) - : CORBA_UserException ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0") + : CORBA_UserException ( + "IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", + "AlreadyRegistered" + ) { } @@ -4994,7 +4997,10 @@ ImplementationRepository::Administration::AlreadyRegistered::~AlreadyRegistered // Copy constructor. ImplementationRepository::Administration::AlreadyRegistered::AlreadyRegistered (const ::ImplementationRepository::Administration::AlreadyRegistered &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5015,7 +5021,7 @@ void ImplementationRepository::Administration::AlreadyRegistered::_tao_any_destr ImplementationRepository::Administration::AlreadyRegistered * ImplementationRepository::Administration::AlreadyRegistered::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (AlreadyRegistered *, exc); } @@ -5125,7 +5131,10 @@ CORBA::TypeCode_ptr ImplementationRepository::Administration::AlreadyRegistered: // Default constructor. ImplementationRepository::Administration::CannotActivate::CannotActivate (void) - : CORBA_UserException ("IDL:ImplementationRepository/Administration/CannotActivate:1.0") + : CORBA_UserException ( + "IDL:ImplementationRepository/Administration/CannotActivate:1.0", + "CannotActivate" + ) { } @@ -5136,7 +5145,10 @@ ImplementationRepository::Administration::CannotActivate::~CannotActivate (void) // Copy constructor. ImplementationRepository::Administration::CannotActivate::CannotActivate (const ::ImplementationRepository::Administration::CannotActivate &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { this->reason = CORBA::string_dup (_tao_excp.reason.in ()); } @@ -5159,7 +5171,7 @@ void ImplementationRepository::Administration::CannotActivate::_tao_any_destruct ImplementationRepository::Administration::CannotActivate * ImplementationRepository::Administration::CannotActivate::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (CannotActivate *, exc); } @@ -5222,7 +5234,10 @@ void ImplementationRepository::Administration::CannotActivate::_tao_decode ( ImplementationRepository::Administration::CannotActivate::CannotActivate ( const char * _tao_reason ) - : CORBA_UserException ("IDL:ImplementationRepository/Administration/CannotActivate:1.0") + : CORBA_UserException ( + "IDL:ImplementationRepository/Administration/CannotActivate:1.0", + "CannotActivate" + ) { this->reason = CORBA::string_dup (_tao_reason); } @@ -5280,7 +5295,10 @@ CORBA::TypeCode_ptr ImplementationRepository::Administration::CannotActivate::_t // Default constructor. ImplementationRepository::Administration::NotFound::NotFound (void) - : CORBA_UserException ("IDL:ImplementationRepository/Administration/NotFound:1.0") + : CORBA_UserException ( + "IDL:ImplementationRepository/Administration/NotFound:1.0", + "NotFound" + ) { } @@ -5291,7 +5309,10 @@ ImplementationRepository::Administration::NotFound::~NotFound (void) // Copy constructor. ImplementationRepository::Administration::NotFound::NotFound (const ::ImplementationRepository::Administration::NotFound &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5312,7 +5333,7 @@ void ImplementationRepository::Administration::NotFound::_tao_any_destructor (vo ImplementationRepository::Administration::NotFound * ImplementationRepository::Administration::NotFound::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (NotFound *, exc); } diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i index 489341a9ec6..d2ceec3a705 100644 --- a/TAO/tao/PortableServer/ImplRepoC.i +++ b/TAO/tao/PortableServer/ImplRepoC.i @@ -1614,7 +1614,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> ( ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::Administration::AlreadyRegistered &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; @@ -1628,7 +1628,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &,ImplementationRepository::A ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::Administration::CannotActivate &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) { // now marshal the members (if any) if ( @@ -1656,7 +1656,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,ImplementationRepositor ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::Administration::NotFound &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 217364844c8..205005ecc13 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -297,7 +297,10 @@ TAO_NAMESPACE_END // Default constructor. PortableServer::ForwardRequest::ForwardRequest (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/ForwardRequest:1.0", + "ForwardRequest" + ) { } @@ -308,7 +311,10 @@ PortableServer::ForwardRequest::~ForwardRequest (void) // Copy constructor. PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ()); } @@ -331,7 +337,7 @@ void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointe PortableServer::ForwardRequest * PortableServer::ForwardRequest::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (ForwardRequest *, exc); } @@ -394,7 +400,10 @@ void PortableServer::ForwardRequest::_tao_decode ( PortableServer::ForwardRequest::ForwardRequest ( const CORBA::Object_ptr _tao_forward_reference ) - : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/ForwardRequest:1.0", + "ForwardRequest" + ) { this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference); } @@ -471,7 +480,10 @@ CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const // Default constructor. PortableServer::NotAGroupObject::NotAGroupObject (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/NotAGroupObject:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/NotAGroupObject:1.0", + "NotAGroupObject" + ) { } @@ -482,7 +494,10 @@ PortableServer::NotAGroupObject::~NotAGroupObject (void) // Copy constructor. PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -503,7 +518,7 @@ void PortableServer::NotAGroupObject::_tao_any_destructor (void *_tao_void_point PortableServer::NotAGroupObject * PortableServer::NotAGroupObject::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (NotAGroupObject *, exc); } @@ -3663,7 +3678,10 @@ const char* PortableServer::POAManager::_interface_repository_id (void) const // Default constructor. PortableServer::POAManager::AdapterInactive::AdapterInactive (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", + "AdapterInactive" + ) { } @@ -3674,7 +3692,10 @@ PortableServer::POAManager::AdapterInactive::~AdapterInactive (void) // Copy constructor. PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -3689,7 +3710,7 @@ PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer:: PortableServer::POAManager::AdapterInactive * PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (AdapterInactive *, exc); } @@ -5273,7 +5294,10 @@ const char* PortableServer::POA::_interface_repository_id (void) const // Default constructor. PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", + "AdapterAlreadyExists" + ) { } @@ -5284,7 +5308,10 @@ PortableServer::POA::AdapterAlreadyExists::~AdapterAlreadyExists (void) // Copy constructor. PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (const ::PortableServer::POA::AdapterAlreadyExists &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5299,7 +5326,7 @@ PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::PO PortableServer::POA::AdapterAlreadyExists * PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (AdapterAlreadyExists *, exc); } @@ -5351,7 +5378,10 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_decode ( // Default constructor. PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", + "AdapterNonExistent" + ) { } @@ -5362,7 +5392,10 @@ PortableServer::POA::AdapterNonExistent::~AdapterNonExistent (void) // Copy constructor. PortableServer::POA::AdapterNonExistent::AdapterNonExistent (const ::PortableServer::POA::AdapterNonExistent &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5377,7 +5410,7 @@ PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA: PortableServer::POA::AdapterNonExistent * PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (AdapterNonExistent *, exc); } @@ -5429,7 +5462,10 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode ( // Default constructor. PortableServer::POA::InvalidPolicy::InvalidPolicy (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", + "InvalidPolicy" + ) { } @@ -5440,7 +5476,10 @@ PortableServer::POA::InvalidPolicy::~InvalidPolicy (void) // Copy constructor. PortableServer::POA::InvalidPolicy::InvalidPolicy (const ::PortableServer::POA::InvalidPolicy &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { this->index = _tao_excp.index; } @@ -5457,7 +5496,7 @@ PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::Inva PortableServer::POA::InvalidPolicy * PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InvalidPolicy *, exc); } @@ -5510,7 +5549,10 @@ void PortableServer::POA::InvalidPolicy::_tao_decode ( PortableServer::POA::InvalidPolicy::InvalidPolicy ( CORBA::UShort _tao_index ) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", + "InvalidPolicy" + ) { this->index = _tao_index; } @@ -5519,7 +5561,10 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy ( // Default constructor. PortableServer::POA::NoServant::NoServant (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/NoServant:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/NoServant:1.0", + "NoServant" + ) { } @@ -5530,7 +5575,10 @@ PortableServer::POA::NoServant::~NoServant (void) // Copy constructor. PortableServer::POA::NoServant::NoServant (const ::PortableServer::POA::NoServant &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5545,7 +5593,7 @@ PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServan PortableServer::POA::NoServant * PortableServer::POA::NoServant::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (NoServant *, exc); } @@ -5599,7 +5647,10 @@ void PortableServer::POA::NoServant::_tao_decode ( // Default constructor. PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", + "ObjectAlreadyActive" + ) { } @@ -5610,7 +5661,10 @@ PortableServer::POA::ObjectAlreadyActive::~ObjectAlreadyActive (void) // Copy constructor. PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (const ::PortableServer::POA::ObjectAlreadyActive &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5625,7 +5679,7 @@ PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA PortableServer::POA::ObjectAlreadyActive * PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (ObjectAlreadyActive *, exc); } @@ -5677,7 +5731,10 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode ( // Default constructor. PortableServer::POA::ObjectNotActive::ObjectNotActive (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", + "ObjectNotActive" + ) { } @@ -5688,7 +5745,10 @@ PortableServer::POA::ObjectNotActive::~ObjectNotActive (void) // Copy constructor. PortableServer::POA::ObjectNotActive::ObjectNotActive (const ::PortableServer::POA::ObjectNotActive &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5703,7 +5763,7 @@ PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::Ob PortableServer::POA::ObjectNotActive * PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (ObjectNotActive *, exc); } @@ -5755,7 +5815,10 @@ void PortableServer::POA::ObjectNotActive::_tao_decode ( // Default constructor. PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", + "ServantAlreadyActive" + ) { } @@ -5766,7 +5829,10 @@ PortableServer::POA::ServantAlreadyActive::~ServantAlreadyActive (void) // Copy constructor. PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (const ::PortableServer::POA::ServantAlreadyActive &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5781,7 +5847,7 @@ PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::PO PortableServer::POA::ServantAlreadyActive * PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (ServantAlreadyActive *, exc); } @@ -5833,7 +5899,10 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode ( // Default constructor. PortableServer::POA::ServantNotActive::ServantNotActive (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", + "ServantNotActive" + ) { } @@ -5844,7 +5913,10 @@ PortableServer::POA::ServantNotActive::~ServantNotActive (void) // Copy constructor. PortableServer::POA::ServantNotActive::ServantNotActive (const ::PortableServer::POA::ServantNotActive &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5859,7 +5931,7 @@ PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::S PortableServer::POA::ServantNotActive * PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (ServantNotActive *, exc); } @@ -5911,7 +5983,10 @@ void PortableServer::POA::ServantNotActive::_tao_decode ( // Default constructor. PortableServer::POA::WrongAdapter::WrongAdapter (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", + "WrongAdapter" + ) { } @@ -5922,7 +5997,10 @@ PortableServer::POA::WrongAdapter::~WrongAdapter (void) // Copy constructor. PortableServer::POA::WrongAdapter::WrongAdapter (const ::PortableServer::POA::WrongAdapter &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5937,7 +6015,7 @@ PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::Wrong PortableServer::POA::WrongAdapter * PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (WrongAdapter *, exc); } @@ -5989,7 +6067,10 @@ void PortableServer::POA::WrongAdapter::_tao_decode ( // Default constructor. PortableServer::POA::WrongPolicy::WrongPolicy (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", + "WrongPolicy" + ) { } @@ -6000,7 +6081,10 @@ PortableServer::POA::WrongPolicy::~WrongPolicy (void) // Copy constructor. PortableServer::POA::WrongPolicy::WrongPolicy (const ::PortableServer::POA::WrongPolicy &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -6015,7 +6099,7 @@ PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongP PortableServer::POA::WrongPolicy * PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (WrongPolicy *, exc); } @@ -6380,7 +6464,10 @@ const char* PortableServer::Current::_interface_repository_id (void) const // Default constructor. PortableServer::Current::NoContext::NoContext (void) - : CORBA_UserException ("IDL:omg.org/PortableServer/Current/NoContext:1.0") + : CORBA_UserException ( + "IDL:omg.org/PortableServer/Current/NoContext:1.0", + "NoContext" + ) { } @@ -6391,7 +6478,10 @@ PortableServer::Current::NoContext::~NoContext (void) // Copy constructor. PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -6406,7 +6496,7 @@ PortableServer::Current::NoContext::operator= (const ::PortableServer::Current:: PortableServer::Current::NoContext * PortableServer::Current::NoContext::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (NoContext *, exc); } diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i index 81b49a194b4..d471a191885 100644 --- a/TAO/tao/PortableServer/PortableServerC.i +++ b/TAO/tao/PortableServer/PortableServerC.i @@ -1203,7 +1203,7 @@ CORBA::Boolean TAO_PortableServer_Export operator>> ( ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) { // now marshal the members (if any) if ( @@ -1235,7 +1235,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::Forward ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp index 982dac4f5d8..d507b3aeaa4 100644 --- a/TAO/tao/RTCORBA/RTCORBAC.cpp +++ b/TAO/tao/RTCORBA/RTCORBAC.cpp @@ -5207,7 +5207,10 @@ const char* RTCORBA::RTORB::_interface_repository_id (void) const // Default constructor. RTCORBA::RTORB::MutexNotFound::MutexNotFound (void) - : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0") + : CORBA_UserException ( + "IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", + "MutexNotFound" + ) { } @@ -5218,7 +5221,10 @@ RTCORBA::RTORB::MutexNotFound::~MutexNotFound (void) // Copy constructor. RTCORBA::RTORB::MutexNotFound::MutexNotFound (const ::RTCORBA::RTORB::MutexNotFound &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5233,7 +5239,7 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound RTCORBA::RTORB::MutexNotFound * RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (MutexNotFound *, exc); } @@ -5285,7 +5291,10 @@ void RTCORBA::RTORB::MutexNotFound::_tao_decode ( // Default constructor. RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void) - : CORBA_UserException ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0") + : CORBA_UserException ( + "IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", + "InvalidThreadpool" + ) { } @@ -5296,7 +5305,10 @@ RTCORBA::RTORB::InvalidThreadpool::~InvalidThreadpool (void) // Copy constructor. RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (const ::RTCORBA::RTORB::InvalidThreadpool &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -5311,7 +5323,7 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr RTCORBA::RTORB::InvalidThreadpool * RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (InvalidThreadpool *, exc); } diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index 508f97f2c40..e4dedca4d79 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -31,7 +31,8 @@ ACE_RCSID (tao, CORBA_TypeCode::Bounds::Bounds (void) - : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0") + : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0", + "Bounds") { } @@ -72,8 +73,11 @@ void CORBA_TypeCode::Bounds::_tao_encode ( ACE_ENV_ARG_DECL ) const { - if (cdr << this->_id ()) - return; + if (cdr << this->_rep_id ()) + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } @@ -85,7 +89,8 @@ void CORBA_TypeCode::Bounds::_tao_decode (TAO_InputCDR & // **************************************************************** CORBA_TypeCode::BadKind::BadKind (void) - : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0") + : CORBA_UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0", + "BadKind") { } @@ -119,8 +124,11 @@ void CORBA_TypeCode::BadKind::_tao_encode ( ACE_ENV_ARG_DECL ) const { - if (cdr << this->_id ()) - return; + if (cdr << this->_rep_id ()) + { + return; + } + ACE_THROW (CORBA::MARSHAL ()); } diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp index 5ee54b41718..0047bc59a12 100644 --- a/TAO/tao/WrongTransactionC.cpp +++ b/TAO/tao/WrongTransactionC.cpp @@ -43,7 +43,10 @@ // Default constructor. CORBA::WrongTransaction::WrongTransaction (void) - : CORBA_UserException ("IDL:omg.org/CORBA/WrongTransaction:1.0") + : CORBA_UserException ( + "IDL:omg.org/CORBA/WrongTransaction:1.0", + "WrongTransaction" + ) { } @@ -54,7 +57,10 @@ CORBA::WrongTransaction::~WrongTransaction (void) // Copy constructor. CORBA::WrongTransaction::WrongTransaction (const ::CORBA::WrongTransaction &_tao_excp) - : CORBA_UserException (_tao_excp._id ()) + : CORBA_UserException ( + _tao_excp._rep_id (), + _tao_excp._name () + ) { } @@ -75,7 +81,7 @@ void CORBA::WrongTransaction::_tao_any_destructor (void *_tao_void_pointer) CORBA::WrongTransaction * CORBA::WrongTransaction::_downcast (CORBA::Exception *exc) { - if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_id ())) + if (!ACE_OS::strcmp ("IDL:omg.org/CORBA/WrongTransaction:1.0", exc->_rep_id ())) { return ACE_dynamic_cast (WrongTransaction *, exc); } diff --git a/TAO/tao/WrongTransactionC.i b/TAO/tao/WrongTransactionC.i index 023f5a5cea6..84fd54d23eb 100644 --- a/TAO/tao/WrongTransactionC.i +++ b/TAO/tao/WrongTransactionC.i @@ -26,7 +26,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const CORBA::WrongTransaction &_tao_aggregate) { // first marshal the repository ID - if (strm << _tao_aggregate._id ()) + if (strm << _tao_aggregate._rep_id ()) return 1; else return 0; |