summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp')
-rw-r--r--TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
index b60466363bc..e84948ad205 100644
--- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
@@ -22,27 +22,27 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void)
}
CORBA::DefinitionKind
-TAO_SequenceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::def_kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Sequence;
}
void
-TAO_SequenceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
}
void
-TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::destroy_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
// Only if it is (w)string, fixed, array or sequence.
- this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
ACE_TString name;
@@ -56,43 +56,43 @@ TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
}
CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::type (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return this->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
}
CORBA::TypeCode_ptr
-TAO_SequenceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::type_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA::TypeCode_var element_typecode =
- this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
- CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ CORBA::ULong bound = this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
return this->repo_->tc_factory ()->create_sequence_tc (
bound,
element_typecode.in ()
- TAO_ENV_ARG_PARAMETER
+ ACE_ENV_ARG_PARAMETER
);
}
CORBA::ULong
-TAO_SequenceDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::bound (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return this->bound_i (ACE_ENV_SINGLE_ARG_PARAMETER);
}
CORBA::ULong
-TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_SequenceDef_i::bound_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int bound = 0;
@@ -105,18 +105,18 @@ TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
void
TAO_SequenceDef_i::bound (CORBA::ULong bound
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
this->bound_i (bound
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
void
TAO_SequenceDef_i::bound_i (CORBA::ULong bound
- TAO_ENV_ARG_DECL_NOT_USED)
+ ACE_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->repo_->config ()->set_integer_value (this->section_key_,
@@ -125,16 +125,16 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound
}
CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return this->element_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
}
CORBA::TypeCode_ptr
-TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString element_path;
@@ -150,25 +150,25 @@ TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
TAO_IDLType_i *impl =
this->repo_->servant_factory ()->create_idltype (element_key
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
auto_ptr<TAO_IDLType_i> safety (impl);
- return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return impl->type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
}
CORBA_IDLType_ptr
-TAO_SequenceDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_def (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
- return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ return this->element_type_def_i (ACE_ENV_SINGLE_ARG_PARAMETER);
}
CORBA_IDLType_ptr
-TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
+TAO_SequenceDef_i::element_type_def_i (ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString element_path;
@@ -193,35 +193,35 @@ TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
CORBA::Object_var obj =
this->repo_->servant_factory ()->create_objref (def_kind,
element_path.c_str ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
return CORBA_IDLType::_narrow (obj.in ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
void
TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
this->element_type_def_i (element_type_def
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
}
void
TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
+ this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
PortableServer::ObjectId_var oid =
this->repo_->ir_poa ()->reference_to_id (element_type_def
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
CORBA::String_var element_path =
@@ -234,7 +234,7 @@ TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
void
TAO_SequenceDef_i::destroy_element_type (
- TAO_ENV_SINGLE_ARG_DECL)
+ ACE_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString element_path;
@@ -269,12 +269,12 @@ TAO_SequenceDef_i::destroy_element_type (
{
TAO_IDLType_i *impl =
this->repo_->servant_factory ()->create_idltype (element_key
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
auto_ptr<TAO_IDLType_i> safety (impl);
- impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+ impl->destroy_i (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
break;