summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/IFR_Service/Contained_i.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/Contained_i.h')
-rw-r--r--TAO/orbsvcs/IFR_Service/Contained_i.h54
1 files changed, 27 insertions, 27 deletions
diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.h b/TAO/orbsvcs/IFR_Service/Contained_i.h
index 299288402e9..bcc023d9457 100644
--- a/TAO/orbsvcs/IFR_Service/Contained_i.h
+++ b/TAO/orbsvcs/IFR_Service/Contained_i.h
@@ -51,120 +51,120 @@ public:
// Destructor.
virtual void destroy (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
// Remove the repository entry.
virtual void destroy_i (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual char *id (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
char *id_i (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void id (
const char *id
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
void id_i (
const char *id
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual char *name (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
char *name_i (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void name (
const char *name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
void name_i (
const char *name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual char *version (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
char *version_i (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void version (
const char *version
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
void version_i (
const char *version
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA_Container_ptr defined_in (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
CORBA_Container_ptr defined_in_i (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual char *absolute_name (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
char *absolute_name_i (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA_Repository_ptr containing_repository (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
CORBA_Repository_ptr containing_repository_i (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA_Contained::Description *describe (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
// Pure virtual.
virtual CORBA_Contained::Description *describe_i (
- TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
// Pure virtual.
@@ -173,7 +173,7 @@ public:
CORBA_Container_ptr new_container,
const char *new_name,
const char *new_version
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
@@ -183,7 +183,7 @@ protected:
const char *new_name,
const char *new_version,
CORBA::Boolean cleanup
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
// Engine for move() with an extra 'cleanup'
@@ -194,7 +194,7 @@ protected:
private:
CORBA::Boolean name_exists (
const char *name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
// Check if <name> already exists in our container
@@ -209,7 +209,7 @@ private:
CORBA_Container_ptr container,
const char *contained_path,
const char *name
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
// Mangle the names of references that are also
@@ -219,7 +219,7 @@ private:
void move_contents (
CORBA_Container_ptr new_container
- TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+ ACE_ENV_ARG_DECL_WITH_DEFAULTS)
ACE_THROW_SPEC ((CORBA::SystemException));
// Recursively calls move_i for definitions,