diff options
Diffstat (limited to 'TAO/tao/DynamicAny/DynArray_i.h')
| -rw-r--r-- | TAO/tao/DynamicAny/DynArray_i.h | 78 |
1 files changed, 33 insertions, 45 deletions
diff --git a/TAO/tao/DynamicAny/DynArray_i.h b/TAO/tao/DynamicAny/DynArray_i.h index f5a1a8fc15d..3f872d7aa00 100644 --- a/TAO/tao/DynamicAny/DynArray_i.h +++ b/TAO/tao/DynamicAny/DynArray_i.h @@ -34,7 +34,7 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -class TAO_DynamicAny_Export TAO_DynArray_i +class TAO_DynamicAny_Export TAO_DynArray_i : public virtual DynamicAny::DynArray, public virtual TAO_DynCommon, public virtual TAO_Local_RefCounted_Object @@ -52,37 +52,34 @@ public: ~TAO_DynArray_i (void); // Destructor. - void init (CORBA_TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV); + void init (CORBA_TypeCode_ptr tc + TAO_ENV_ARG_DECL); // Initialize using just a TypeCode. - void init (const CORBA_Any& any, - CORBA::Environment &ACE_TRY_ENV); + void init (const CORBA_Any& any + TAO_ENV_ARG_DECL); // Initialize using an Any. // = LocalObject methods static TAO_DynArray_i *_narrow ( - CORBA::Object_ptr obj, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ); + CORBA::Object_ptr obj + TAO_ENV_ARG_DECL_WITH_DEFAULTS); + virtual void *_tao_QueryInterface (ptr_arith_t type); // = Functions specific to DynArray. virtual DynamicAny::AnySeq * get_elements ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_elements ( - const DynamicAny::AnySeq & value, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const DynamicAny::AnySeq & value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -90,18 +87,16 @@ public: )); virtual DynamicAny::DynAnySeq * get_elements_as_dyn_any ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); virtual void set_elements_as_dyn_any ( - const DynamicAny::DynAnySeq & value, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const DynamicAny::DynAnySeq & value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -111,10 +106,9 @@ public: // = DynAny common functions not implemented in class TAO_DynCommon. virtual void from_any ( - const CORBA::Any & value, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + const CORBA::Any & value + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -122,34 +116,30 @@ public: )); virtual CORBA::Any * to_any ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); virtual CORBA::Boolean equal ( - DynamicAny::DynAny_ptr dyn_any, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + DynamicAny::DynAny_ptr dyn_any + TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); virtual void destroy ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException )); virtual DynamicAny::DynAny_ptr current_component ( - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment () - ) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch @@ -157,13 +147,11 @@ public: private: // Returns the type of elements contained in the array. - CORBA::TypeCode_ptr get_element_type (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA::TypeCode_ptr get_element_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Gets the length of the array from the typecode. - CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()); + CORBA::ULong get_tc_length (CORBA::TypeCode_ptr tc + TAO_ENV_ARG_DECL_WITH_DEFAULTS); // Called by both versions of init(). void init_common (void); |