summaryrefslogtreecommitdiff
path: root/TAO/tao/IORManipulation/IORManipulation.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tao/IORManipulation/IORManipulation.h')
-rw-r--r--TAO/tao/IORManipulation/IORManipulation.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/TAO/tao/IORManipulation/IORManipulation.h b/TAO/tao/IORManipulation/IORManipulation.h
index f446acfdb12..2fe4a8cc396 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -63,7 +63,7 @@ public:
virtual CORBA::Object_ptr merge_iors (
const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
TAO_IOP::EmptyProfileList,
@@ -74,7 +74,7 @@ public:
virtual CORBA::Object_ptr add_profiles (
CORBA::Object_ptr ior1,
CORBA::Object_ptr ior2
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
TAO_IOP::EmptyProfileList,
@@ -85,7 +85,7 @@ public:
virtual CORBA::Object_ptr remove_profiles (
CORBA::Object_ptr ior1,
CORBA::Object_ptr ior2
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
TAO_IOP::Invalid_IOR,
@@ -96,7 +96,7 @@ public:
virtual CORBA::Boolean set_property (
TAO_IOP::TAO_IOR_Property_ptr prop,
CORBA::Object_ptr ior
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
@@ -108,7 +108,7 @@ public:
TAO_IOP::TAO_IOR_Property_ptr prop,
CORBA::Object_ptr ior1,
CORBA::Object_ptr ior2
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
@@ -120,7 +120,7 @@ public:
virtual CORBA::Object_ptr get_primary (
TAO_IOP::TAO_IOR_Property_ptr prop,
CORBA::Object_ptr ior
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
@@ -130,7 +130,7 @@ public:
virtual CORBA::Boolean is_primary_set (
TAO_IOP::TAO_IOR_Property_ptr prop,
CORBA::Object_ptr ior
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException
@@ -139,7 +139,7 @@ public:
virtual CORBA::ULong is_in_ior (
CORBA::Object_ptr ior1,
CORBA::Object_ptr ior2
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
TAO_IOP::NotFound
@@ -147,7 +147,7 @@ public:
virtual CORBA::ULong get_profile_count (
CORBA::Object_ptr ior
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((
CORBA::SystemException,
TAO_IOP::EmptyProfileList