summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp')
-rw-r--r--TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp134
1 files changed, 67 insertions, 67 deletions
diff --git a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
index 790b8a069a5..fb94c9430cd 100644
--- a/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/AttributeDef_i.cpp
@@ -24,23 +24,23 @@ TAO_AttributeDef_i::~TAO_AttributeDef_i (void)
}
CORBA::DefinitionKind
-TAO_AttributeDef_i::def_kind (CORBA::Environment &)
+TAO_AttributeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
return CORBA::dk_Attribute;
}
CORBA_Contained::Description *
-TAO_AttributeDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (0);
- return this->describe_i (ACE_TRY_ENV);
+ return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
}
CORBA_Contained::Description *
-TAO_AttributeDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA_Contained::Description *desc_ptr = 0;
@@ -51,26 +51,26 @@ TAO_AttributeDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
CORBA_Contained::Description_var retval = desc_ptr;
- retval->kind = this->def_kind (ACE_TRY_ENV);
+ retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- retval->value <<= this->make_description (ACE_TRY_ENV);
+ retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
return retval._retn ();
}
-CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_AttributeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
- return this->type_i (ACE_TRY_ENV);
+ return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
}
-CORBA::TypeCode_ptr
-TAO_AttributeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_AttributeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString type_path;
@@ -85,26 +85,26 @@ TAO_AttributeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
0);
TAO_IDLType_i *impl =
- this->repo_->servant_factory ()->create_idltype (type_key,
- ACE_TRY_ENV);
+ this->repo_->servant_factory ()->create_idltype (type_key
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
auto_ptr<TAO_IDLType_i> safety (impl);
- return impl->type_i (ACE_TRY_ENV);
+ return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
}
-CORBA_IDLType_ptr
-TAO_AttributeDef_i::type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_AttributeDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
- return this->type_def_i (ACE_TRY_ENV);
+ return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
}
-CORBA_IDLType_ptr
-TAO_AttributeDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_AttributeDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_TString type_path;
@@ -128,36 +128,36 @@ TAO_AttributeDef_i::type_def_i (CORBA::Environment &ACE_TRY_ENV)
CORBA::Object_var obj =
this->repo_->servant_factory ()->create_objref (def_kind,
- type_path.c_str (),
- ACE_TRY_ENV);
+ type_path.c_str ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
- CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in (),
- ACE_TRY_ENV);
+ CORBA_IDLType_var retval = CORBA_IDLType::_narrow (obj.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
return retval._retn ();
}
-void
-TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def,
- CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_AttributeDef_i::type_def (CORBA_IDLType_ptr type_def
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->type_def_i (type_def,
- ACE_TRY_ENV);
+ this->type_def_i (type_def
+ TAO_ENV_ARG_PARAMETER);
}
-void
-TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def,
- CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
- PortableServer::ObjectId_var oid =
- this->repo_->ir_poa ()->reference_to_id (type_def,
- ACE_TRY_ENV);
+ PortableServer::ObjectId_var oid =
+ this->repo_->ir_poa ()->reference_to_id (type_def
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK;
CORBA::String_var type_path =
@@ -168,17 +168,17 @@ TAO_AttributeDef_i::type_def_i (CORBA_IDLType_ptr type_def,
type_path.in ());
}
-CORBA::AttributeMode
-TAO_AttributeDef_i::mode (CORBA::Environment &ACE_TRY_ENV)
+CORBA::AttributeMode
+TAO_AttributeDef_i::mode (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_READ_GUARD_RETURN (CORBA::ATTR_NORMAL);
- return this->mode_i (ACE_TRY_ENV);
+ return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
}
-CORBA::AttributeMode
-TAO_AttributeDef_i::mode_i (CORBA::Environment &)
+CORBA::AttributeMode
+TAO_AttributeDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
u_int mode = 0;
@@ -189,20 +189,20 @@ TAO_AttributeDef_i::mode_i (CORBA::Environment &)
return ACE_static_cast (CORBA::AttributeMode, mode);
}
-void
-TAO_AttributeDef_i::mode (CORBA::AttributeMode mode,
- CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_AttributeDef_i::mode (CORBA::AttributeMode mode
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
TAO_IFR_WRITE_GUARD;
- this->mode_i (mode,
- ACE_TRY_ENV);
+ this->mode_i (mode
+ TAO_ENV_ARG_PARAMETER);
}
-void
-TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode,
- CORBA::Environment &)
+void
+TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode
+ TAO_ENV_ARG_DECL_NOT_USED)
ACE_THROW_SPEC ((CORBA::SystemException))
{
this->repo_->config ()->set_integer_value (this->section_key_,
@@ -211,15 +211,15 @@ TAO_AttributeDef_i::mode_i (CORBA::AttributeMode mode,
}
CORBA_AttributeDescription
-TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::make_description (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
CORBA_AttributeDescription ad;
- ad.name = this->name_i (ACE_TRY_ENV);
+ ad.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (ad);
- ad.id = this->id_i (ACE_TRY_ENV);
+ ad.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (ad);
ACE_TString container_id;
@@ -230,13 +230,13 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
ad.defined_in = container_id.c_str ();
- ad.version = this->version_i (ACE_TRY_ENV);
+ ad.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (ad);
- ad.type = this->type_i (ACE_TRY_ENV);
+ ad.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (ad);
- ad.mode = this->mode_i (ACE_TRY_ENV);
+ ad.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (ad);
/*
ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -321,7 +321,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
TAO_ExceptionDef_i impl (this->repo_,
key);
- get_ed.type = impl.type_i (ACE_TRY_ENV);
+ get_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (ad);
get_ed_seq[i] = get_ed;
@@ -405,7 +405,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
TAO_ExceptionDef_i impl (this->repo_,
key);
- put_ed.type = impl.type_i (ACE_TRY_ENV);
+ put_ed.type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK_RETURN (ad);
put_ed_seq[i] = put_ed;
@@ -417,7 +417,7 @@ TAO_AttributeDef_i::make_description (CORBA::Environment &ACE_TRY_ENV)
}
CORBA_ExceptionDefSeq *
-TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::get_exceptions (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -479,14 +479,14 @@ TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV)
ACE_TString path;
path_queue.dequeue_head (path);
- CORBA::Object_var obj =
+ CORBA::Object_var obj =
this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
- path.c_str (),
- ACE_TRY_ENV);
+ path.c_str ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- retval[i] = CORBA_ExceptionDef::_narrow (obj.in (),
- ACE_TRY_ENV);
+ retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
@@ -494,7 +494,7 @@ TAO_AttributeDef_i::get_exceptions (CORBA::Environment &ACE_TRY_ENV)
}
CORBA_ExceptionDefSeq *
-TAO_AttributeDef_i::put_exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_AttributeDef_i::put_exceptions (TAO_ENV_SINGLE_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException))
{
ACE_Unbounded_Queue<ACE_TString> path_queue;
@@ -556,14 +556,14 @@ TAO_AttributeDef_i::put_exceptions (CORBA::Environment &ACE_TRY_ENV)
ACE_TString path;
path_queue.dequeue_head (path);
- CORBA::Object_var obj =
+ CORBA::Object_var obj =
this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
- path.c_str (),
- ACE_TRY_ENV);
+ path.c_str ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
- retval[i] = CORBA_ExceptionDef::_narrow (obj.in (),
- ACE_TRY_ENV);
+ retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
+ TAO_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (0);
}
View Lorry Controller Status