summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/IFR_Service/InterfaceDef_i.h')
-rw-r--r--TAO/orbsvcs/IFR_Service/InterfaceDef_i.h143
1 files changed, 61 insertions, 82 deletions
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
index 6cce4cefab1..88a237df5ad 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
@@ -35,8 +35,8 @@
#pragma warning(disable:4250)
#endif /* _MSC_VER */
-class TAO_InterfaceDef_i : public virtual TAO_Container_i,
- public virtual TAO_Contained_i,
+class TAO_InterfaceDef_i : public virtual TAO_Container_i,
+ public virtual TAO_Contained_i,
public virtual TAO_IDLType_i
{
// = TITLE
@@ -51,117 +51,101 @@ public:
// Constructor
virtual ~TAO_InterfaceDef_i (void);
- // Destructor
+ // Destructor
virtual CORBA::DefinitionKind def_kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
// Return our definition kind.
virtual void destroy (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
// Remove the repository entry.
virtual void destroy_i (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA_Contained::Description *describe (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
// From Contained_i's pure virtual function.
virtual CORBA_Contained::Description *describe_i (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
// From Contained_i's pure virtual function.
virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
// From IDLType_i's pure virtual function.
virtual CORBA::TypeCode_ptr type_i (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
// From IDLType_i's pure virtual function.
virtual CORBA_InterfaceDefSeq *base_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
CORBA_InterfaceDefSeq *base_interfaces_i (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
virtual void base_interfaces (
- const CORBA_InterfaceDefSeq &base_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ const CORBA_InterfaceDefSeq &base_interfaces
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
void base_interfaces_i (
- const CORBA_InterfaceDefSeq &base_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ const CORBA_InterfaceDefSeq &base_interfaces
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA::Boolean is_a (
- const char *interface_id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ const char *interface_id
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
CORBA::Boolean is_a_i (
- const char *interface_id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ const char *interface_id
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA_InterfaceDef::FullInterfaceDescription *describe_interface (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+ ACE_THROW_SPEC ((CORBA::SystemException));
CORBA_InterfaceDef::FullInterfaceDescription *describe_interface_i (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((CORBA::SystemException));
+ TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+ ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA_AttributeDef_ptr create_attribute (
const char *id,
const char *name,
const char *version,
CORBA_IDLType_ptr type,
- CORBA::AttributeMode mode,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ CORBA::AttributeMode mode
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
CORBA_AttributeDef_ptr create_attribute_i (
@@ -169,10 +153,9 @@ public:
const char *name,
const char *version,
CORBA_IDLType_ptr type,
- CORBA::AttributeMode mode,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ CORBA::AttributeMode mode
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
virtual CORBA_OperationDef_ptr create_operation (
@@ -183,10 +166,9 @@ public:
CORBA::OperationMode mode,
const CORBA_ParDescriptionSeq &params,
const CORBA_ExceptionDefSeq &exceptions,
- const CORBA_ContextIdSeq &contexts,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ const CORBA_ContextIdSeq &contexts
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
CORBA_OperationDef_ptr create_operation_i (
@@ -197,29 +179,26 @@ public:
CORBA::OperationMode mode,
const CORBA_ParDescriptionSeq &params,
const CORBA_ExceptionDefSeq &exceptions,
- const CORBA_ContextIdSeq &contexts,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ const CORBA_ContextIdSeq &contexts
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
void interface_contents (
ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
ACE_Unbounded_Queue<ACE_TString> &path_queue,
CORBA::DefinitionKind limit_type,
- CORBA::Boolean exclude_inherited,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ CORBA::Boolean exclude_inherited
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
// Gathers the attributes and operations of all the ancestors.
private:
void destroy_special (
- const char *sub_section,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ const char *sub_section
+ TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
ACE_THROW_SPEC ((CORBA::SystemException));
// Removed the repo ids of our attributes and operations from
// the flat repo ids section of the repository.
@@ -228,8 +207,8 @@ private:
const char *name,
const char *version,
CORBA_IDLType_ptr type,
- CORBA::AttributeMode mode,
- CORBA::Environment &ACE_TRY_ENV)
+ CORBA::AttributeMode mode
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
// Create set and/or get operations for an attribute.
@@ -252,8 +231,8 @@ private:
// Depth-first traversal of the inheritance tree to get all the
// operations.
- CORBA::Boolean check_inherited_attrs (const char *name,
- CORBA::Environment &ACE_TRY_ENV)
+ CORBA::Boolean check_inherited_attrs (const char *name
+ TAO_ENV_ARG_DECL)
ACE_THROW_SPEC ((CORBA::SystemException));
// When creating a new attribute, check for a clash with an inherited
// attribute name.
View Lorry Controller Status