diff options
Diffstat (limited to 'TAO/tao/Object.h')
| -rw-r--r-- | TAO/tao/Object.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index c1c99e1d7b1..e17ee867a90 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -52,9 +52,9 @@ public: /// No-op it is just here to simplify some templates. ACE_INLINE_FOR_GNUC static CORBA_Object_ptr _narrow (CORBA_Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); static CORBA_Object_ptr _unchecked_narrow (CORBA_Object_ptr obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void*); @@ -70,7 +70,7 @@ public: /// determine if we are of the type specified by the "logical_type_id" virtual CORBA::Boolean _is_a (const char *logical_type_id - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// The repository ID for the most derived class, this is an /// implementation method and does no remote invocations! @@ -86,17 +86,17 @@ public: #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual CORBA::Boolean _non_existent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// This method is deprecated in the CORBA 2.2 spec, we just return 0 /// every time. virtual CORBA::ImplementationDef_ptr _get_implementation ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Get info about the object from the Interface Repository. virtual CORBA_InterfaceDef_ptr _get_interface ( - TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // DII operations to create a request. @@ -111,7 +111,7 @@ public: CORBA::NamedValue_ptr result, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void _create_request (CORBA::Context_ptr ctx, const char *operation, @@ -121,7 +121,7 @@ public: CORBA::ContextList_ptr ctxtlist, CORBA::Request_ptr &request, CORBA::Flags req_flags - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); // The default implementation of this method uses the same simple, // multi-protocol remote invocation interface as is assumed by the @@ -129,7 +129,7 @@ public: /// DII operation to create a request. virtual CORBA::Request_ptr _request (const char *operation - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -137,24 +137,24 @@ public: CORBA::Policy_ptr _get_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Policy_ptr _get_client_policy ( CORBA::PolicyType type - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Object_ptr _set_policy_overrides ( const CORBA::PolicyList & policies, CORBA::SetOverrideType set_add - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::PolicyList * _get_policy_overrides ( const CORBA::PolicyTypeSeq & types - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); CORBA::Boolean _validate_connection ( CORBA::PolicyList_out inconsistent_policies - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -167,7 +167,7 @@ public: * implementation. */ virtual CORBA::ULong _hash (CORBA::ULong maximum - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Try to determine if this object is the same as <other_obj>. This @@ -176,12 +176,12 @@ public: * protocols are in use) there is no default implementation. */ virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC (()); /// Return the object key as an out parameter. Caller should release /// return value when finished with it. - virtual TAO_ObjectKey *_key (TAO_ENV_SINGLE_ARG_DECL); + virtual TAO_ObjectKey *_key (ACE_ENV_SINGLE_ARG_DECL); /** * Return a reference to the object key of profile in-use. @@ -296,7 +296,7 @@ public: static CORBA::Object_ptr tao_duplicate (CORBA::Object_ptr); static void tao_release (CORBA::Object_ptr); static CORBA::Object_ptr tao_nil (void); - static CORBA::Object_ptr tao_narrow (CORBA::Object * TAO_ENV_ARG_DECL_NOT_USED); + static CORBA::Object_ptr tao_narrow (CORBA::Object * ACE_ENV_ARG_DECL_NOT_USED); static CORBA::Object * tao_upcast (void *); private: |