diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 2b899defcbd..028e5f5571b 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -6,7 +6,7 @@ #include "tao/ORB_Core.h" #include "tao/TypeCodeFactory_Adapter.h" #include "tao/CDR.h" - +#include "tao/SystemException.h" #ifndef __ACE_INLINE__ # include "tao/AnyTypeCode/Struct_TypeCode_Static.inl" @@ -106,8 +106,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equal_i ( - CORBA::TypeCode_ptr tc - ) const + CORBA::TypeCode_ptr tc) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this @@ -135,12 +134,10 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const lhs_tc = Traits<char const *>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = - tc->member_type (i - ); + tc->member_type (i); CORBA::Boolean const equal_members = - lhs_tc->equal (rhs_tc.in () - ); + lhs_tc->equal (rhs_tc.in ()); if (!equal_members) return false; @@ -155,8 +152,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::equivalent_i ( - CORBA::TypeCode_ptr tc - ) const + CORBA::TypeCode_ptr tc) const { // Perform a structural comparison, excluding the name() and // member_name() operations. @@ -172,12 +168,10 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const lhs = Traits<char const *>::get_typecode (this->fields_[i].type); CORBA::TypeCode_var const rhs = - tc->member_type (i - ); + tc->member_type (i); CORBA::Boolean const equiv_members = - lhs->equivalent (rhs.in () - ); + lhs->equivalent (rhs.in ()); if (!equiv_members) return false; @@ -213,8 +207,7 @@ TAO::TypeCode::Struct<char const *, tc_fields[i].name = empty_name; tc_fields[i].type = Traits<char const *>::get_typecode ( - this->fields_[i].type)->get_compact_typecode ( - ); + this->fields_[i].type)->get_compact_typecode (); } } @@ -224,8 +217,7 @@ TAO::TypeCode::Struct<char const *, if (adapter == 0) { - ACE_THROW_RETURN (CORBA::INTERNAL (), - CORBA::TypeCode::_nil ()); + throw ::CORBA::INTERNAL (); } return @@ -233,8 +225,7 @@ TAO::TypeCode::Struct<char const *, this->base_attributes_.id (), "" /* empty name */, tc_fields, - this->nfields_ - ); + this->nfields_); } char const * @@ -255,8 +246,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::name_i ( - void) const + TAO::Null_RefCount_Policy>::name_i (void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -268,8 +258,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::member_count_i ( - void) const + TAO::Null_RefCount_Policy>::member_count_i (void) const { return this->nfields_; } @@ -280,13 +269,12 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_name_i ( - CORBA::ULong index - ) const + CORBA::ULong index) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. if (index >= this->nfields_) - ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0); + throw ::CORBA::TypeCode::Bounds (); return Traits<char const *>::get_string (this->fields_[index].name); } @@ -297,12 +285,10 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::member_type_i ( - CORBA::ULong index - ) const + CORBA::ULong index) const { if (index >= this->nfields_) - ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), - CORBA::TypeCode::_nil ()); + throw ::CORBA::TypeCode::Bounds (); return CORBA::TypeCode::_duplicate ( |