diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
| commit | b11770b30f8b58d20fe2d61846bfa3fc5354ee7e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/tao/DynamicAny/DynAny_i.h | |
| parent | 8fd5b8293423d91c699711bce0f3551cb8c20a69 (diff) | |
| download | ATCD-b11770b30f8b58d20fe2d61846bfa3fc5354ee7e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/tao/DynamicAny/DynAny_i.h')
| -rw-r--r-- | TAO/tao/DynamicAny/DynAny_i.h | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/TAO/tao/DynamicAny/DynAny_i.h b/TAO/tao/DynamicAny/DynAny_i.h index 97cdaf4809e..f11e447f0b6 100644 --- a/TAO/tao/DynamicAny/DynAny_i.h +++ b/TAO/tao/DynamicAny/DynAny_i.h @@ -34,7 +34,7 @@ # pragma warning (disable:4250) #endif /* _MSC_VER */ -class TAO_DynamicAny_Export TAO_DynAny_i +class TAO_DynamicAny_Export TAO_DynAny_i : public virtual DynamicAny::DynAny, public virtual TAO_DynCommon, public virtual TAO_Local_RefCounted_Object @@ -51,29 +51,27 @@ public: ~TAO_DynAny_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_DynAny_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); // = 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, @@ -81,34 +79,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 @@ -116,12 +110,12 @@ public: private: // Check if the typecode is acceptable. - void check_typecode (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV); + void check_typecode (CORBA::TypeCode_ptr tc + TAO_ENV_ARG_DECL); // Used when we are created from a typecode. - void set_to_default_value (CORBA::TypeCode_ptr tc, - CORBA::Environment &ACE_TRY_ENV); + void set_to_default_value (CORBA::TypeCode_ptr tc + TAO_ENV_ARG_DECL); // Called by both versions of init(). void init_common (void); |