summaryrefslogtreecommitdiff
path: root/TAO/tao
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-01 19:26:26 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-12-01 19:26:26 +0000
commitcdd09534b1832e450f988a7504833df1b01813e7 (patch)
tree95537a0f87b88ae34eae68ff325acdc26aaa7309 /TAO/tao
parent268aef743f4c66311c4786fcc521dd97c868923e (diff)
downloadATCD-cdd09534b1832e450f988a7504833df1b01813e7.tar.gz
ChangeLogTag: Fri Dec 1 13:16:10 2000 Jeff Parsons <parsons@cs.wustl.edu>
Diffstat (limited to 'TAO/tao')
-rw-r--r--TAO/tao/Interface.pidl208
-rw-r--r--TAO/tao/InterfaceC.cpp26384
-rw-r--r--TAO/tao/InterfaceC.h11742
-rw-r--r--TAO/tao/InterfaceC.i13345
-rw-r--r--TAO/tao/Makefile4
-rw-r--r--TAO/tao/Makefile.am2
-rw-r--r--TAO/tao/Makefile.bor4
-rw-r--r--TAO/tao/MessagingC.cpp136
-rw-r--r--TAO/tao/MessagingC.h75
-rw-r--r--TAO/tao/PortableServer/POA_CORBA.h199
-rw-r--r--TAO/tao/SmartProxies/Makefile50
-rw-r--r--TAO/tao/SmartProxies/Makefile.bor22
-rw-r--r--TAO/tao/SmartProxies/SmartProxies.dsp121
-rw-r--r--TAO/tao/SmartProxies/Smart_Proxies.cpp11
-rw-r--r--TAO/tao/SmartProxies/Smart_Proxies.h (renamed from TAO/tao/Smart_Proxies.h)13
-rw-r--r--TAO/tao/SmartProxies/Smart_Proxies.inl (renamed from TAO/tao/Smart_Proxies.i)2
-rw-r--r--TAO/tao/SmartProxies/smartproxies_export.h40
-rw-r--r--TAO/tao/Smart_Proxies.cpp11
-rw-r--r--TAO/tao/Stub.h13
-rw-r--r--TAO/tao/TAO.dsp27
-rw-r--r--TAO/tao/TAO_Static.dsp12
-rw-r--r--TAO/tao/corba.h3
-rw-r--r--TAO/tao/diffs/InterfaceC.cpp.diff51738
-rw-r--r--TAO/tao/diffs/InterfaceC.h.diff32149
-rw-r--r--TAO/tao/diffs/InterfaceC.i.diff27294
-rw-r--r--TAO/tao/ifrfwd.h108
-rw-r--r--TAO/tao/orbconf.h9
27 files changed, 140237 insertions, 23485 deletions
diff --git a/TAO/tao/Interface.pidl b/TAO/tao/Interface.pidl
index 11e21a086ff..d38c9c5e352 100644
--- a/TAO/tao/Interface.pidl
+++ b/TAO/tao/Interface.pidl
@@ -1,12 +1,9 @@
//$Id$
#pragma prefix "omg.org"
+
module IR
{
- typedef CORBA::Identifier Identifier;
- typedef CORBA::ScopedName ScopedName;
- typedef CORBA::RepositoryId RepositoryId;
-
enum DefinitionKind
{
dk_none,
@@ -44,6 +41,28 @@ module IR
dk_Provides,
dk_Uses
};
+};
+
+module CORBA
+{
+ interface IRObject
+ {
+ // read interface
+ readonly attribute IR::DefinitionKind def_kind;
+ // write interface
+ void destroy ();
+ };
+
+ typedef short Visibility;
+ const Visibility PRIVATE_MEMBER = 0;
+ const Visibility PUBLIC_MEMBER = 1;
+};
+
+module IR
+{
+ typedef string Identifier;
+ typedef string ScopedName;
+ typedef string RepositoryId;
typedef string VersionSpec;
@@ -217,7 +236,7 @@ module IR
in VersionSpec version,
in InterfaceDefSeq base_interfaces,
in boolean is_abstract,
- in boolean is_local
+ in boolean is_local
);
ValueDef create_value (
in RepositoryId id,
@@ -869,182 +888,3 @@ module IR
};
};
-module CORBA
-{
- typedef string Identifier;
- typedef string ScopedName;
- typedef string RepositoryId;
-
- interface IRObject
- {
- // read interface
- readonly attribute DefinitionKind def_kind;
- // write interface
- void destroy ();
- };
-
-// This just gets put in corbafwd.h.
-#if 0
- enum TCKind
- { // PIDL
- tk_null, tk_void,
- tk_short, tk_long, tk_ushort, tk_ulong,
- tk_float, tk_double, tk_boolean, tk_char,
- tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref,
- tk_struct, tk_union, tk_enum, tk_string,
- tk_sequence, tk_array, tk_alias, tk_except,
- tk_longlong, tk_ulonglong, tk_longdouble,
- tk_wchar, tk_wstring, tk_fixed,
- tk_value, tk_value_box,
- tk_native,
- tk_abstract_interface,
- tk_component, tk_home
- };
-#endif /* 0 */
-
- typedef short ValueModifier; // PIDL
- const ValueModifier VM_NONE = 0;
- const ValueModifier VM_CUSTOM = 1;
- const ValueModifier VM_ABSTRACT = 2;
- const ValueModifier VM_TRUNCATABLE = 3;
- typedef short Visibility;
- const Visibility PRIVATE_MEMBER = 0;
- const Visibility PUBLIC_MEMBER = 1;
-
-// Not generated.
-#if 0
- interface TypeCode
- { // PIDL
- exception Bounds {};
- exception BadKind {};
- // for all TypeCode kinds
- boolean equal (in TypeCode tc);
- boolean equivalent(in TypeCode tc);
- TypeCode get_compact_typecode();
- TCKind kind ();
- // for tk_objref, tk_struct, tk_union, tk_enum, tk_alias,
- // tk_value, tk_value_box, tk_native, tk_abstract_interface,
- // tk_except, tk_component, tk_home
- RepositoryId id () raises (BadKind);
- // for tk_objref, tk_struct, tk_union, tk_enum, tk_alias,
- // tk_value, tk_value_box, tk_native, tk_abstract_interface
- // tk_except, tk_component, tk_home
- Identifier name () raises (BadKind);
- // for tk_struct, tk_union, tk_enum, tk_value,
- // and tk_except
- unsigned long member_count () raises (BadKind);
- Identifier member_name (in unsigned long index)
- raises (BadKind, Bounds);
- // for tk_struct, tk_union, tk_value, and tk_except
- TypeCode member_type (in unsigned long index)
- raises (BadKind, Bounds);
- // for tk_union
- any member_label (in unsigned long index)
- raises (BadKind, Bounds);
- TypeCode discriminator_type () raises (BadKind);
- long default_index () raises (BadKind);
- // for tk_string, tk_sequence, and tk_array
- unsigned long length () raises (BadKind);
- // for tk_sequence, tk_array, tk_value_box, and tk_alias
- TypeCode content_type () raises (BadKind);
- // for tk_fixed
- unsigned short fixed_digits() raises (BadKind);
- short fixed_scale() raises (BadKind);
- // for tk_value
- Visibility member_visibility(in unsigned long index)
- raises(BadKind, Bounds);
- ValueModifier type_modifier() raises(BadKind);
- TypeCode concrete_base_type() raises(BadKind);
- };
-#endif /* 0 */
-
- // The TypeCode related part of interface ORB moved to
- // the TypeCodeFactory interface.
- // A reference to this interface can be obtained from
- // resolve_initial_references with argument "TypeCodeFactory".
- local interface TypeCodeFactory
- { // PIDL
- TypeCode create_struct_tc (
- in RepositoryId id,
- in Identifier name,
- in StructMemberSeq members
- );
- TypeCode create_union_tc (
- in RepositoryId id,
- in Identifier name,
- in TypeCode discriminator_type,
- in UnionMemberSeq members
- );
- TypeCode create_enum_tc (
- in RepositoryId id,
- in Identifier name,
- in EnumMemberSeq members
- );
- TypeCode create_alias_tc (
- in RepositoryId id,
- in Identifier name,
- in TypeCode original_type
- );
- TypeCode create_exception_tc (
- in RepositoryId id,
- in Identifier name,
- in StructMemberSeq members
- );
- TypeCode create_interface_tc (
- in RepositoryId id,
- in Identifier name
- );
- TypeCode create_string_tc (
- in unsigned long bound
- );
- TypeCode create_wstring_tc (
- in unsigned long bound
- );
- TypeCode create_fixed_tc (
- in unsigned short digits,
- in unsigned short scale
- );
- TypeCode create_sequence_tc (
- in unsigned long bound,
- in TypeCode element_type
- );
- TypeCode create_array_tc (
- in unsigned long length,
- in TypeCode element_type
- );
- TypeCode create_value_tc (
- in RepositoryId id,
- in Identifier name,
- in ValueModifier type_modifier,
- in TypeCode concrete_base,
- in ValueMemberSeq members
- );
- TypeCode create_value_box_tc (
- in RepositoryId id,
- in Identifier name,
- in TypeCode boxed_type
- );
- TypeCode create_native_tc (
- in RepositoryId id,
- in Identifier name
- );
- TypeCode create_recursive_tc (
- in RepositoryId id
- );
- TypeCode create_abstract_interface_tc (
- in RepositoryId id,
- in Identifier name
- );
- TypeCode create_component_tc (
- in RepositoryId id,
- in Identifier name
- );
- TypeCode create_home_tc (
- in RepositoryId id,
- in Identifier name
- );
- };
-};
-
-#pragma prefix ""
-
diff --git a/TAO/tao/InterfaceC.cpp b/TAO/tao/InterfaceC.cpp
index dcca7dc5ea1..f120734e096 100644
--- a/TAO/tao/InterfaceC.cpp
+++ b/TAO/tao/InterfaceC.cpp
@@ -1,11 +1,23 @@
-/* -*- C++ -*- $Id$ */
-
-// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// -*- C++ -*-
+//
+/* $Id$ */
+
+// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+// Center for Distributed Object Computing
+// Washington University
+// St. Louis, MO
+// USA
+// http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+// Distributed Object Computing Laboratory
+// University of California at Irvine
+// Irvine, CA
+// USA
+// http://doc.ece.uci.edu/
//
// Information about TAO is available at:
-// http://www.cs.wustl.edu/~schmidt/TAO.html
+// http://www.cs.wustl.edu/~schmidt/TAO.html
#include "InterfaceC.h"
@@ -18,63 +30,6 @@
#include "InterfaceC.i"
#endif /* !defined INLINE */
-static const CORBA::Long _oc_IR_Identifier[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_Identifier (CORBA::tk_alias, sizeof (_oc_IR_Identifier), (char *) &_oc_IR_Identifier, 0, sizeof (IR::Identifier));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_IR_Identifier)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IR_ScopedName[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x636f7065), ACE_NTOHL (0x644e616d), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ScopedName:1.0
- 11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000), // name = ScopedName
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5363), ACE_NTOHL (0x6f706564), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
- 11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000), // name = ScopedName
- CORBA::tk_string,
- 0U, // string length
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_ScopedName (CORBA::tk_alias, sizeof (_oc_IR_ScopedName), (char *) &_oc_IR_ScopedName, 0, sizeof (IR::ScopedName));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, &_tc_TAO_tc_IR_ScopedName)
-TAO_NAMESPACE_END
-static const CORBA::Long _oc_IR_RepositoryId[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryId (CORBA::tk_alias, sizeof (_oc_IR_RepositoryId), (char *) &_oc_IR_RepositoryId, 0, sizeof (IR::RepositoryId));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, &_tc_TAO_tc_IR_RepositoryId)
-TAO_NAMESPACE_END
static const CORBA::Long _oc_IR_DefinitionKind[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -98,12 +53,12 @@ static const CORBA::Long _oc_IR_DefinitionKind[] =
10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = dk_String
12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500), // name = dk_Sequence
9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0), // name = dk_Array
- 14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000), // name = dk_IR_Repository
+ 14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000), // name = dk_Repository
11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = dk_Wstring
9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0), // name = dk_Fixed
9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = dk_Value
12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800), // name = dk_ValueBox
- 15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000), // name = dk_IR_ValueMember
+ 15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000), // name = dk_ValueMember
10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000), // name = dk_Native
13, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = dk_Component
8, ACE_NTOHL (0x646b5f48), ACE_NTOHL (0x6f6d6500), // name = dk_Home
@@ -116,75 +71,41 @@ static const CORBA::Long _oc_IR_DefinitionKind[] =
12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
};
-static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (CORBA::tk_enum, sizeof (_oc_IR_DefinitionKind), (char *) &_oc_IR_DefinitionKind, 0, sizeof (IR::DefinitionKind));
+static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (CORBA::tk_enum, sizeof (_oc_IR_DefinitionKind), (char *) &_oc_IR_DefinitionKind, 0, sizeof (IR_DefinitionKind));
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DefinitionKind, &_tc_TAO_tc_IR_DefinitionKind)
TAO_NAMESPACE_END
-void CORBA::IRObject::_tao_any_destructor (void *x)
-{
- CORBA::IRObject *tmp = ACE_static_cast (CORBA::IRObject*,x);
- CORBA::release (tmp);
-}
-CORBA::IRObject_ptr CORBA::IRObject::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return CORBA::IRObject::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:CORBA/IRObject:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (CORBA::IRObject::_nil ());
- if (is_a == 0)
- return CORBA::IRObject::_nil ();
- return CORBA::IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-CORBA::IRObject_ptr CORBA::IRObject::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return CORBA::IRObject::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- CORBA::IRObject_ptr default_proxy = CORBA::IRObject::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_CORBA_IRObject_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_CORBA_IRObject_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, CORBA::IRObject (stub), CORBA::IRObject::_nil ());
- return TAO_CORBA_IRObject_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_IRObject_Proxy_Impl::_TAO_IRObject_Proxy_Impl (void)
+{}
-CORBA::IRObject_ptr
-CORBA::IRObject::_duplicate (CORBA::IRObject_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
+{}
-IR::DefinitionKind CORBA::IRObject::def_kind (
+// Remote Implementation of the IDL interface methods
+
+IR_DefinitionKind _TAO_IRObject_Remote_Proxy_Impl::def_kind (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
- IR::DefinitionKind _tao_retval = (IR::DefinitionKind)0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ IR_DefinitionKind _tao_retval = (IR_DefinitionKind)0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_def_kind",
@@ -192,56 +113,63 @@ IR::DefinitionKind CORBA::IRObject::def_kind (
0,
istub->orb_core ()
);
+
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
return _tao_retval;
}
-void CORBA::IRObject::destroy (
+void _TAO_IRObject_Remote_Proxy_Impl::destroy (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"destroy",
@@ -250,200 +178,349 @@ void CORBA::IRObject::destroy (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+_TAO_IRObject_Proxy_Broker::_TAO_IRObject_Proxy_Broker (void)
+{
}
-CORBA::Boolean CORBA::IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_IRObject_Proxy_Broker::~_TAO_IRObject_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* CORBA::IRObject::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void)
{
- return "IDL:CORBA/IRObject:1.0";
+ static ::_TAO_IRObject_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_CORBA_IRObject_Default_Proxy_Factory::TAO_CORBA_IRObject_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_IRObject_Remote_Proxy_Broker::_TAO_IRObject_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_CORBA_IRObject_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_CORBA_IRObject_Default_Proxy_Factory::~TAO_CORBA_IRObject_Default_Proxy_Factory (void)
+_TAO_IRObject_Remote_Proxy_Broker::~_TAO_IRObject_Remote_Proxy_Broker (void)
{
}
-CORBA::IRObject_ptr
-TAO_CORBA_IRObject_Default_Proxy_Factory::create_proxy (
- ::CORBA::IRObject_ptr proxy,
- CORBA::Environment &
- )
+_TAO_IRObject_Proxy_Impl&
+_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
+ CORBA_IRObject *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_CORBA_IRObject_Proxy_Factory_Adapter::TAO_CORBA_IRObject_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+CORBA_IRObject::CORBA_IRObject (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_CORBA_IRObject_Proxy_Factory_Adapter::~TAO_CORBA_IRObject_Proxy_Factory_Adapter (void)
+// destructor
+CORBA_IRObject::~CORBA_IRObject (void)
+{}
+
+void
+CORBA_IRObject::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_IRObject_Proxy_Broker_ =
+ _TAO_IRObject_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_IRObject_Proxy_Broker_ =
+ the_TAO_IRObject_Remote_Proxy_Broker ();
+
+
}
-int
-TAO_CORBA_IRObject_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_CORBA_IRObject_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void CORBA_IRObject::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ CORBA_IRObject *tmp = ACE_static_cast (CORBA_IRObject*,x);
+ CORBA::release (tmp);
}
-int
-TAO_CORBA_IRObject_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+CORBA_IRObject_ptr CORBA_IRObject::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return CORBA_IRObject::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
+ if (is_a == 0)
+ return CORBA_IRObject::_nil ();
}
-return 0;
+ return CORBA_IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-CORBA::IRObject_ptr
-TAO_CORBA_IRObject_Proxy_Factory_Adapter::create_proxy (
- CORBA::IRObject_ptr proxy,
+CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_CORBA_IRObject_Default_Proxy_Factory (1),
- 0);
-
+ if (CORBA::is_nil (obj))
+ return CORBA_IRObject::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ CORBA_IRObject_ptr default_proxy = CORBA_IRObject::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () && _TAO_IRObject_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ CORBA_IRObject (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ CORBA_IRObject::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, CORBA_IRObject (stub, 0, obj->_servant ()), CORBA_IRObject::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ CORBA_IRObject_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &CORBA_IRObject::_narrow
+ )
+ )
+ );
+}
- return this->proxy_factory_->create_proxy (proxy);
+CORBA_IRObject_ptr
+CORBA_IRObject::_duplicate (CORBA_IRObject_ptr obj)
+{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_CORBA_IRObject_Smart_Proxy_Base::TAO_CORBA_IRObject_Smart_Proxy_Base (::CORBA::IRObject_ptr proxy)
-: base_proxy_ (proxy)
+CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_CORBA_IRObject_Smart_Proxy_Base::~TAO_CORBA_IRObject_Smart_Proxy_Base (void)
+void *CORBA_IRObject::_tao_QueryInterface (ptr_arith_t type)
{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_CORBA_IRObject_Smart_Proxy_Base::_stubobj (void) const
+const char* CORBA_IRObject::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/CORBA/IRObject:1.0";
}
-IR::DefinitionKind TAO_CORBA_IRObject_Smart_Proxy_Base::def_kind (
+IR_DefinitionKind CORBA_IRObject::def_kind (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->def_kind (
+
+ return this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).def_kind (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_CORBA_IRObject_Smart_Proxy_Base::destroy (
+void CORBA_IRObject::destroy (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->base_proxy_->destroy (
+
+ this->the_TAO_IRObject_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).destroy (
+ this,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_CORBA_IRObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_CORBA_IRObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_CORBA_IRObject[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4952), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/IRObject:1.0
- 9, ACE_NTOHL (0x49524f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = IRObject
+ 9, ACE_NTOHL (0x49524f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = CORBA_IRObject
};
static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (CORBA::tk_objref, sizeof (_oc_CORBA_IRObject), (char *) &_oc_CORBA_IRObject, 0, sizeof (CORBA_IRObject));
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (CORBA)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IRObject, &_tc_TAO_tc_CORBA_IRObject)
TAO_NAMESPACE_END
+static const CORBA::Long _oc_CORBA_Visibility[] =
+{
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5669), ACE_NTOHL (0x73696269), ACE_NTOHL (0x6c697479), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Visibility:1.0
+ 11, ACE_NTOHL (0x56697369), ACE_NTOHL (0x62696c69), ACE_NTOHL (0x74790000), // name = Visibility
+ CORBA::tk_short,
+
+};
+static CORBA::TypeCode _tc_TAO_tc_CORBA_Visibility (CORBA::tk_alias, sizeof (_oc_CORBA_Visibility), (char *) &_oc_CORBA_Visibility, 0, sizeof (CORBA::Visibility));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Visibility, &_tc_TAO_tc_CORBA_Visibility)
+TAO_NAMESPACE_END
+TAO_NAMESPACE_TYPE (const CORBA::Short)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (const CORBA::Short, PRIVATE_MEMBER, 0)
+TAO_NAMESPACE_END
+TAO_NAMESPACE_TYPE (const CORBA::Short)
+TAO_NAMESPACE_BEGIN (CORBA)
+TAO_NAMESPACE_DEFINE (const CORBA::Short, PUBLIC_MEMBER, 1)
+TAO_NAMESPACE_END
+
+static const CORBA::Long _oc_IR_Identifier[] =
+{
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
+ 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
+ CORBA::tk_alias, // typecode kind for typedefs
+ 68, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
+ 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
+ CORBA::tk_string,
+ 0U, // string length
+
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_Identifier (CORBA::tk_alias, sizeof (_oc_IR_Identifier), (char *) &_oc_IR_Identifier, 0, sizeof (IR::Identifier));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_IR_Identifier)
+TAO_NAMESPACE_END
+
+static const CORBA::Long _oc_IR_ScopedName[] =
+{
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x636f7065), ACE_NTOHL (0x644e616d), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ScopedName:1.0
+ 11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000), // name = ScopedName
+ CORBA::tk_alias, // typecode kind for typedefs
+ 68, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5363), ACE_NTOHL (0x6f706564), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
+ 11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000), // name = ScopedName
+ CORBA::tk_string,
+ 0U, // string length
+
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_ScopedName (CORBA::tk_alias, sizeof (_oc_IR_ScopedName), (char *) &_oc_IR_ScopedName, 0, sizeof (IR::ScopedName));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, &_tc_TAO_tc_IR_ScopedName)
+TAO_NAMESPACE_END
+
+static const CORBA::Long _oc_IR_RepositoryId[] =
+{
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
+ CORBA::tk_alias, // typecode kind for typedefs
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
+
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryId (CORBA::tk_alias, sizeof (_oc_IR_RepositoryId), (char *) &_oc_IR_RepositoryId, 0, sizeof (IR::RepositoryId));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, &_tc_TAO_tc_IR_RepositoryId)
+TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_VersionSpec[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
};
static CORBA::TypeCode _tc_TAO_tc_IR_VersionSpec (CORBA::tk_alias, sizeof (_oc_IR_VersionSpec), (char *) &_oc_IR_VersionSpec, 0, sizeof (IR::VersionSpec));
@@ -451,70 +528,36 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_VersionSpec, &_tc_TAO_tc_IR_VersionSpec)
TAO_NAMESPACE_END
-void IR_Contained::_tao_any_destructor (void *x)
-{
- IR_Contained *tmp = ACE_static_cast (IR_Contained*,x);
- CORBA::release (tmp);
-}
-IR_Contained_ptr IR_Contained::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_Contained::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Contained:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_Contained::_nil ());
- if (is_a == 0)
- return IR_Contained::_nil ();
- return IR_Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_Contained_ptr IR_Contained::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_Contained::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_Contained_ptr default_proxy = IR_Contained::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_Contained_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_Contained_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_Contained (stub), IR_Contained::_nil ());
- return TAO_IR_Contained_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_Contained_Proxy_Impl::_TAO_Contained_Proxy_Impl (void)
+{}
-IR_Contained_ptr
-IR_Contained::_duplicate (IR_Contained_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_Contained_Remote_Proxy_Impl::_TAO_Contained_Remote_Proxy_Impl (void)
+{}
-char * IR_Contained::id (
+// Remote Implementation of the IDL interface methods
+
+char * _TAO_Contained_Remote_Proxy_Impl::id (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::String_var _tao_safe_retval;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_id",
@@ -523,58 +566,63 @@ char * IR_Contained::id (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-void IR_Contained::id (
+void _TAO_Contained_Remote_Proxy_Impl::id (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_id",
@@ -583,56 +631,62 @@ void IR_Contained::id (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-char * IR_Contained::name (
+char * _TAO_Contained_Remote_Proxy_Impl::name (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
CORBA::String_var _tao_safe_retval;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_name",
@@ -641,58 +695,63 @@ char * IR_Contained::name (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-void IR_Contained::name (
+void _TAO_Contained_Remote_Proxy_Impl::name (
+ CORBA_Object *_collocated_tao_target_,
const char * name,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_name",
@@ -701,56 +760,64 @@ void IR_Contained::name (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << name)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-char * IR_Contained::version (
- CORBA::Environment &ACE_TRY_ENV
+char * _TAO_Contained_Remote_Proxy_Impl::version (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::String_var _tao_safe_retval;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_version",
@@ -759,58 +826,62 @@ char * IR_Contained::version (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-void IR_Contained::version (
+void _TAO_Contained_Remote_Proxy_Impl::version (
+ CORBA_Object *_collocated_tao_target_,
const char * version,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_version",
@@ -823,51 +894,59 @@ void IR_Contained::version (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << version)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_Container_ptr IR_Contained::defined_in (
+IR_Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
IR_Container_ptr _tao_retval = IR_Container::_nil ();
IR_Container_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_defined_in",
@@ -876,57 +955,63 @@ IR_Container_ptr IR_Contained::defined_in (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-char * IR_Contained::absolute_name (
+char * _TAO_Contained_Remote_Proxy_Impl::absolute_name (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
CORBA::String_var _tao_safe_retval;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_absolute_name",
@@ -939,53 +1024,60 @@ char * IR_Contained::absolute_name (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-IR_Repository_ptr IR_Contained::containing_repository (
+IR_Repository_ptr _TAO_Contained_Remote_Proxy_Impl::containing_repository (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
IR_Repository_ptr _tao_retval = IR_Repository::_nil ();
IR_Repository_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_containing_repository",
@@ -994,116 +1086,63 @@ IR_Repository_ptr IR_Contained::containing_repository (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-static const CORBA::Long _oc_IR_Contained_Description[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x2f446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained/Description:1.0
- 12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = Description
- 2, // member count
- 5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
- CORBA::tk_enum, // typecode kind
- 632, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f44), ACE_NTOHL (0x6566696e), ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e4b696e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
- 15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000), // name = DefinitionKind
- 34, // member count
- 8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500), // name = dk_none
- 7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000), // name = dk_all
- 13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0), // name = dk_Attribute
- 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400), // name = dk_Constant
- 13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Exception
- 13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0), // name = dk_Interface
- 10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000), // name = dk_Module
- 13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Operation
- 11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000), // name = dk_Typedef
- 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0), // name = dk_Alias
- 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000), // name = dk_Struct
- 9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0), // name = dk_Union
- 8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00), // name = dk_Enum
- 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = dk_Primitive
- 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = dk_String
- 12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500), // name = dk_Sequence
- 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0), // name = dk_Array
- 14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000), // name = dk_IR_Repository
- 11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = dk_Wstring
- 9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0), // name = dk_Fixed
- 9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = dk_Value
- 12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800), // name = dk_ValueBox
- 15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000), // name = dk_IR_ValueMember
- 10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000), // name = dk_Native
- 13, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = dk_Component
- 8, ACE_NTOHL (0x646b5f48), ACE_NTOHL (0x6f6d6500), // name = dk_Home
- 11, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = dk_Factory
- 10, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72000000), // name = dk_Finder
- 14, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79000000), // name = dk_PrimaryKey
- 9, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x0), // name = dk_Emits
- 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x0), // name = dk_Publishes
- 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657300), // name = dk_Consumes
- 12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
- 8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
-
- 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
- CORBA::tk_any,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_Contained_Description (CORBA::tk_struct, sizeof (_oc_IR_Contained_Description), (char *) &_oc_IR_Contained_Description, 0, sizeof (IR_Contained::Description));
-CORBA::TypeCode_ptr IR_Contained::_tc_Description = &_tc_TAO_tc_IR_Contained_Description;
-
-void IR_Contained::Description::_tao_any_destructor (void *x)
-{
- Description *tmp = ACE_static_cast (Description*,x);
- delete tmp;
-}
-
-IR_Contained::Description * IR_Contained::describe (
+IR_Contained::Description * _TAO_Contained_Remote_Proxy_Impl::describe (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
IR_Contained::Description *_tao_retval = 0;
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
ACE_NEW_RETURN (_tao_retval, IR_Contained::Description, _tao_retval);
IR_Contained::Description_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -1114,40 +1153,51 @@ IR_Contained::Description * IR_Contained::describe (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-void IR_Contained::move (
+void _TAO_Contained_Remote_Proxy_Impl::move (
+ CORBA_Object *_collocated_tao_target_,
IR_Container_ptr new_container,
const char * new_name,
const char * new_version,
@@ -1156,16 +1206,11 @@ void IR_Contained::move (
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"move",
@@ -1174,296 +1219,445 @@ void IR_Contained::move (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << new_container) &&
(_tao_out << new_name) &&
(_tao_out << new_version)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_Contained_Proxy_Broker::_TAO_Contained_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_Contained_Proxy_Broker::~_TAO_Contained_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_Contained::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/Contained:1.0";
+ static ::_TAO_Contained_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_Contained_Default_Proxy_Factory::TAO_IR_Contained_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_Contained_Remote_Proxy_Broker::_TAO_Contained_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_Contained_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_Contained_Default_Proxy_Factory::~TAO_IR_Contained_Default_Proxy_Factory (void)
+_TAO_Contained_Remote_Proxy_Broker::~_TAO_Contained_Remote_Proxy_Broker (void)
{
}
-IR_Contained_ptr
-TAO_IR_Contained_Default_Proxy_Factory::create_proxy (
- ::IR_Contained_ptr proxy,
- CORBA::Environment &
- )
+_TAO_Contained_Proxy_Impl&
+_TAO_Contained_Remote_Proxy_Broker::select_proxy (
+ IR_Contained *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_Contained_Proxy_Factory_Adapter::TAO_IR_Contained_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_Contained::IR_Contained (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_Contained_Proxy_Factory_Adapter::~TAO_IR_Contained_Proxy_Factory_Adapter (void)
+// destructor
+IR_Contained::~IR_Contained (void)
+{}
+
+void
+IR_Contained::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_Contained_Proxy_Broker_ =
+ _TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_Contained_Proxy_Broker_ =
+ ::the_TAO_Contained_Remote_Proxy_Broker ();
+
+ CORBA_IRObject::_tao_setup_collocation (collocated);
}
-int
-TAO_IR_Contained_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_Contained_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_Contained::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_Contained *tmp = ACE_static_cast (IR_Contained*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_Contained_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_Contained_ptr IR_Contained::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_Contained::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Contained:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_Contained::_nil ());
+ if (is_a == 0)
+ return IR_Contained::_nil ();
}
-return 0;
+ return IR_Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_Contained_ptr
-TAO_IR_Contained_Proxy_Factory_Adapter::create_proxy (
- ::IR_Contained_ptr proxy,
+IR_Contained_ptr IR_Contained::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_Contained_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_Contained::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_Contained_ptr default_proxy = IR_Contained::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_Contained_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ IR_Contained (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_Contained::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, IR_Contained (stub, 0, obj->_servant ()), IR_Contained::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_Contained_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_Contained::_narrow
+ )
+ )
+ );
}
-TAO_IR_Contained_Smart_Proxy_Base::TAO_IR_Contained_Smart_Proxy_Base (::IR_Contained_ptr proxy)
-: base_proxy_ (proxy)
+IR_Contained_ptr
+IR_Contained::_duplicate (IR_Contained_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_Contained_Smart_Proxy_Base::~TAO_IR_Contained_Smart_Proxy_Base (void)
+CORBA::Boolean IR_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_Contained::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_Contained_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_Contained::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/Contained:1.0";
}
-char * TAO_IR_Contained_Smart_Proxy_Base::id (
+char * IR_Contained::id (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->id (
+{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).id (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_Contained_Smart_Proxy_Base::id (
+void IR_Contained::id (
const char * id,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- this->base_proxy_->id (
+{
+ this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).id (
+ this,
id,
ACE_TRY_ENV
);
-
}
-char * TAO_IR_Contained_Smart_Proxy_Base::name (
+char * IR_Contained::name (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->name (
+
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).name (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_Contained_Smart_Proxy_Base::name (
+void IR_Contained::name (
const char * name,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- this->base_proxy_->name (
+{
+ this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).name (
+ this,
name,
ACE_TRY_ENV
);
-
}
-char * TAO_IR_Contained_Smart_Proxy_Base::version (
+char * IR_Contained::version (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->version (
+{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).version (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_Contained_Smart_Proxy_Base::version (
+void IR_Contained::version (
const char * version,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- this->base_proxy_->version (
+{
+ this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).version (
+ this,
version,
ACE_TRY_ENV
);
-
}
-IR_Container_ptr TAO_IR_Contained_Smart_Proxy_Base::defined_in (
+IR_Container_ptr IR_Contained::defined_in (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->defined_in (
+{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).defined_in (
+ this,
ACE_TRY_ENV
);
-
}
-char * TAO_IR_Contained_Smart_Proxy_Base::absolute_name (
+char * IR_Contained::absolute_name (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->absolute_name (
+{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).absolute_name (
+ this,
ACE_TRY_ENV
);
-
}
-IR_Repository_ptr TAO_IR_Contained_Smart_Proxy_Base::containing_repository (
+IR_Repository_ptr IR_Contained::containing_repository (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->containing_repository (
+{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).containing_repository (
+ this,
ACE_TRY_ENV
);
+}
+
+static const CORBA::Long _oc_IR_Contained_Description[] =
+{
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x2f446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained/Description:1.0
+ 12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = Description
+ 2, // member count
+ 5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
+ CORBA::tk_enum, // typecode kind
+ 632, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f44), ACE_NTOHL (0x6566696e), ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e4b696e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
+ 15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000), // name = DefinitionKind
+ 34, // member count
+ 8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500), // name = dk_none
+ 7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000), // name = dk_all
+ 13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0), // name = dk_Attribute
+ 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400), // name = dk_Constant
+ 13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Exception
+ 13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0), // name = dk_Interface
+ 10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000), // name = dk_Module
+ 13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Operation
+ 11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000), // name = dk_Typedef
+ 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0), // name = dk_Alias
+ 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000), // name = dk_Struct
+ 9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0), // name = dk_Union
+ 8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00), // name = dk_Enum
+ 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = dk_Primitive
+ 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = dk_String
+ 12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500), // name = dk_Sequence
+ 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0), // name = dk_Array
+ 14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000), // name = dk_Repository
+ 11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = dk_Wstring
+ 9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0), // name = dk_Fixed
+ 9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = dk_Value
+ 12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800), // name = dk_ValueBox
+ 15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000), // name = dk_ValueMember
+ 10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000), // name = dk_Native
+ 13, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = dk_Component
+ 8, ACE_NTOHL (0x646b5f48), ACE_NTOHL (0x6f6d6500), // name = dk_Home
+ 11, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = dk_Factory
+ 10, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72000000), // name = dk_Finder
+ 14, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79000000), // name = dk_PrimaryKey
+ 9, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x0), // name = dk_Emits
+ 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x0), // name = dk_Publishes
+ 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657300), // name = dk_Consumes
+ 12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
+ 8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
+
+ 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
+ CORBA::tk_any,
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_Contained_Description (CORBA::tk_struct, sizeof (_oc_IR_Contained_Description), (char *) &_oc_IR_Contained_Description, 0, sizeof (IR_Contained::Description));
+CORBA::TypeCode_ptr IR_Contained::_tc_Description = &_tc_TAO_tc_IR_Contained_Description;
+
+void IR_Contained::Description::_tao_any_destructor (void *x)
+{
+ Description *tmp = ACE_static_cast (Description*,x);
+ delete tmp;
}
-IR_Contained::Description * TAO_IR_Contained_Smart_Proxy_Base::describe (
+IR_Contained::Description * IR_Contained::describe (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->describe (
+{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).describe (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_Contained_Smart_Proxy_Base::move (
+void IR_Contained::move (
IR_Container_ptr new_container,
const char * new_name,
const char * new_version,
@@ -1472,23 +1666,16 @@ void TAO_IR_Contained_Smart_Proxy_Base::move (
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- this->base_proxy_->move (
+{
+ this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).move (
+ this,
new_container,
new_name,
new_version,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_Contained_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_Contained_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_Contained[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1502,17 +1689,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Contained, &_tc_TAO_tc_IR_Contain
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_InterfaceDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_InterfaceDef **old = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
@@ -1521,14 +1705,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_InterfaceDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_deallocate_buffer (void)
{
@@ -1543,24 +1727,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_InterfaceDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -1577,14 +1761,8 @@ TAO_NAMESPACE_END
IR_InterfaceDef **tmp = ACE_static_cast (IR_InterfaceDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_INTERFACEDEFSEQ_CS_)
-#define _IR_INTERFACEDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_InterfaceDefSeq
@@ -1593,30 +1771,30 @@ TAO_NAMESPACE_END
IR_InterfaceDefSeq::IR_InterfaceDefSeq (void)
{}
IR_InterfaceDefSeq::IR_InterfaceDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_InterfaceDefSeq::IR_InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, IR_InterfaceDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_InterfaceDefSeq::IR_InterfaceDefSeq (const IR_InterfaceDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_InterfaceDefSeq::~IR_InterfaceDefSeq (void) // dtor
@@ -1627,9 +1805,6 @@ void IR_InterfaceDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_InterfaceDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1654,17 +1829,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDefSeq, &_tc_TAO_tc_IR_I
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ValueDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ValueDef **old = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
@@ -1673,14 +1845,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_ValueDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_deallocate_buffer (void)
{
@@ -1695,24 +1867,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_ValueDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -1729,14 +1901,8 @@ TAO_NAMESPACE_END
IR_ValueDef **tmp = ACE_static_cast (IR_ValueDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_VALUEDEFSEQ_CS_)
-#define _IR_VALUEDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ValueDefSeq
@@ -1745,30 +1911,30 @@ TAO_NAMESPACE_END
IR_ValueDefSeq::IR_ValueDefSeq (void)
{}
IR_ValueDefSeq::IR_ValueDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ValueDefSeq::IR_ValueDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ValueDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ValueDefSeq::IR_ValueDefSeq (const IR_ValueDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ValueDefSeq::~IR_ValueDefSeq (void) // dtor
@@ -1779,9 +1945,6 @@ void IR_ValueDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ValueDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1806,17 +1969,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDefSeq, &_tc_TAO_tc_IR_Value
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ComponentDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ComponentDef **old = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
@@ -1825,14 +1985,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_ComponentDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_deallocate_buffer (void)
{
@@ -1847,24 +2007,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_ComponentDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -1881,14 +2041,8 @@ TAO_NAMESPACE_END
IR_ComponentDef **tmp = ACE_static_cast (IR_ComponentDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_COMPONENTDEFSEQ_CS_)
-#define _IR_COMPONENTDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ComponentDefSeq
@@ -1897,30 +2051,30 @@ TAO_NAMESPACE_END
IR_ComponentDefSeq::IR_ComponentDefSeq (void)
{}
IR_ComponentDefSeq::IR_ComponentDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ComponentDefSeq::IR_ComponentDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ComponentDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ComponentDefSeq::IR_ComponentDefSeq (const IR_ComponentDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ComponentDefSeq::~IR_ComponentDefSeq (void) // dtor
@@ -1931,9 +2085,6 @@ void IR_ComponentDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ComponentDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -1958,17 +2109,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDefSeq, &_tc_TAO_tc_IR_C
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ProvidesDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ProvidesDef **old = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
@@ -1977,14 +2125,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_ProvidesDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_deallocate_buffer (void)
{
@@ -1999,24 +2147,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_ProvidesDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -2033,14 +2181,8 @@ TAO_NAMESPACE_END
IR_ProvidesDef **tmp = ACE_static_cast (IR_ProvidesDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PROVIDESDEFSEQ_CS_)
-#define _IR_PROVIDESDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ProvidesDefSeq
@@ -2049,30 +2191,30 @@ TAO_NAMESPACE_END
IR_ProvidesDefSeq::IR_ProvidesDefSeq (void)
{}
IR_ProvidesDefSeq::IR_ProvidesDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ProvidesDefSeq::IR_ProvidesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ProvidesDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ProvidesDefSeq::IR_ProvidesDefSeq (const IR_ProvidesDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ProvidesDefSeq::~IR_ProvidesDefSeq (void) // dtor
@@ -2083,9 +2225,6 @@ void IR_ProvidesDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ProvidesDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2110,17 +2249,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDefSeq, &_tc_TAO_tc_IR_Pr
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_UsesDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_UsesDef **old = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
@@ -2129,14 +2265,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_UsesDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_deallocate_buffer (void)
{
@@ -2151,24 +2287,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_UsesDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -2185,14 +2321,8 @@ TAO_NAMESPACE_END
IR_UsesDef **tmp = ACE_static_cast (IR_UsesDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_USESDEFSEQ_CS_)
-#define _IR_USESDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_UsesDefSeq
@@ -2201,30 +2331,30 @@ TAO_NAMESPACE_END
IR_UsesDefSeq::IR_UsesDefSeq (void)
{}
IR_UsesDefSeq::IR_UsesDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_UsesDefSeq::IR_UsesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_UsesDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_UsesDefSeq::IR_UsesDefSeq (const IR_UsesDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_UsesDefSeq::~IR_UsesDefSeq (void) // dtor
@@ -2235,9 +2365,6 @@ void IR_UsesDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_UsesDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2262,17 +2389,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDefSeq, &_tc_TAO_tc_IR_UsesDe
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_HomeDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_HomeDef **old = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
@@ -2281,14 +2405,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_HomeDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_deallocate_buffer (void)
{
@@ -2303,24 +2427,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_HomeDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -2337,14 +2461,8 @@ TAO_NAMESPACE_END
IR_HomeDef **tmp = ACE_static_cast (IR_HomeDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_HOMEDEFSEQ_CS_)
-#define _IR_HOMEDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_HomeDefSeq
@@ -2353,30 +2471,30 @@ TAO_NAMESPACE_END
IR_HomeDefSeq::IR_HomeDefSeq (void)
{}
IR_HomeDefSeq::IR_HomeDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_HomeDefSeq::IR_HomeDefSeq (CORBA::ULong max, CORBA::ULong length, IR_HomeDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_HomeDefSeq::IR_HomeDefSeq (const IR_HomeDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_HomeDefSeq::~IR_HomeDefSeq (void) // dtor
@@ -2387,9 +2505,6 @@ void IR_HomeDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_HomeDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2414,17 +2529,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDefSeq, &_tc_TAO_tc_IR_HomeDe
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_EmitsDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_EmitsDef **old = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
@@ -2433,14 +2545,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_EmitsDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_deallocate_buffer (void)
{
@@ -2455,24 +2567,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_EmitsDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -2489,14 +2601,8 @@ TAO_NAMESPACE_END
IR_EmitsDef **tmp = ACE_static_cast (IR_EmitsDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_EMITSDEFSEQ_CS_)
-#define _IR_EMITSDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_EmitsDefSeq
@@ -2505,30 +2611,30 @@ TAO_NAMESPACE_END
IR_EmitsDefSeq::IR_EmitsDefSeq (void)
{}
IR_EmitsDefSeq::IR_EmitsDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_EmitsDefSeq::IR_EmitsDefSeq (CORBA::ULong max, CORBA::ULong length, IR_EmitsDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_EmitsDefSeq::IR_EmitsDefSeq (const IR_EmitsDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_EmitsDefSeq::~IR_EmitsDefSeq (void) // dtor
@@ -2539,9 +2645,6 @@ void IR_EmitsDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_EmitsDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2566,17 +2669,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDefSeq, &_tc_TAO_tc_IR_Emits
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_PublishesDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_PublishesDef **old = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
@@ -2585,14 +2685,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_PublishesDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_deallocate_buffer (void)
{
@@ -2607,24 +2707,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_PublishesDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -2641,14 +2741,8 @@ TAO_NAMESPACE_END
IR_PublishesDef **tmp = ACE_static_cast (IR_PublishesDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PUBLISHESDEFSEQ_CS_)
-#define _IR_PUBLISHESDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_PublishesDefSeq
@@ -2657,30 +2751,30 @@ TAO_NAMESPACE_END
IR_PublishesDefSeq::IR_PublishesDefSeq (void)
{}
IR_PublishesDefSeq::IR_PublishesDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_PublishesDefSeq::IR_PublishesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_PublishesDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_PublishesDefSeq::IR_PublishesDefSeq (const IR_PublishesDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_PublishesDefSeq::~IR_PublishesDefSeq (void) // dtor
@@ -2691,9 +2785,6 @@ void IR_PublishesDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_PublishesDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2718,17 +2809,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDefSeq, &_tc_TAO_tc_IR_P
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ConsumesDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ConsumesDef **old = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
@@ -2737,14 +2825,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_ConsumesDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_deallocate_buffer (void)
{
@@ -2759,24 +2847,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_ConsumesDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -2793,14 +2881,8 @@ TAO_NAMESPACE_END
IR_ConsumesDef **tmp = ACE_static_cast (IR_ConsumesDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_CONSUMESDEFSEQ_CS_)
-#define _IR_CONSUMESDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ConsumesDefSeq
@@ -2809,30 +2891,30 @@ TAO_NAMESPACE_END
IR_ConsumesDefSeq::IR_ConsumesDefSeq (void)
{}
IR_ConsumesDefSeq::IR_ConsumesDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ConsumesDefSeq::IR_ConsumesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ConsumesDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ConsumesDefSeq::IR_ConsumesDefSeq (const IR_ConsumesDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ConsumesDefSeq::~IR_ConsumesDefSeq (void) // dtor
@@ -2843,9 +2925,6 @@ void IR_ConsumesDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ConsumesDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -2870,17 +2949,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDefSeq, &_tc_TAO_tc_IR_Co
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_FactoryDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_FactoryDef **old = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
@@ -2889,14 +2965,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_FactoryDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_deallocate_buffer (void)
{
@@ -2911,24 +2987,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_FactoryDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -2945,14 +3021,8 @@ TAO_NAMESPACE_END
IR_FactoryDef **tmp = ACE_static_cast (IR_FactoryDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_FACTORYDEFSEQ_CS_)
-#define _IR_FACTORYDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_FactoryDefSeq
@@ -2961,30 +3031,30 @@ TAO_NAMESPACE_END
IR_FactoryDefSeq::IR_FactoryDefSeq (void)
{}
IR_FactoryDefSeq::IR_FactoryDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_FactoryDefSeq::IR_FactoryDefSeq (CORBA::ULong max, CORBA::ULong length, IR_FactoryDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_FactoryDefSeq::IR_FactoryDefSeq (const IR_FactoryDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_FactoryDefSeq::~IR_FactoryDefSeq (void) // dtor
@@ -2995,9 +3065,6 @@ void IR_FactoryDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_FactoryDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3022,17 +3089,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDefSeq, &_tc_TAO_tc_IR_Fac
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_FinderDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_FinderDef **old = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
@@ -3041,14 +3105,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_FinderDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_deallocate_buffer (void)
{
@@ -3063,24 +3127,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_FinderDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -3097,14 +3161,8 @@ TAO_NAMESPACE_END
IR_FinderDef **tmp = ACE_static_cast (IR_FinderDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_FINDERDEFSEQ_CS_)
-#define _IR_FINDERDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_FinderDefSeq
@@ -3113,30 +3171,30 @@ TAO_NAMESPACE_END
IR_FinderDefSeq::IR_FinderDefSeq (void)
{}
IR_FinderDefSeq::IR_FinderDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_FinderDefSeq::IR_FinderDefSeq (CORBA::ULong max, CORBA::ULong length, IR_FinderDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_FinderDefSeq::IR_FinderDefSeq (const IR_FinderDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_FinderDefSeq::~IR_FinderDefSeq (void) // dtor
@@ -3147,9 +3205,6 @@ void IR_FinderDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_FinderDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3174,17 +3229,14 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDefSeq, &_tc_TAO_tc_IR_Find
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_allocate_buffer (CORBA::ULong length)
{
IR_Contained **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_Contained **old = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
@@ -3193,14 +3245,14 @@ TAO_NAMESPACE_END
tmp[i] = IR_Contained::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_deallocate_buffer (void)
{
@@ -3215,24 +3267,24 @@ TAO_NAMESPACE_END
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::~_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_Contained::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -3249,14 +3301,8 @@ TAO_NAMESPACE_END
IR_Contained **tmp = ACE_static_cast (IR_Contained**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_CONTAINEDSEQ_CS_)
-#define _IR_CONTAINEDSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ContainedSeq
@@ -3265,30 +3311,30 @@ TAO_NAMESPACE_END
IR_ContainedSeq::IR_ContainedSeq (void)
{}
IR_ContainedSeq::IR_ContainedSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ContainedSeq::IR_ContainedSeq (CORBA::ULong max, CORBA::ULong length, IR_Contained_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ContainedSeq::IR_ContainedSeq (const IR_ContainedSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ContainedSeq::~IR_ContainedSeq (void) // dtor
@@ -3299,9 +3345,6 @@ void IR_ContainedSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ContainedSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3324,6 +3367,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContainedSeq, &_tc_TAO_tc_IR_ContainedSeq)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_StructMember[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3332,18 +3376,12 @@ static const CORBA::Long _oc_IR_StructMember[] =
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -3361,63 +3399,53 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMember, &_tc_TAO_tc_IR_StructMember)
TAO_NAMESPACE_END
+
void IR_StructMember::_tao_any_destructor (void *x)
{
IR_StructMember *tmp = ACE_static_cast (IR_StructMember*,x);
delete tmp;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
{
IR_StructMember* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_StructMember *old = ACE_reinterpret_cast (IR_StructMember *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_StructMemberSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_StructMember *tmp = ACE_reinterpret_cast (IR_StructMember *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_StructMemberSeq::~_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_STRUCTMEMBERSEQ_CS_)
-#define _IR_STRUCTMEMBERSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_StructMemberSeq
@@ -3426,30 +3454,30 @@ void IR_StructMember::_tao_any_destructor (void *x)
IR_StructMemberSeq::IR_StructMemberSeq (void)
{}
IR_StructMemberSeq::IR_StructMemberSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_StructMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_StructMemberSeq::IR_StructMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_StructMember *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_StructMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_StructMemberSeq::IR_StructMemberSeq (const IR_StructMemberSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_StructMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_StructMemberSeq::~IR_StructMemberSeq (void) // dtor
@@ -3460,37 +3488,28 @@ void IR_StructMemberSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_StructMemberSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = IR_StructMemberSeq
CORBA::tk_sequence, // typecode kind
- 320, // encapsulation length
+ 252, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 304, // encapsulation length
+ 236, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -3511,6 +3530,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMemberSeq, &_tc_TAO_tc_IR_StructMemberSeq)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_Initializer[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3519,33 +3539,27 @@ static const CORBA::Long _oc_IR_Initializer[] =
2, // member count
8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
CORBA::tk_alias, // typecode kind for typedefs
- 392, // encapsulation length
+ 324, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = IR_StructMemberSeq
CORBA::tk_sequence, // typecode kind
- 320, // encapsulation length
+ 252, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 304, // encapsulation length
+ 236, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -3563,18 +3577,12 @@ static const CORBA::Long _oc_IR_Initializer[] =
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
};
static CORBA::TypeCode _tc_TAO_tc_IR_Initializer (CORBA::tk_struct, sizeof (_oc_IR_Initializer), (char *) &_oc_IR_Initializer, 0, sizeof (IR_Initializer));
@@ -3582,63 +3590,53 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Initializer, &_tc_TAO_tc_IR_Initializer)
TAO_NAMESPACE_END
+
void IR_Initializer::_tao_any_destructor (void *x)
{
IR_Initializer *tmp = ACE_static_cast (IR_Initializer*,x);
delete tmp;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_InitializerSeq::_allocate_buffer (CORBA::ULong length)
{
IR_Initializer* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_Initializer *old = ACE_reinterpret_cast (IR_Initializer *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_InitializerSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_Initializer *tmp = ACE_reinterpret_cast (IR_Initializer *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_InitializerSeq::~_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_INITIALIZERSEQ_CS_)
-#define _IR_INITIALIZERSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_InitializerSeq
@@ -3647,30 +3645,30 @@ void IR_Initializer::_tao_any_destructor (void *x)
IR_InitializerSeq::IR_InitializerSeq (void)
{}
IR_InitializerSeq::IR_InitializerSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_InitializerSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_InitializerSeq::IR_InitializerSeq (CORBA::ULong max, CORBA::ULong length, IR_Initializer *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_InitializerSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_InitializerSeq::IR_InitializerSeq (const IR_InitializerSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_InitializerSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_InitializerSeq::~IR_InitializerSeq (void) // dtor
@@ -3681,52 +3679,43 @@ void IR_InitializerSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_InitializerSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/InitializerSeq:1.0
15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000), // name = IR_InitializerSeq
CORBA::tk_sequence, // typecode kind
- 640, // encapsulation length
+ 504, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 624, // encapsulation length
+ 488, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/Initializer:1.0
12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200), // name = IR_Initializer
2, // member count
8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
CORBA::tk_alias, // typecode kind for typedefs
- 392, // encapsulation length
+ 324, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = IR_StructMemberSeq
CORBA::tk_sequence, // typecode kind
- 320, // encapsulation length
+ 252, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 304, // encapsulation length
+ 236, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -3744,18 +3733,12 @@ static const CORBA::Long _oc_IR_InitializerSeq[] =
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -3766,6 +3749,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InitializerSeq, &_tc_TAO_tc_IR_InitializerSeq)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_UnionMember[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -3774,18 +3758,12 @@ static const CORBA::Long _oc_IR_UnionMember[] =
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
6, ACE_NTOHL (0x6c616265), ACE_NTOHL (0x6c000000), // name = label
CORBA::tk_any,
@@ -3806,63 +3784,53 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMember, &_tc_TAO_tc_IR_UnionMember)
TAO_NAMESPACE_END
+
void IR_UnionMember::_tao_any_destructor (void *x)
{
IR_UnionMember *tmp = ACE_static_cast (IR_UnionMember*,x);
delete tmp;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
{
IR_UnionMember* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_UnionMember *old = ACE_reinterpret_cast (IR_UnionMember *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_UnionMember *tmp = ACE_reinterpret_cast (IR_UnionMember *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_UnionMemberSeq::~_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_UNIONMEMBERSEQ_CS_)
-#define _IR_UNIONMEMBERSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_UnionMemberSeq
@@ -3871,30 +3839,30 @@ void IR_UnionMember::_tao_any_destructor (void *x)
IR_UnionMemberSeq::IR_UnionMemberSeq (void)
{}
IR_UnionMemberSeq::IR_UnionMemberSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_UnionMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_UnionMemberSeq::IR_UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_UnionMember *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_UnionMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_UnionMemberSeq::IR_UnionMemberSeq (const IR_UnionMemberSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_UnionMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_UnionMemberSeq::~IR_UnionMemberSeq (void) // dtor
@@ -3905,37 +3873,28 @@ void IR_UnionMemberSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_UnionMemberSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/UnionMemberSeq:1.0
15, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000), // name = IR_UnionMemberSeq
CORBA::tk_sequence, // typecode kind
- 332, // encapsulation length
+ 264, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 316, // encapsulation length
+ 248, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UnionMember:1.0
12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200), // name = IR_UnionMember
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
6, ACE_NTOHL (0x6c616265), ACE_NTOHL (0x6c000000), // name = label
CORBA::tk_any,
@@ -3960,9 +3919,6 @@ TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMemberSeq, &_tc_TAO_tc_IR_UnionMemberSeq)
TAO_NAMESPACE_END
-#if !defined (_IR_ENUMMEMBERSEQ_CS_)
-#define _IR_ENUMMEMBERSEQ_CS_
-
// *************************************************************
// IR_EnumMemberSeq
// *************************************************************
@@ -3970,30 +3926,30 @@ TAO_NAMESPACE_END
IR_EnumMemberSeq::IR_EnumMemberSeq (void)
{}
IR_EnumMemberSeq::IR_EnumMemberSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_EnumMemberSeq::IR_EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_EnumMemberSeq::IR_EnumMemberSeq (const IR_EnumMemberSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_EnumMemberSeq::~IR_EnumMemberSeq (void) // dtor
@@ -4004,30 +3960,21 @@ void IR_EnumMemberSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_EnumMemberSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6e756d4d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x72536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/EnumMemberSeq:1.0
14, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x71000000), // name = IR_EnumMemberSeq
CORBA::tk_sequence, // typecode kind
- 148, // encapsulation length
+ 80, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -4037,72 +3984,37 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumMemberSeq, &_tc_TAO_tc_IR_EnumMemberSeq)
TAO_NAMESPACE_END
-void IR_Container::_tao_any_destructor (void *x)
-{
- IR_Container *tmp = ACE_static_cast (IR_Container*,x);
- CORBA::release (tmp);
-}
-IR_Container_ptr IR_Container::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_Container::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Container:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_Container::_nil ());
- if (is_a == 0)
- return IR_Container::_nil ();
- return IR_Container::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_Container_ptr IR_Container::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_Container::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_Container_ptr default_proxy = IR_Container::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_Container_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_Container_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_Container (stub), IR_Container::_nil ());
- return TAO_IR_Container_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
+{}
-IR_Container_ptr
-IR_Container::_duplicate (IR_Container_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
+{}
-IR_Contained_ptr IR_Container::lookup (
+// Remote Implementation of the IDL interface methods
+
+IR_Contained_ptr _TAO_Container_Remote_Proxy_Impl::lookup (
+ CORBA_Object *_collocated_tao_target_,
const char * search_name,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
IR_Contained_ptr _tao_retval = IR_Contained::_nil ();
IR_Contained_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"lookup",
@@ -4115,60 +4027,71 @@ IR_Contained_ptr IR_Container::lookup (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << search_name)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-IR_ContainedSeq * IR_Container::contents (
- IR::DefinitionKind limit_type,
+IR_ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
+ CORBA_Object *_collocated_tao_target_,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
IR_ContainedSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
ACE_NEW_RETURN (_tao_retval, IR_ContainedSeq, _tao_retval);
IR_ContainedSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -4183,63 +4106,74 @@ IR_ContainedSeq * IR_Container::contents (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << limit_type) &&
(_tao_out << CORBA::Any::from_boolean (exclude_inherited))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-IR_ContainedSeq * IR_Container::lookup_name (
+IR_ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
+ CORBA_Object *_collocated_tao_target_,
const char * search_name,
CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
IR_ContainedSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
ACE_NEW_RETURN (_tao_retval, IR_ContainedSeq, _tao_retval);
IR_ContainedSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -4250,18 +4184,19 @@ IR_ContainedSeq * IR_Container::lookup_name (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << search_name) &&
@@ -4269,270 +4204,46 @@ IR_ContainedSeq * IR_Container::lookup_name (
(_tao_out << limit_type) &&
(_tao_out << CORBA::Any::from_boolean (exclude_inherited))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
- return _tao_safe_retval._retn ();
-}
-
-static const CORBA::Long _oc_IR_Container_Description[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x2f446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Container/Description:1.0
- 12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = Description
- 3, // member count
- 17, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x645f6f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = contained_object
- CORBA::tk_objref, // typecode kind
- 56, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
- 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = IR_Contained
-
- 5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
- CORBA::tk_enum, // typecode kind
- 632, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f44), ACE_NTOHL (0x6566696e), ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e4b696e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
- 15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000), // name = DefinitionKind
- 34, // member count
- 8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500), // name = dk_none
- 7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000), // name = dk_all
- 13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0), // name = dk_Attribute
- 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400), // name = dk_Constant
- 13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Exception
- 13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0), // name = dk_Interface
- 10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000), // name = dk_Module
- 13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Operation
- 11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000), // name = dk_Typedef
- 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0), // name = dk_Alias
- 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000), // name = dk_Struct
- 9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0), // name = dk_Union
- 8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00), // name = dk_Enum
- 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = dk_Primitive
- 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = dk_String
- 12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500), // name = dk_Sequence
- 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0), // name = dk_Array
- 14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000), // name = dk_IR_Repository
- 11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = dk_Wstring
- 9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0), // name = dk_Fixed
- 9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = dk_Value
- 12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800), // name = dk_ValueBox
- 15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000), // name = dk_IR_ValueMember
- 10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000), // name = dk_Native
- 13, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = dk_Component
- 8, ACE_NTOHL (0x646b5f48), ACE_NTOHL (0x6f6d6500), // name = dk_Home
- 11, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = dk_Factory
- 10, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72000000), // name = dk_Finder
- 14, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79000000), // name = dk_PrimaryKey
- 9, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x0), // name = dk_Emits
- 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x0), // name = dk_Publishes
- 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657300), // name = dk_Consumes
- 12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
- 8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
-
- 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
- CORBA::tk_any,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_Container_Description (CORBA::tk_struct, sizeof (_oc_IR_Container_Description), (char *) &_oc_IR_Container_Description, 0, sizeof (IR_Container::Description));
-CORBA::TypeCode_ptr IR_Container::_tc_Description = &_tc_TAO_tc_IR_Container_Description;
-
-void IR_Container::Description::_tao_any_destructor (void *x)
-{
- Description *tmp = ACE_static_cast (Description*,x);
- delete tmp;
-}
-
-
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CS_
-
- void
- IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
- {
- IR_Container::Description* tmp = 0;
- tmp = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (length);
-
- if (this->buffer_ != 0)
- {
- IR_Container::Description *old = ACE_reinterpret_cast (IR_Container::Description *,this->buffer_);
-
- for (CORBA::ULong i = 0; i < this->length_; ++i)
- tmp[i] = old[i];
-
- if (this->release_)
- _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (old);
-
- }
- this->buffer_ = tmp;
- }
-
- void
- IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_deallocate_buffer (void)
- {
- if (this->buffer_ == 0 || this->release_ == 0)
- return;
-
- IR_Container::Description *tmp = ACE_reinterpret_cast (IR_Container::Description *,this->buffer_);
-
- _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
- this->buffer_ = 0;
- }
-
- IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Dtor.
- {
- this->_deallocate_buffer ();
- }
-
-
-#endif /* end #if !defined */
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ_CS_)
-#define _IR_CONTAINER_DESCRIPTIONSEQ_CS_
-
-// *************************************************************
-// IR_Container::DescriptionSeq
-// *************************************************************
-
-IR_Container::DescriptionSeq::DescriptionSeq (void)
-{}
-IR_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
- :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
- _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<IR_Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max)
-{}
-IR_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_Container::Description *buffer, CORBA::Boolean release)
- :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
- _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<IR_Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (max, length, buffer, release)
-{}
-IR_Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
- :
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
- _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
-#else /* TAO_USE_SEQUENCE_TEMPLATES */
- TAO_Unbounded_Sequence<IR_Container::Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
- (seq)
-{}
-IR_Container::DescriptionSeq::~DescriptionSeq (void) // dtor
-{}
-void IR_Container::DescriptionSeq::_tao_any_destructor (void *x)
-{
- DescriptionSeq *tmp = ACE_static_cast (DescriptionSeq*,x);
- delete tmp;
+ return _tao_safe_retval._retn ();
}
-
-#endif /* end #if !defined */
-
-static const CORBA::Long _oc_IR_Container_DescriptionSeq[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x2f446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/Container/DescriptionSeq:1.0
- 15, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = DescriptionSeq
- CORBA::tk_sequence, // typecode kind
- 844, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- CORBA::tk_struct, // typecode kind
- 828, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x2f446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Container/Description:1.0
- 12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = Description
- 3, // member count
- 17, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x645f6f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = contained_object
- CORBA::tk_objref, // typecode kind
- 56, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
- 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = IR_Contained
-
- 5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
- CORBA::tk_enum, // typecode kind
- 632, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f44), ACE_NTOHL (0x6566696e), ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e4b696e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
- 15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000), // name = DefinitionKind
- 34, // member count
- 8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500), // name = dk_none
- 7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000), // name = dk_all
- 13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0), // name = dk_Attribute
- 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400), // name = dk_Constant
- 13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Exception
- 13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0), // name = dk_Interface
- 10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000), // name = dk_Module
- 13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Operation
- 11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000), // name = dk_Typedef
- 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0), // name = dk_Alias
- 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000), // name = dk_Struct
- 9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0), // name = dk_Union
- 8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00), // name = dk_Enum
- 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = dk_Primitive
- 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = dk_String
- 12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500), // name = dk_Sequence
- 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0), // name = dk_Array
- 14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000), // name = dk_IR_Repository
- 11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = dk_Wstring
- 9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0), // name = dk_Fixed
- 9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = dk_Value
- 12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800), // name = dk_ValueBox
- 15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000), // name = dk_IR_ValueMember
- 10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000), // name = dk_Native
- 13, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = dk_Component
- 8, ACE_NTOHL (0x646b5f48), ACE_NTOHL (0x6f6d6500), // name = dk_Home
- 11, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = dk_Factory
- 10, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72000000), // name = dk_Finder
- 14, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79000000), // name = dk_PrimaryKey
- 9, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x0), // name = dk_Emits
- 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x0), // name = dk_Publishes
- 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657300), // name = dk_Consumes
- 12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
- 8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
-
- 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
- CORBA::tk_any,
-
-
- 0U,
-
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_Container_DescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_Container_DescriptionSeq), (char *) &_oc_IR_Container_DescriptionSeq, 0, sizeof (IR_Container::DescriptionSeq));
-CORBA::TypeCode_ptr IR_Container::_tc_DescriptionSeq = &_tc_TAO_tc_IR_Container_DescriptionSeq;
-
-IR_Container::DescriptionSeq * IR_Container::describe_contents (
- IR::DefinitionKind limit_type,
+IR_Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_contents (
+ CORBA_Object *_collocated_tao_target_,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
@@ -4541,15 +4252,12 @@ IR_Container::DescriptionSeq * IR_Container::describe_contents (
CORBA::SystemException
))
{
-
IR_Container::DescriptionSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
ACE_NEW_RETURN (_tao_retval, IR_Container::DescriptionSeq, _tao_retval);
IR_Container::DescriptionSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -4560,50 +4268,63 @@ IR_Container::DescriptionSeq * IR_Container::describe_contents (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << limit_type) &&
(_tao_out << CORBA::Any::from_boolean (exclude_inherited)) &&
(_tao_out << max_returned_objs)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-IR_ModuleDef_ptr IR_Container::create_module (
+IR_ModuleDef_ptr _TAO_Container_Remote_Proxy_Impl::create_module (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -4613,16 +4334,13 @@ IR_ModuleDef_ptr IR_Container::create_module (
CORBA::SystemException
))
{
-
IR_ModuleDef_ptr _tao_retval = IR_ModuleDef::_nil ();
IR_ModuleDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_module",
@@ -4631,50 +4349,64 @@ IR_ModuleDef_ptr IR_Container::create_module (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
(_tao_out << name) &&
(_tao_out << version)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ConstantDef_ptr IR_Container::create_constant (
+IR_ConstantDef_ptr _TAO_Container_Remote_Proxy_Impl::create_constant (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -4686,16 +4418,13 @@ IR_ConstantDef_ptr IR_Container::create_constant (
CORBA::SystemException
))
{
-
IR_ConstantDef_ptr _tao_retval = IR_ConstantDef::_nil ();
IR_ConstantDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_constant",
@@ -4704,18 +4433,19 @@ IR_ConstantDef_ptr IR_Container::create_constant (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -4724,32 +4454,45 @@ IR_ConstantDef_ptr IR_Container::create_constant (
(_tao_out << type) &&
(_tao_out << value)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_StructDef_ptr IR_Container::create_struct (
+IR_StructDef_ptr _TAO_Container_Remote_Proxy_Impl::create_struct (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -4760,16 +4503,13 @@ IR_StructDef_ptr IR_Container::create_struct (
CORBA::SystemException
))
{
-
IR_StructDef_ptr _tao_retval = IR_StructDef::_nil ();
IR_StructDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_struct",
@@ -4778,18 +4518,19 @@ IR_StructDef_ptr IR_Container::create_struct (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -4797,32 +4538,45 @@ IR_StructDef_ptr IR_Container::create_struct (
(_tao_out << version) &&
(_tao_out << members)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_UnionDef_ptr IR_Container::create_union (
+IR_UnionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_union (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -4834,16 +4588,13 @@ IR_UnionDef_ptr IR_Container::create_union (
CORBA::SystemException
))
{
-
IR_UnionDef_ptr _tao_retval = IR_UnionDef::_nil ();
IR_UnionDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_union",
@@ -4856,13 +4607,15 @@ IR_UnionDef_ptr IR_Container::create_union (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -4871,32 +4624,45 @@ IR_UnionDef_ptr IR_Container::create_union (
(_tao_out << discriminator_type) &&
(_tao_out << members)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_EnumDef_ptr IR_Container::create_enum (
+IR_EnumDef_ptr _TAO_Container_Remote_Proxy_Impl::create_enum (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -4907,16 +4673,13 @@ IR_EnumDef_ptr IR_Container::create_enum (
CORBA::SystemException
))
{
-
IR_EnumDef_ptr _tao_retval = IR_EnumDef::_nil ();
IR_EnumDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_enum",
@@ -4929,13 +4692,15 @@ IR_EnumDef_ptr IR_Container::create_enum (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -4943,32 +4708,45 @@ IR_EnumDef_ptr IR_Container::create_enum (
(_tao_out << version) &&
(_tao_out << members)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_AliasDef_ptr IR_Container::create_alias (
+IR_AliasDef_ptr _TAO_Container_Remote_Proxy_Impl::create_alias (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -4979,16 +4757,13 @@ IR_AliasDef_ptr IR_Container::create_alias (
CORBA::SystemException
))
{
-
IR_AliasDef_ptr _tao_retval = IR_AliasDef::_nil ();
IR_AliasDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_alias",
@@ -4997,18 +4772,19 @@ IR_AliasDef_ptr IR_Container::create_alias (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -5016,32 +4792,45 @@ IR_AliasDef_ptr IR_Container::create_alias (
(_tao_out << version) &&
(_tao_out << original_type)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_InterfaceDef_ptr IR_Container::create_interface (
+IR_InterfaceDef_ptr _TAO_Container_Remote_Proxy_Impl::create_interface (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -5054,16 +4843,14 @@ IR_InterfaceDef_ptr IR_Container::create_interface (
CORBA::SystemException
))
{
-
IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_interface",
@@ -5072,17 +4859,19 @@ IR_InterfaceDef_ptr IR_Container::create_interface (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -5092,32 +4881,45 @@ IR_InterfaceDef_ptr IR_Container::create_interface (
(_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
(_tao_out << CORBA::Any::from_boolean (is_local))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ValueDef_ptr IR_Container::create_value (
+IR_ValueDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -5134,16 +4936,13 @@ IR_ValueDef_ptr IR_Container::create_value (
CORBA::SystemException
))
{
-
IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
IR_ValueDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_value",
@@ -5152,18 +4951,19 @@ IR_ValueDef_ptr IR_Container::create_value (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -5177,32 +4977,45 @@ IR_ValueDef_ptr IR_Container::create_value (
(_tao_out << supported_interfaces) &&
(_tao_out << initializers)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ValueBoxDef_ptr IR_Container::create_value_box (
+IR_ValueBoxDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value_box (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -5213,16 +5026,13 @@ IR_ValueBoxDef_ptr IR_Container::create_value_box (
CORBA::SystemException
))
{
-
IR_ValueBoxDef_ptr _tao_retval = IR_ValueBoxDef::_nil ();
IR_ValueBoxDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_value_box",
@@ -5235,13 +5045,15 @@ IR_ValueBoxDef_ptr IR_Container::create_value_box (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -5249,31 +5061,45 @@ IR_ValueBoxDef_ptr IR_Container::create_value_box (
(_tao_out << version) &&
(_tao_out << original_type_def)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ExceptionDef_ptr IR_Container::create_exception (
+IR_ExceptionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_exception (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -5284,16 +5110,13 @@ IR_ExceptionDef_ptr IR_Container::create_exception (
CORBA::SystemException
))
{
-
IR_ExceptionDef_ptr _tao_retval = IR_ExceptionDef::_nil ();
IR_ExceptionDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_exception",
@@ -5302,18 +5125,19 @@ IR_ExceptionDef_ptr IR_Container::create_exception (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -5321,32 +5145,45 @@ IR_ExceptionDef_ptr IR_Container::create_exception (
(_tao_out << version) &&
(_tao_out << members)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_NativeDef_ptr IR_Container::create_native (
+IR_NativeDef_ptr _TAO_Container_Remote_Proxy_Impl::create_native (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -5356,16 +5193,13 @@ IR_NativeDef_ptr IR_Container::create_native (
CORBA::SystemException
))
{
-
IR_NativeDef_ptr _tao_retval = IR_NativeDef::_nil ();
IR_NativeDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_native",
@@ -5374,183 +5208,277 @@ IR_NativeDef_ptr IR_Container::create_native (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
(_tao_out << name) &&
(_tao_out << version)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_Container_Proxy_Broker::_TAO_Container_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_Container::_interface_repository_id (void) const
+_TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/Container:1.0";
}
-TAO_IR_Container_Default_Proxy_Factory::TAO_IR_Container_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_Container_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_Container_Default_Proxy_Factory::~TAO_IR_Container_Default_Proxy_Factory (void)
+_TAO_Container_Remote_Proxy_Broker::_TAO_Container_Remote_Proxy_Broker (void)
{
}
-IR_Container_ptr
-TAO_IR_Container_Default_Proxy_Factory::create_proxy (
- ::IR_Container_ptr proxy,
- CORBA::Environment &
- )
+_TAO_Container_Remote_Proxy_Broker::~_TAO_Container_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_Container_Proxy_Factory_Adapter::TAO_IR_Container_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_Container_Proxy_Impl&
+_TAO_Container_Remote_Proxy_Broker::select_proxy (
+ ::IR_Container *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_Container_Proxy_Factory_Adapter::~TAO_IR_Container_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_Container::IR_Container (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_Container_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_Container_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_Container::~IR_Container (void)
+{}
+
+void
+IR_Container::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_Container_Proxy_Broker_ =
+ _TAO_Container_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_Container_Proxy_Broker_ =
+ ::the_TAO_Container_Remote_Proxy_Broker ();
+
+ CORBA_IRObject::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_Container_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_Container::_tao_any_destructor (void *x)
+{
+ IR_Container *tmp = ACE_static_cast (IR_Container*,x);
+ CORBA::release (tmp);
+}
+
+IR_Container_ptr IR_Container::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_Container::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Container:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_Container::_nil ());
+ if (is_a == 0)
+ return IR_Container::_nil ();
}
-return 0;
+ return IR_Container::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_Container_ptr
-TAO_IR_Container_Proxy_Factory_Adapter::create_proxy (
- ::IR_Container_ptr proxy,
+IR_Container_ptr IR_Container::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_Container_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_Container::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_Container_ptr default_proxy = IR_Container::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_Container_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_Container (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_Container::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_Container (stub, 0, obj->_servant ()), IR_Container::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_Container_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_Container::_narrow
+ )
+ )
+ );
}
-TAO_IR_Container_Smart_Proxy_Base::TAO_IR_Container_Smart_Proxy_Base (::IR_Container_ptr proxy)
-: base_proxy_ (proxy)
+IR_Container_ptr
+IR_Container::_duplicate (IR_Container_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_Container_Smart_Proxy_Base::~TAO_IR_Container_Smart_Proxy_Base (void)
+CORBA::Boolean IR_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_Container_Smart_Proxy_Base::_stubobj (void) const
+void *IR_Container::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_Container::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/Container:1.0";
}
-IR_Contained_ptr TAO_IR_Container_Smart_Proxy_Base::lookup (
+IR_Contained_ptr IR_Container::lookup (
const char * search_name,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->lookup (
+{
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).lookup (
+ this,
search_name,
ACE_TRY_ENV
);
-
}
-IR_ContainedSeq * TAO_IR_Container_Smart_Proxy_Base::contents (
- IR::DefinitionKind limit_type,
+IR_ContainedSeq * IR_Container::contents (
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
@@ -5558,18 +5486,18 @@ IR_ContainedSeq * TAO_IR_Container_Smart_Proxy_Base::contents (
CORBA::SystemException
))
{
- return this->base_proxy_->contents (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contents (
+ this,
limit_type,
exclude_inherited,
ACE_TRY_ENV
);
-
}
-IR_ContainedSeq * TAO_IR_Container_Smart_Proxy_Base::lookup_name (
+IR_ContainedSeq * IR_Container::lookup_name (
const char * search_name,
CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
CORBA::Environment &ACE_TRY_ENV
)
@@ -5577,18 +5505,242 @@ IR_ContainedSeq * TAO_IR_Container_Smart_Proxy_Base::lookup_name (
CORBA::SystemException
))
{
- return this->base_proxy_->lookup_name (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).lookup_name (
+ this,
search_name,
levels_to_search,
limit_type,
exclude_inherited,
ACE_TRY_ENV
);
+}
+
+static const CORBA::Long _oc_IR_Container_Description[] =
+{
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x2f446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Container/Description:1.0
+ 12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = Description
+ 3, // member count
+ 17, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x645f6f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = contained_object
+ CORBA::tk_objref, // typecode kind
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
+ 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = IR_Contained
+
+ 5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
+ CORBA::tk_enum, // typecode kind
+ 632, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f44), ACE_NTOHL (0x6566696e), ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e4b696e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
+ 15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000), // name = DefinitionKind
+ 34, // member count
+ 8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500), // name = dk_none
+ 7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000), // name = dk_all
+ 13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0), // name = dk_Attribute
+ 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400), // name = dk_Constant
+ 13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Exception
+ 13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0), // name = dk_Interface
+ 10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000), // name = dk_Module
+ 13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Operation
+ 11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000), // name = dk_Typedef
+ 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0), // name = dk_Alias
+ 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000), // name = dk_Struct
+ 9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0), // name = dk_Union
+ 8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00), // name = dk_Enum
+ 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = dk_Primitive
+ 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = dk_String
+ 12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500), // name = dk_Sequence
+ 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0), // name = dk_Array
+ 14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000), // name = dk_Repository
+ 11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = dk_Wstring
+ 9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0), // name = dk_Fixed
+ 9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = dk_Value
+ 12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800), // name = dk_ValueBox
+ 15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000), // name = dk_ValueMember
+ 10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000), // name = dk_Native
+ 13, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = dk_Component
+ 8, ACE_NTOHL (0x646b5f48), ACE_NTOHL (0x6f6d6500), // name = dk_Home
+ 11, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = dk_Factory
+ 10, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72000000), // name = dk_Finder
+ 14, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79000000), // name = dk_PrimaryKey
+ 9, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x0), // name = dk_Emits
+ 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x0), // name = dk_Publishes
+ 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657300), // name = dk_Consumes
+ 12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
+ 8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
+
+ 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
+ CORBA::tk_any,
+
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_Container_Description (CORBA::tk_struct, sizeof (_oc_IR_Container_Description), (char *) &_oc_IR_Container_Description, 0, sizeof (IR_Container::Description));
+CORBA::TypeCode_ptr IR_Container::_tc_Description = &_tc_TAO_tc_IR_Container_Description;
+
+void IR_Container::Description::_tao_any_destructor (void *x)
+{
+ Description *tmp = ACE_static_cast (Description*,x);
+ delete tmp;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+ void
+ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
+ {
+ IR_Container::Description* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+ IR_Container::Description *old = ACE_reinterpret_cast (IR_Container::Description *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+
+ if (this->release_)
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (old);
+
+ }
+ this->buffer_ = tmp;
+ }
+
+ void
+ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+ IR_Container::Description *tmp = ACE_reinterpret_cast (IR_Container::Description *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+// *************************************************************
+// IR_Container::DescriptionSeq
+// *************************************************************
+IR_Container::DescriptionSeq::DescriptionSeq (void)
+{}
+IR_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
+ :
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_Container::Description>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+{}
+IR_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_Container::Description *buffer, CORBA::Boolean release)
+ :
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_Container::Description>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+{}
+IR_Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
+ :
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
+#else /* TAO_USE_SEQUENCE_TEMPLATES */
+ TAO_Unbounded_Sequence<IR_Container::Description>
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+{}
+IR_Container::DescriptionSeq::~DescriptionSeq (void) // dtor
+{}
+void IR_Container::DescriptionSeq::_tao_any_destructor (void *x)
+{
+ DescriptionSeq *tmp = ACE_static_cast (DescriptionSeq*,x);
+ delete tmp;
}
-IR_Container::DescriptionSeq * TAO_IR_Container_Smart_Proxy_Base::describe_contents (
- IR::DefinitionKind limit_type,
+static const CORBA::Long _oc_IR_Container_DescriptionSeq[] =
+{
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 44, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x2f446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/Container/DescriptionSeq:1.0
+ 15, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = DescriptionSeq
+ CORBA::tk_sequence, // typecode kind
+ 844, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ CORBA::tk_struct, // typecode kind
+ 828, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x2f446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Container/Description:1.0
+ 12, ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = Description
+ 3, // member count
+ 17, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x645f6f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = contained_object
+ CORBA::tk_objref, // typecode kind
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
+ 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = IR_Contained
+
+ 5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
+ CORBA::tk_enum, // typecode kind
+ 632, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f44), ACE_NTOHL (0x6566696e), ACE_NTOHL (0x6974696f), ACE_NTOHL (0x6e4b696e), ACE_NTOHL (0x643a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
+ 15, ACE_NTOHL (0x44656669), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x6f6e4b69), ACE_NTOHL (0x6e640000), // name = DefinitionKind
+ 34, // member count
+ 8, ACE_NTOHL (0x646b5f6e), ACE_NTOHL (0x6f6e6500), // name = dk_none
+ 7, ACE_NTOHL (0x646b5f61), ACE_NTOHL (0x6c6c0000), // name = dk_all
+ 13, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x0), // name = dk_Attribute
+ 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7400), // name = dk_Constant
+ 13, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Exception
+ 13, ACE_NTOHL (0x646b5f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x0), // name = dk_Interface
+ 10, ACE_NTOHL (0x646b5f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65000000), // name = dk_Module
+ 13, ACE_NTOHL (0x646b5f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = dk_Operation
+ 11, ACE_NTOHL (0x646b5f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65660000), // name = dk_Typedef
+ 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x0), // name = dk_Alias
+ 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74000000), // name = dk_Struct
+ 9, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x0), // name = dk_Union
+ 8, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6e756d00), // name = dk_Enum
+ 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x0), // name = dk_Primitive
+ 10, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67000000), // name = dk_String
+ 12, ACE_NTOHL (0x646b5f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636500), // name = dk_Sequence
+ 9, ACE_NTOHL (0x646b5f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x0), // name = dk_Array
+ 14, ACE_NTOHL (0x646b5f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79000000), // name = dk_Repository
+ 11, ACE_NTOHL (0x646b5f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = dk_Wstring
+ 9, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x0), // name = dk_Fixed
+ 9, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x0), // name = dk_Value
+ 12, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7800), // name = dk_ValueBox
+ 15, ACE_NTOHL (0x646b5f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65720000), // name = dk_ValueMember
+ 10, ACE_NTOHL (0x646b5f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65000000), // name = dk_Native
+ 13, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x0), // name = dk_Component
+ 8, ACE_NTOHL (0x646b5f48), ACE_NTOHL (0x6f6d6500), // name = dk_Home
+ 11, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72790000), // name = dk_Factory
+ 10, ACE_NTOHL (0x646b5f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72000000), // name = dk_Finder
+ 14, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79000000), // name = dk_PrimaryKey
+ 9, ACE_NTOHL (0x646b5f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x0), // name = dk_Emits
+ 13, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x0), // name = dk_Publishes
+ 12, ACE_NTOHL (0x646b5f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657300), // name = dk_Consumes
+ 12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
+ 8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
+
+ 6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
+ CORBA::tk_any,
+
+
+ 0U,
+
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_Container_DescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_Container_DescriptionSeq), (char *) &_oc_IR_Container_DescriptionSeq, 0, sizeof (IR_Container::DescriptionSeq));
+CORBA::TypeCode_ptr IR_Container::_tc_DescriptionSeq = &_tc_TAO_tc_IR_Container_DescriptionSeq;
+
+IR_Container::DescriptionSeq * IR_Container::describe_contents (
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
CORBA::Environment &ACE_TRY_ENV
@@ -5597,16 +5749,16 @@ IR_Container::DescriptionSeq * TAO_IR_Container_Smart_Proxy_Base::describe_conte
CORBA::SystemException
))
{
- return this->base_proxy_->describe_contents (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).describe_contents (
+ this,
limit_type,
exclude_inherited,
max_returned_objs,
ACE_TRY_ENV
);
-
}
-IR_ModuleDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_module (
+IR_ModuleDef_ptr IR_Container::create_module (
const char * id,
const char * name,
const char * version,
@@ -5616,16 +5768,16 @@ IR_ModuleDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_module (
CORBA::SystemException
))
{
- return this->base_proxy_->create_module (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_module (
+ this,
id,
name,
version,
ACE_TRY_ENV
);
-
}
-IR_ConstantDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_constant (
+IR_ConstantDef_ptr IR_Container::create_constant (
const char * id,
const char * name,
const char * version,
@@ -5637,7 +5789,8 @@ IR_ConstantDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_constant (
CORBA::SystemException
))
{
- return this->base_proxy_->create_constant (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_constant (
+ this,
id,
name,
version,
@@ -5645,10 +5798,9 @@ IR_ConstantDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_constant (
value,
ACE_TRY_ENV
);
-
}
-IR_StructDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_struct (
+IR_StructDef_ptr IR_Container::create_struct (
const char * id,
const char * name,
const char * version,
@@ -5659,17 +5811,17 @@ IR_StructDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_struct (
CORBA::SystemException
))
{
- return this->base_proxy_->create_struct (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_struct (
+ this,
id,
name,
version,
members,
ACE_TRY_ENV
);
-
}
-IR_UnionDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_union (
+IR_UnionDef_ptr IR_Container::create_union (
const char * id,
const char * name,
const char * version,
@@ -5681,7 +5833,8 @@ IR_UnionDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_union (
CORBA::SystemException
))
{
- return this->base_proxy_->create_union (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_union (
+ this,
id,
name,
version,
@@ -5689,10 +5842,9 @@ IR_UnionDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_union (
members,
ACE_TRY_ENV
);
-
}
-IR_EnumDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_enum (
+IR_EnumDef_ptr IR_Container::create_enum (
const char * id,
const char * name,
const char * version,
@@ -5703,17 +5855,17 @@ IR_EnumDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_enum (
CORBA::SystemException
))
{
- return this->base_proxy_->create_enum (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_enum (
+ this,
id,
name,
version,
members,
ACE_TRY_ENV
);
-
}
-IR_AliasDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_alias (
+IR_AliasDef_ptr IR_Container::create_alias (
const char * id,
const char * name,
const char * version,
@@ -5724,17 +5876,17 @@ IR_AliasDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_alias (
CORBA::SystemException
))
{
- return this->base_proxy_->create_alias (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_alias (
+ this,
id,
name,
version,
original_type,
ACE_TRY_ENV
);
-
}
-IR_InterfaceDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_interface (
+IR_InterfaceDef_ptr IR_Container::create_interface (
const char * id,
const char * name,
const char * version,
@@ -5747,7 +5899,8 @@ IR_InterfaceDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_interface (
CORBA::SystemException
))
{
- return this->base_proxy_->create_interface (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_interface (
+ this,
id,
name,
version,
@@ -5756,10 +5909,9 @@ IR_InterfaceDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_interface (
is_local,
ACE_TRY_ENV
);
-
}
-IR_ValueDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_value (
+IR_ValueDef_ptr IR_Container::create_value (
const char * id,
const char * name,
const char * version,
@@ -5776,7 +5928,8 @@ IR_ValueDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_value (
CORBA::SystemException
))
{
- return this->base_proxy_->create_value (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_value (
+ this,
id,
name,
version,
@@ -5789,10 +5942,9 @@ IR_ValueDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_value (
initializers,
ACE_TRY_ENV
);
-
}
-IR_ValueBoxDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_value_box (
+IR_ValueBoxDef_ptr IR_Container::create_value_box (
const char * id,
const char * name,
const char * version,
@@ -5803,17 +5955,17 @@ IR_ValueBoxDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_value_box (
CORBA::SystemException
))
{
- return this->base_proxy_->create_value_box (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_value_box (
+ this,
id,
name,
version,
original_type_def,
ACE_TRY_ENV
);
-
}
-IR_ExceptionDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_exception (
+IR_ExceptionDef_ptr IR_Container::create_exception (
const char * id,
const char * name,
const char * version,
@@ -5824,17 +5976,17 @@ IR_ExceptionDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_exception (
CORBA::SystemException
))
{
- return this->base_proxy_->create_exception (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_exception (
+ this,
id,
name,
version,
members,
ACE_TRY_ENV
);
-
}
-IR_NativeDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_native (
+IR_NativeDef_ptr IR_Container::create_native (
const char * id,
const char * name,
const char * version,
@@ -5844,22 +5996,15 @@ IR_NativeDef_ptr TAO_IR_Container_Smart_Proxy_Base::create_native (
CORBA::SystemException
))
{
- return this->base_proxy_->create_native (
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_native (
+ this,
id,
name,
version,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_Container_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_Container_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_Container[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -5871,71 +6016,34 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Container, &_tc_TAO_tc_IR_Container)
TAO_NAMESPACE_END
-void IR_IDLType::_tao_any_destructor (void *x)
-{
- IR_IDLType *tmp = ACE_static_cast (IR_IDLType*,x);
- CORBA::release (tmp);
-}
-IR_IDLType_ptr IR_IDLType::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_IDLType::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/IDLType:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_IDLType::_nil ());
- if (is_a == 0)
- return IR_IDLType::_nil ();
- return IR_IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_IDLType_ptr IR_IDLType::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_IDLType::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_IDLType_ptr default_proxy = IR_IDLType::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_IDLType_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_IDLType_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_IDLType (stub), IR_IDLType::_nil ());
- return TAO_IR_IDLType_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
+{}
-IR_IDLType_ptr
-IR_IDLType::_duplicate (IR_IDLType_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_IDLType_Remote_Proxy_Impl::_TAO_IDLType_Remote_Proxy_Impl (void)
+{}
-CORBA::TypeCode_ptr IR_IDLType::type (
- CORBA::Environment &ACE_TRY_ENV
+// Remote Implementation of the IDL interface methods
+
+CORBA::TypeCode_ptr _TAO_IDLType_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
-
+{
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_type",
@@ -5944,178 +6052,262 @@ CORBA::TypeCode_ptr IR_IDLType::type (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_IDLType::_interface_repository_id (void) const
+_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/IDLType:1.0";
}
-TAO_IR_IDLType_Default_Proxy_Factory::TAO_IR_IDLType_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_IDLType_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_IDLType_Default_Proxy_Factory::~TAO_IR_IDLType_Default_Proxy_Factory (void)
+_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
{
}
-IR_IDLType_ptr
-TAO_IR_IDLType_Default_Proxy_Factory::create_proxy (
- ::IR_IDLType_ptr proxy,
- CORBA::Environment &
- )
+_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_IDLType_Proxy_Factory_Adapter::TAO_IR_IDLType_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_IDLType_Proxy_Impl&
+_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
+ ::IR_IDLType *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_IDLType_Proxy_Factory_Adapter::~TAO_IR_IDLType_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_IDLType::IR_IDLType (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_IDLType_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_IDLType_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_IDLType::~IR_IDLType (void)
+{}
+
+void
+IR_IDLType::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_IDLType_Proxy_Broker_ =
+ _TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_IDLType_Proxy_Broker_ =
+ ::the_TAO_IDLType_Remote_Proxy_Broker ();
+
+ CORBA_IRObject::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_IDLType_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_IDLType::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ IR_IDLType *tmp = ACE_static_cast (IR_IDLType*,x);
+ CORBA::release (tmp);
+}
+
+IR_IDLType_ptr IR_IDLType::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+{
+ if (CORBA::is_nil (obj))
+ return IR_IDLType::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/IDLType:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_IDLType::_nil ());
+ if (is_a == 0)
+ return IR_IDLType::_nil ();
}
-return 0;
+ return IR_IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_IDLType_ptr
-TAO_IR_IDLType_Proxy_Factory_Adapter::create_proxy (
- ::IR_IDLType_ptr proxy,
+IR_IDLType_ptr IR_IDLType::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_IDLType_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_IDLType::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_IDLType_ptr default_proxy = IR_IDLType::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_IDLType_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_IDLType (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_IDLType::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_IDLType (stub, 0, obj->_servant ()), IR_IDLType::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_IDLType_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_IDLType::_narrow
+ )
+ )
+ );
}
-TAO_IR_IDLType_Smart_Proxy_Base::TAO_IR_IDLType_Smart_Proxy_Base (::IR_IDLType_ptr proxy)
-: base_proxy_ (proxy)
+IR_IDLType_ptr
+IR_IDLType::_duplicate (IR_IDLType_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_IDLType_Smart_Proxy_Base::~TAO_IR_IDLType_Smart_Proxy_Base (void)
+CORBA::Boolean IR_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_IDLType_Smart_Proxy_Base::_stubobj (void) const
+void *IR_IDLType::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_IDLType::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/IDLType:1.0";
}
-CORBA::TypeCode_ptr TAO_IR_IDLType_Smart_Proxy_Base::type (
- CORBA::Environment &ACE_TRY_ENV
+CORBA::TypeCode_ptr IR_IDLType::type (
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->type (
+
+ return this->the_TAO_IDLType_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
+ this,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_IDLType_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_IDLType_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_IDLType[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -6156,60 +6348,26 @@ static const CORBA::Long _oc_IR_PrimitiveKind[] =
11, ACE_NTOHL (0x706b5f77), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = pk_wstring
14, ACE_NTOHL (0x706b5f76), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x5f626173), ACE_NTOHL (0x65000000), // name = pk_value_base
};
-static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveKind (CORBA::tk_enum, sizeof (_oc_IR_PrimitiveKind), (char *) &_oc_IR_PrimitiveKind, 0, sizeof (IR::PrimitiveKind));
+static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveKind (CORBA::tk_enum, sizeof (_oc_IR_PrimitiveKind), (char *) &_oc_IR_PrimitiveKind, 0, sizeof (IR_PrimitiveKind));
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveKind, &_tc_TAO_tc_IR_PrimitiveKind)
TAO_NAMESPACE_END
-void IR_Repository::_tao_any_destructor (void *x)
-{
- IR_Repository *tmp = ACE_static_cast (IR_Repository*,x);
- CORBA::release (tmp);
-}
-IR_Repository_ptr IR_Repository::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_Repository::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Repository:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_Repository::_nil ());
- if (is_a == 0)
- return IR_Repository::_nil ();
- return IR_Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_Repository_ptr IR_Repository::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_Repository::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_Repository_ptr default_proxy = IR_Repository::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_Repository_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_Repository_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_Repository (stub), IR_Repository::_nil ());
- return TAO_IR_Repository_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
+{}
-IR_Repository_ptr
-IR_Repository::_duplicate (IR_Repository_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (void)
+{}
-IR_Contained_ptr IR_Repository::lookup_id (
+// Remote Implementation of the IDL interface methods
+
+IR_Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
+ CORBA_Object *_collocated_tao_target_,
const char * search_id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -6217,16 +6375,13 @@ IR_Contained_ptr IR_Repository::lookup_id (
CORBA::SystemException
))
{
-
IR_Contained_ptr _tao_retval = IR_Contained::_nil ();
IR_Contained_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"lookup_id",
@@ -6235,48 +6390,62 @@ IR_Contained_ptr IR_Repository::lookup_id (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << search_id)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode (
+CORBA::TypeCode_ptr _TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
+ CORBA_Object *_collocated_tao_target_,
CORBA::TypeCode_ptr tc,
CORBA::Environment &ACE_TRY_ENV
)
@@ -6284,16 +6453,13 @@ CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode (
CORBA::SystemException
))
{
-
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"get_canonical_typecode",
@@ -6306,61 +6472,72 @@ CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- ACE_CHECK_RETURN (0);
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << tc)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_PrimitiveDef_ptr IR_Repository::get_primitive (
- IR::PrimitiveKind kind,
+IR_PrimitiveDef_ptr _TAO_Repository_Remote_Proxy_Impl::get_primitive (
+ CORBA_Object *_collocated_tao_target_,
+ IR_PrimitiveKind kind,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
IR_PrimitiveDef_ptr _tao_retval = IR_PrimitiveDef::_nil ();
IR_PrimitiveDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"get_primitive",
@@ -6373,43 +6550,58 @@ IR_PrimitiveDef_ptr IR_Repository::get_primitive (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << kind)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_StringDef_ptr IR_Repository::create_string (
+IR_StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -6417,16 +6609,13 @@ IR_StringDef_ptr IR_Repository::create_string (
CORBA::SystemException
))
{
-
IR_StringDef_ptr _tao_retval = IR_StringDef::_nil ();
IR_StringDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_string",
@@ -6439,43 +6628,58 @@ IR_StringDef_ptr IR_Repository::create_string (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << bound)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_WstringDef_ptr IR_Repository::create_wstring (
+IR_WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -6483,16 +6687,13 @@ IR_WstringDef_ptr IR_Repository::create_wstring (
CORBA::SystemException
))
{
-
IR_WstringDef_ptr _tao_retval = IR_WstringDef::_nil ();
IR_WstringDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_wstring",
@@ -6501,48 +6702,62 @@ IR_WstringDef_ptr IR_Repository::create_wstring (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << bound)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_SequenceDef_ptr IR_Repository::create_sequence (
+IR_SequenceDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_sequence (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
IR_IDLType_ptr element_type,
CORBA::Environment &ACE_TRY_ENV
@@ -6551,16 +6766,13 @@ IR_SequenceDef_ptr IR_Repository::create_sequence (
CORBA::SystemException
))
{
-
IR_SequenceDef_ptr _tao_retval = IR_SequenceDef::_nil ();
IR_SequenceDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_sequence",
@@ -6569,49 +6781,63 @@ IR_SequenceDef_ptr IR_Repository::create_sequence (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << bound) &&
(_tao_out << element_type)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ArrayDef_ptr IR_Repository::create_array (
+IR_ArrayDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_array (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong length,
IR_IDLType_ptr element_type,
CORBA::Environment &ACE_TRY_ENV
@@ -6620,16 +6846,13 @@ IR_ArrayDef_ptr IR_Repository::create_array (
CORBA::SystemException
))
{
-
IR_ArrayDef_ptr _tao_retval = IR_ArrayDef::_nil ();
IR_ArrayDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_array",
@@ -6638,49 +6861,63 @@ IR_ArrayDef_ptr IR_Repository::create_array (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << length) &&
(_tao_out << element_type)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_FixedDef_ptr IR_Repository::create_fixed (
+IR_FixedDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_fixed (
+ CORBA_Object *_collocated_tao_target_,
CORBA::UShort digits,
CORBA::Short scale,
CORBA::Environment &ACE_TRY_ENV
@@ -6689,16 +6926,13 @@ IR_FixedDef_ptr IR_Repository::create_fixed (
CORBA::SystemException
))
{
-
IR_FixedDef_ptr _tao_retval = IR_FixedDef::_nil ();
IR_FixedDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_fixed",
@@ -6707,182 +6941,288 @@ IR_FixedDef_ptr IR_Repository::create_fixed (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << digits) &&
(_tao_out << scale)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_Repository_Proxy_Broker::_TAO_Repository_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Repository:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_Repository::_interface_repository_id (void) const
+_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/Repository:1.0";
}
-TAO_IR_Repository_Default_Proxy_Factory::TAO_IR_Repository_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_Repository_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_Repository_Default_Proxy_Factory::~TAO_IR_Repository_Default_Proxy_Factory (void)
+_TAO_Repository_Remote_Proxy_Broker::_TAO_Repository_Remote_Proxy_Broker (void)
{
}
-IR_Repository_ptr
-TAO_IR_Repository_Default_Proxy_Factory::create_proxy (
- ::IR_Repository_ptr proxy,
- CORBA::Environment &
- )
+_TAO_Repository_Remote_Proxy_Broker::~_TAO_Repository_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_Repository_Proxy_Factory_Adapter::TAO_IR_Repository_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_Repository_Proxy_Impl&
+_TAO_Repository_Remote_Proxy_Broker::select_proxy (
+ ::IR_Repository *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_Repository_Proxy_Factory_Adapter::~TAO_IR_Repository_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_Repository::IR_Repository (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_Repository_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_Repository_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_Repository::~IR_Repository (void)
+{}
+
+void
+IR_Repository::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_Repository_Proxy_Broker_ =
+ _TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_Repository_Proxy_Broker_ =
+ ::the_TAO_Repository_Remote_Proxy_Broker ();
+
+ IR_Container::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_Repository_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_Repository::_tao_any_destructor (void *x)
+{
+ IR_Repository *tmp = ACE_static_cast (IR_Repository*,x);
+ CORBA::release (tmp);
+}
+
+IR_Repository_ptr IR_Repository::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_Repository::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Repository:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_Repository::_nil ());
+ if (is_a == 0)
+ return IR_Repository::_nil ();
}
-return 0;
+ return IR_Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_Repository_ptr
-TAO_IR_Repository_Proxy_Factory_Adapter::create_proxy (
- ::IR_Repository_ptr proxy,
+IR_Repository_ptr IR_Repository::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_Repository_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_Repository::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_Repository_ptr default_proxy = IR_Repository::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_Repository_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_Repository (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_Repository::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_Repository (stub, 0, obj->_servant ()), IR_Repository::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_Repository_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_Repository::_narrow
+ )
+ )
+ );
}
-TAO_IR_Repository_Smart_Proxy_Base::TAO_IR_Repository_Smart_Proxy_Base (::IR_Repository_ptr proxy)
-: base_proxy_ (proxy)
+IR_Repository_ptr
+IR_Repository::_duplicate (IR_Repository_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_Repository_Smart_Proxy_Base::~TAO_IR_Repository_Smart_Proxy_Base (void)
+CORBA::Boolean IR_Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Repository:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_Repository_Smart_Proxy_Base::_stubobj (void) const
+void *IR_Repository::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Repository::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_Repository::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/Repository:1.0";
}
-IR_Contained_ptr TAO_IR_Repository_Smart_Proxy_Base::lookup_id (
- const char * search_id,
+IR_Contained_ptr IR_Repository::lookup_id (
+ const char * search_id,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->lookup_id (
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).lookup_id (
+ this,
search_id,
ACE_TRY_ENV
);
-
}
-CORBA::TypeCode_ptr TAO_IR_Repository_Smart_Proxy_Base::get_canonical_typecode (
+CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode (
CORBA::TypeCode_ptr tc,
CORBA::Environment &ACE_TRY_ENV
)
@@ -6890,29 +7230,29 @@ CORBA::TypeCode_ptr TAO_IR_Repository_Smart_Proxy_Base::get_canonical_typecode
CORBA::SystemException
))
{
- return this->base_proxy_->get_canonical_typecode (
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).get_canonical_typecode (
+ this,
tc,
ACE_TRY_ENV
);
-
}
-IR_PrimitiveDef_ptr TAO_IR_Repository_Smart_Proxy_Base::get_primitive (
- IR::PrimitiveKind kind,
+IR_PrimitiveDef_ptr IR_Repository::get_primitive (
+ IR_PrimitiveKind kind,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->get_primitive (
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).get_primitive (
+ this,
kind,
ACE_TRY_ENV
);
-
}
-IR_StringDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_string (
+IR_StringDef_ptr IR_Repository::create_string (
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -6920,14 +7260,14 @@ IR_StringDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_string (
CORBA::SystemException
))
{
- return this->base_proxy_->create_string (
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_string (
+ this,
bound,
ACE_TRY_ENV
);
-
}
-IR_WstringDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_wstring (
+IR_WstringDef_ptr IR_Repository::create_wstring (
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -6935,14 +7275,14 @@ IR_WstringDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_wstring (
CORBA::SystemException
))
{
- return this->base_proxy_->create_wstring (
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_wstring (
+ this,
bound,
ACE_TRY_ENV
);
-
}
-IR_SequenceDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_sequence (
+IR_SequenceDef_ptr IR_Repository::create_sequence (
CORBA::ULong bound,
IR_IDLType_ptr element_type,
CORBA::Environment &ACE_TRY_ENV
@@ -6951,15 +7291,15 @@ IR_SequenceDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_sequence (
CORBA::SystemException
))
{
- return this->base_proxy_->create_sequence (
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_sequence (
+ this,
bound,
element_type,
ACE_TRY_ENV
);
-
}
-IR_ArrayDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_array (
+IR_ArrayDef_ptr IR_Repository::create_array (
CORBA::ULong length,
IR_IDLType_ptr element_type,
CORBA::Environment &ACE_TRY_ENV
@@ -6968,15 +7308,15 @@ IR_ArrayDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_array (
CORBA::SystemException
))
{
- return this->base_proxy_->create_array (
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_array (
+ this,
length,
element_type,
ACE_TRY_ENV
);
-
}
-IR_FixedDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_fixed (
+IR_FixedDef_ptr IR_Repository::create_fixed (
CORBA::UShort digits,
CORBA::Short scale,
CORBA::Environment &ACE_TRY_ENV
@@ -6985,21 +7325,14 @@ IR_FixedDef_ptr TAO_IR_Repository_Smart_Proxy_Base::create_fixed (
CORBA::SystemException
))
{
- return this->base_proxy_->create_fixed (
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_fixed (
+ this,
digits,
scale,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_Repository_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_Repository_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_Repository[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -7011,55 +7344,21 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Repository, &_tc_TAO_tc_IR_Repository)
TAO_NAMESPACE_END
-void IR_ComponentRepository::_tao_any_destructor (void *x)
-{
- IR_ComponentRepository *tmp = ACE_static_cast (IR_ComponentRepository*,x);
- CORBA::release (tmp);
-}
-IR_ComponentRepository_ptr IR_ComponentRepository::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ComponentRepository::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ComponentRepository::_nil ());
- if (is_a == 0)
- return IR_ComponentRepository::_nil ();
- return IR_ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ComponentRepository_ptr IR_ComponentRepository::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ComponentRepository::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ComponentRepository_ptr default_proxy = IR_ComponentRepository::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ComponentRepository_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ComponentRepository_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ComponentRepository (stub), IR_ComponentRepository::_nil ());
- return TAO_IR_ComponentRepository_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_Proxy_Impl (void)
+{}
-IR_ComponentRepository_ptr
-IR_ComponentRepository::_duplicate (IR_ComponentRepository_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_Proxy_Impl (void)
+{}
-IR_ComponentDef_ptr IR_ComponentRepository::create_component (
+// Remote Implementation of the IDL interface methods
+
+IR_ComponentDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -7071,16 +7370,13 @@ IR_ComponentDef_ptr IR_ComponentRepository::create_component (
CORBA::SystemException
))
{
-
IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
IR_ComponentDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_component",
@@ -7093,13 +7389,15 @@ IR_ComponentDef_ptr IR_ComponentRepository::create_component (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -7108,32 +7406,45 @@ IR_ComponentDef_ptr IR_ComponentRepository::create_component (
(_tao_out << base_component) &&
(_tao_out << supports_interfaces)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_HomeDef_ptr IR_ComponentRepository::create_home (
+IR_HomeDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -7146,16 +7457,13 @@ IR_HomeDef_ptr IR_ComponentRepository::create_home (
CORBA::SystemException
))
{
-
IR_HomeDef_ptr _tao_retval = IR_HomeDef::_nil ();
IR_HomeDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_home",
@@ -7168,13 +7476,15 @@ IR_HomeDef_ptr IR_ComponentRepository::create_home (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -7184,151 +7494,268 @@ IR_HomeDef_ptr IR_ComponentRepository::create_home (
(_tao_out << managed_component) &&
(_tao_out << primary_key)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_ComponentRepository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Repository:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ComponentRepository::_interface_repository_id (void) const
+_TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ComponentRepository:1.0";
}
-TAO_IR_ComponentRepository_Default_Proxy_Factory::TAO_IR_ComponentRepository_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ComponentRepository_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ComponentRepository_Default_Proxy_Factory::~TAO_IR_ComponentRepository_Default_Proxy_Factory (void)
+_TAO_ComponentRepository_Remote_Proxy_Broker::_TAO_ComponentRepository_Remote_Proxy_Broker (void)
{
}
-IR_ComponentRepository_ptr
-TAO_IR_ComponentRepository_Default_Proxy_Factory::create_proxy (
- ::IR_ComponentRepository_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_ComponentRepository_Proxy_Factory_Adapter::TAO_IR_ComponentRepository_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_ComponentRepository_Proxy_Impl&
+_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
+ ::IR_ComponentRepository *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ComponentRepository_Proxy_Factory_Adapter::~TAO_IR_ComponentRepository_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ComponentRepository::IR_ComponentRepository (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_ComponentRepository_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ComponentRepository_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_ComponentRepository::~IR_ComponentRepository (void)
+{}
+
+void
+IR_ComponentRepository::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_ComponentRepository_Proxy_Broker_ =
+ _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ComponentRepository_Proxy_Broker_ =
+ ::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
+
+ IR_Repository::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_ComponentRepository_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_ComponentRepository::_tao_any_destructor (void *x)
+{
+ IR_ComponentRepository *tmp = ACE_static_cast (IR_ComponentRepository*,x);
+ CORBA::release (tmp);
+}
+
+IR_ComponentRepository_ptr IR_ComponentRepository::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_ComponentRepository::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ComponentRepository::_nil ());
+ if (is_a == 0)
+ return IR_ComponentRepository::_nil ();
}
-return 0;
+ return IR_ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ComponentRepository_ptr
-TAO_IR_ComponentRepository_Proxy_Factory_Adapter::create_proxy (
- ::IR_ComponentRepository_ptr proxy,
+IR_ComponentRepository_ptr IR_ComponentRepository::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ComponentRepository_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ComponentRepository::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ComponentRepository_ptr default_proxy = IR_ComponentRepository::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ComponentRepository (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ComponentRepository::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ComponentRepository (stub, 0, obj->_servant ()), IR_ComponentRepository::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ComponentRepository_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ComponentRepository::_narrow
+ )
+ )
+ );
}
-TAO_IR_ComponentRepository_Smart_Proxy_Base::TAO_IR_ComponentRepository_Smart_Proxy_Base (::IR_ComponentRepository_ptr proxy)
-: base_proxy_ (proxy)
+IR_ComponentRepository_ptr
+IR_ComponentRepository::_duplicate (IR_ComponentRepository_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ComponentRepository_Smart_Proxy_Base::~TAO_IR_ComponentRepository_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ComponentRepository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Repository:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ComponentRepository::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Repository::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Repository_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_ComponentRepository_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_ComponentRepository::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ComponentRepository:1.0";
}
-IR_ComponentDef_ptr TAO_IR_ComponentRepository_Smart_Proxy_Base::create_component (
+IR_ComponentDef_ptr IR_ComponentRepository::create_component (
const char * id,
const char * name,
const char * version,
@@ -7340,7 +7767,8 @@ IR_ComponentDef_ptr TAO_IR_ComponentRepository_Smart_Proxy_Base::create_componen
CORBA::SystemException
))
{
- return this->base_proxy_->create_component (
+ return this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_component (
+ this,
id,
name,
version,
@@ -7348,10 +7776,9 @@ IR_ComponentDef_ptr TAO_IR_ComponentRepository_Smart_Proxy_Base::create_componen
supports_interfaces,
ACE_TRY_ENV
);
-
}
-IR_HomeDef_ptr TAO_IR_ComponentRepository_Smart_Proxy_Base::create_home (
+IR_HomeDef_ptr IR_ComponentRepository::create_home (
const char * id,
const char * name,
const char * version,
@@ -7363,8 +7790,9 @@ IR_HomeDef_ptr TAO_IR_ComponentRepository_Smart_Proxy_Base::create_home (
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->create_home (
+{
+ return this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_home (
+ this,
id,
name,
version,
@@ -7373,16 +7801,8 @@ IR_HomeDef_ptr TAO_IR_ComponentRepository_Smart_Proxy_Base::create_home (
primary_key,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ComponentRepository_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ComponentRepository_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ComponentRepository[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -7394,6 +7814,94 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentRepository, &_tc_TAO_tc_IR_ComponentRepository)
TAO_NAMESPACE_END
+
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
+
+_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
+{}
+
+_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
+{
+}
+
+_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
+{
+}
+
+// Factory function Implementation.
+_TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void)
+{
+ static ::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+}
+
+_TAO_ModuleDef_Remote_Proxy_Broker::_TAO_ModuleDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_ModuleDef_Remote_Proxy_Broker::~_TAO_ModuleDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_ModuleDef_Proxy_Impl&
+_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ModuleDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
+{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
+}
+
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ModuleDef::IR_ModuleDef (int collocated)
+{
+ this->_tao_setup_collocation (collocated);
+}
+
+// destructor
+IR_ModuleDef::~IR_ModuleDef (void)
+{}
+
+void
+IR_ModuleDef::_tao_setup_collocation (int collocated)
+{
+ if (collocated)
+ this->the_TAO_ModuleDef_Proxy_Broker_ =
+ _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ModuleDef_Proxy_Broker_ =
+ ::the_TAO_ModuleDef_Remote_Proxy_Broker ();
+
+ IR_Container::_tao_setup_collocation (collocated);
+ IR_Contained::_tao_setup_collocation (collocated);
+
+}
+
void IR_ModuleDef::_tao_any_destructor (void *x)
{
IR_ModuleDef *tmp = ACE_static_cast (IR_ModuleDef*,x);
@@ -7407,10 +7915,13 @@ IR_ModuleDef_ptr IR_ModuleDef::_narrow (
{
if (CORBA::is_nil (obj))
return IR_ModuleDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ModuleDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ModuleDef::_nil ());
- if (is_a == 0)
- return IR_ModuleDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ModuleDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ModuleDef::_nil ());
+ if (is_a == 0)
+ return IR_ModuleDef::_nil ();
+ }
return IR_ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
@@ -7421,17 +7932,46 @@ IR_ModuleDef_ptr IR_ModuleDef::_unchecked_narrow (
{
if (CORBA::is_nil (obj))
return IR_ModuleDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ModuleDef_ptr default_proxy = IR_ModuleDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ModuleDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ModuleDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ModuleDef (stub), IR_ModuleDef::_nil ());
- return TAO_IR_ModuleDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ModuleDef_ptr default_proxy = IR_ModuleDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ModuleDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ModuleDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ModuleDef (stub, 0, obj->_servant ()), IR_ModuleDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ModuleDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ModuleDef::_narrow
+ )
+ )
+ );
}
IR_ModuleDef_ptr
@@ -7455,119 +7995,63 @@ CORBA::Boolean IR_ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ModuleDef::_interface_repository_id (void) const
-{
- return "IDL:omg.org/IR/ModuleDef:1.0";
-}
-
-TAO_IR_ModuleDef_Default_Proxy_Factory::TAO_IR_ModuleDef_Default_Proxy_Factory (int register_proxy_factory)
-{
- if (register_proxy_factory)
- {
- TAO_IR_ModuleDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
-
-TAO_IR_ModuleDef_Default_Proxy_Factory::~TAO_IR_ModuleDef_Default_Proxy_Factory (void)
-{
-}
-
-IR_ModuleDef_ptr
-TAO_IR_ModuleDef_Default_Proxy_Factory::create_proxy (
- ::IR_ModuleDef_ptr proxy,
- CORBA::Environment &
- )
-{
- return proxy;
-}
-
-TAO_IR_ModuleDef_Proxy_Factory_Adapter::TAO_IR_ModuleDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
-{
-}
-
-TAO_IR_ModuleDef_Proxy_Factory_Adapter::~TAO_IR_ModuleDef_Proxy_Factory_Adapter (void)
-{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
-}
-
-int
-TAO_IR_ModuleDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ModuleDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
-}
-
-int
-TAO_IR_ModuleDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
-}
-
-IR_ModuleDef_ptr
-TAO_IR_ModuleDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ModuleDef_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ModuleDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
-}
-
-TAO_IR_ModuleDef_Smart_Proxy_Base::TAO_IR_ModuleDef_Smart_Proxy_Base (::IR_ModuleDef_ptr proxy)
-: base_proxy_ (proxy)
-{
-}
-
-TAO_IR_ModuleDef_Smart_Proxy_Base::~TAO_IR_ModuleDef_Smart_Proxy_Base (void)
-{
+void *IR_ModuleDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ModuleDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_ModuleDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_ModuleDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ModuleDef:1.0";
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ModuleDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ModuleDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ModuleDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -7579,56 +8063,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDef, &_tc_TAO_tc_IR_ModuleDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ModuleDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ModuleDescription:1.0
- 18, ACE_NTOHL (0x4d6f6475), ACE_NTOHL (0x6c654465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000), // name = IR_ModuleDescription
+ 18, ACE_NTOHL (0x4d6f6475), ACE_NTOHL (0x6c654465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000), // name = ModuleDescription
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -7636,7 +8103,7 @@ static const CORBA::Long _oc_IR_ModuleDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
};
@@ -7645,77 +8112,40 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDescription, &_tc_TAO_tc_IR_ModuleDescription)
TAO_NAMESPACE_END
+
void IR_ModuleDescription::_tao_any_destructor (void *x)
{
IR_ModuleDescription *tmp = ACE_static_cast (IR_ModuleDescription*,x);
delete tmp;
}
-void IR_ConstantDef::_tao_any_destructor (void *x)
-{
- IR_ConstantDef *tmp = ACE_static_cast (IR_ConstantDef*,x);
- CORBA::release (tmp);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ConstantDef_ptr IR_ConstantDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ConstantDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConstantDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ConstantDef::_nil ());
- if (is_a == 0)
- return IR_ConstantDef::_nil ();
- return IR_ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_Proxy_Impl (void)
+{}
-IR_ConstantDef_ptr IR_ConstantDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ConstantDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ConstantDef_ptr default_proxy = IR_ConstantDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ConstantDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ConstantDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ConstantDef (stub), IR_ConstantDef::_nil ());
- return TAO_IR_ConstantDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ConstantDef_Remote_Proxy_Impl::_TAO_ConstantDef_Remote_Proxy_Impl (void)
+{}
-IR_ConstantDef_ptr
-IR_ConstantDef::_duplicate (IR_ConstantDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+// Remote Implementation of the IDL interface methods
-CORBA::TypeCode_ptr IR_ConstantDef::type (
+CORBA::TypeCode_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_type",
@@ -7728,53 +8158,61 @@ CORBA::TypeCode_ptr IR_ConstantDef::type (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_IDLType_ptr IR_ConstantDef::type_def (
+IR_IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_type_def",
@@ -7783,42 +8221,52 @@ IR_IDLType_ptr IR_ConstantDef::type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ConstantDef::type_def (
+void _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -7826,15 +8274,11 @@ void IR_ConstantDef::type_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_type_def",
@@ -7843,56 +8287,62 @@ void IR_ConstantDef::type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << type_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
}
-CORBA::Any * IR_ConstantDef::value (
+CORBA::Any * _TAO_ConstantDef_Remote_Proxy_Impl::value (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
CORBA::Any *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
CORBA::Any_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -7903,42 +8353,52 @@ CORBA::Any * IR_ConstantDef::value (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ConstantDef::value (
+void _TAO_ConstantDef_Remote_Proxy_Impl::value (
+ CORBA_Object *_collocated_tao_target_,
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
@@ -7946,15 +8406,11 @@ void IR_ConstantDef::value (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_value",
@@ -7963,185 +8419,285 @@ void IR_ConstantDef::value (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
ACE_CHECK;
-
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+ ACE_CHECK;
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << value)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ConstantDef_Proxy_Broker::_TAO_ConstantDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConstantDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ConstantDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ConstantDef:1.0";
+ static ::_TAO_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ConstantDef_Default_Proxy_Factory::TAO_IR_ConstantDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_ConstantDef_Remote_Proxy_Broker::_TAO_ConstantDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ConstantDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_ConstantDef_Default_Proxy_Factory::~TAO_IR_ConstantDef_Default_Proxy_Factory (void)
+_TAO_ConstantDef_Remote_Proxy_Broker::~_TAO_ConstantDef_Remote_Proxy_Broker (void)
{
}
-IR_ConstantDef_ptr
-TAO_IR_ConstantDef_Default_Proxy_Factory::create_proxy (
- ::IR_ConstantDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ConstantDef_Proxy_Impl&
+_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ConstantDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ConstantDef_Proxy_Factory_Adapter::TAO_IR_ConstantDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ConstantDef::IR_ConstantDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_ConstantDef_Proxy_Factory_Adapter::~TAO_IR_ConstantDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_ConstantDef::~IR_ConstantDef (void)
+{}
+
+void
+IR_ConstantDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_ConstantDef_Proxy_Broker_ =
+ _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ConstantDef_Proxy_Broker_ =
+ ::the_TAO_ConstantDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_ConstantDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ConstantDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_ConstantDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_ConstantDef *tmp = ACE_static_cast (IR_ConstantDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_ConstantDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_ConstantDef_ptr IR_ConstantDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_ConstantDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConstantDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ConstantDef::_nil ());
+ if (is_a == 0)
+ return IR_ConstantDef::_nil ();
}
-return 0;
+ return IR_ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ConstantDef_ptr
-TAO_IR_ConstantDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ConstantDef_ptr proxy,
+IR_ConstantDef_ptr IR_ConstantDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ConstantDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ConstantDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ConstantDef_ptr default_proxy = IR_ConstantDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ConstantDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ConstantDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ConstantDef (stub, 0, obj->_servant ()), IR_ConstantDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ConstantDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ConstantDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_ConstantDef_Smart_Proxy_Base::TAO_IR_ConstantDef_Smart_Proxy_Base (::IR_ConstantDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_ConstantDef_ptr
+IR_ConstantDef::_duplicate (IR_ConstantDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ConstantDef_Smart_Proxy_Base::~TAO_IR_ConstantDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConstantDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_ConstantDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ConstantDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_ConstantDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_ConstantDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ConstantDef:1.0";
}
-CORBA::TypeCode_ptr TAO_IR_ConstantDef_Smart_Proxy_Base::type (
+CORBA::TypeCode_ptr IR_ConstantDef::type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
-{
- return this->base_proxy_->type (
+{
+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
+ this,
ACE_TRY_ENV
);
-
}
-IR_IDLType_ptr TAO_IR_ConstantDef_Smart_Proxy_Base::type_def (
+IR_IDLType_ptr IR_ConstantDef::type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->type_def (
+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ConstantDef_Smart_Proxy_Base::type_def (
+void IR_ConstantDef::type_def (
IR_IDLType_ptr type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -8149,27 +8705,27 @@ void TAO_IR_ConstantDef_Smart_Proxy_Base::type_def (
CORBA::SystemException
))
{
- this->base_proxy_->type_def (
+ this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
+ this,
type_def,
ACE_TRY_ENV
);
-
}
-CORBA::Any * TAO_IR_ConstantDef_Smart_Proxy_Base::value (
+CORBA::Any * IR_ConstantDef::value (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->value (
+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).value (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ConstantDef_Smart_Proxy_Base::value (
+void IR_ConstantDef::value (
const CORBA::Any & value,
CORBA::Environment &ACE_TRY_ENV
)
@@ -8177,20 +8733,13 @@ void TAO_IR_ConstantDef_Smart_Proxy_Base::value (
CORBA::SystemException
))
{
- this->base_proxy_->value (
+ this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).value (
+ this,
value,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ConstantDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ConstantDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ConstantDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -8202,56 +8751,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDef, &_tc_TAO_tc_IR_ConstantDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ConstantDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7444), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ConstantDescription:1.0
- 20, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x74616e74), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = IR_ConstantDescription
+ 20, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x74616e74), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = ConstantDescription
6, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -8259,7 +8791,7 @@ static const CORBA::Long _oc_IR_ConstantDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -8274,12 +8806,101 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDescription, &_tc_TAO_tc_IR_ConstantDescription)
TAO_NAMESPACE_END
+
void IR_ConstantDescription::_tao_any_destructor (void *x)
{
IR_ConstantDescription *tmp = ACE_static_cast (IR_ConstantDescription*,x);
delete tmp;
}
+
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
+
+_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_Proxy_Impl (void)
+{}
+
+_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
+{
+}
+
+_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
+{
+}
+
+// Factory function Implementation.
+_TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void)
+{
+ static ::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+}
+
+_TAO_TypedefDef_Remote_Proxy_Broker::_TAO_TypedefDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_TypedefDef_Remote_Proxy_Broker::~_TAO_TypedefDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_TypedefDef_Proxy_Impl&
+_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_TypedefDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
+{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
+}
+
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_TypedefDef::IR_TypedefDef (int collocated)
+{
+ this->_tao_setup_collocation (collocated);
+}
+
+// destructor
+IR_TypedefDef::~IR_TypedefDef (void)
+{}
+
+void
+IR_TypedefDef::_tao_setup_collocation (int collocated)
+{
+ if (collocated)
+ this->the_TAO_TypedefDef_Proxy_Broker_ =
+ _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_TypedefDef_Proxy_Broker_ =
+ ::the_TAO_TypedefDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+ IR_IDLType::_tao_setup_collocation (collocated);
+
+}
+
void IR_TypedefDef::_tao_any_destructor (void *x)
{
IR_TypedefDef *tmp = ACE_static_cast (IR_TypedefDef*,x);
@@ -8293,10 +8914,13 @@ IR_TypedefDef_ptr IR_TypedefDef::_narrow (
{
if (CORBA::is_nil (obj))
return IR_TypedefDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/TypedefDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_TypedefDef::_nil ());
- if (is_a == 0)
- return IR_TypedefDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/TypedefDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_TypedefDef::_nil ());
+ if (is_a == 0)
+ return IR_TypedefDef::_nil ();
+ }
return IR_TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
@@ -8307,17 +8931,46 @@ IR_TypedefDef_ptr IR_TypedefDef::_unchecked_narrow (
{
if (CORBA::is_nil (obj))
return IR_TypedefDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_TypedefDef_ptr default_proxy = IR_TypedefDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_TypedefDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_TypedefDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_TypedefDef (stub), IR_TypedefDef::_nil ());
- return TAO_IR_TypedefDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_TypedefDef_ptr default_proxy = IR_TypedefDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_TypedefDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_TypedefDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_TypedefDef (stub, 0, obj->_servant ()), IR_TypedefDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_TypedefDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_TypedefDef::_narrow
+ )
+ )
+ );
}
IR_TypedefDef_ptr
@@ -8341,119 +8994,63 @@ CORBA::Boolean IR_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environmen
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_TypedefDef::_interface_repository_id (void) const
-{
- return "IDL:omg.org/IR/TypedefDef:1.0";
-}
-
-TAO_IR_TypedefDef_Default_Proxy_Factory::TAO_IR_TypedefDef_Default_Proxy_Factory (int register_proxy_factory)
-{
- if (register_proxy_factory)
- {
- TAO_IR_TypedefDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
-
-TAO_IR_TypedefDef_Default_Proxy_Factory::~TAO_IR_TypedefDef_Default_Proxy_Factory (void)
-{
-}
-
-IR_TypedefDef_ptr
-TAO_IR_TypedefDef_Default_Proxy_Factory::create_proxy (
- ::IR_TypedefDef_ptr proxy,
- CORBA::Environment &
- )
-{
- return proxy;
-}
-
-TAO_IR_TypedefDef_Proxy_Factory_Adapter::TAO_IR_TypedefDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
-{
-}
-
-TAO_IR_TypedefDef_Proxy_Factory_Adapter::~TAO_IR_TypedefDef_Proxy_Factory_Adapter (void)
-{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
-}
-
-int
-TAO_IR_TypedefDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_TypedefDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
-}
-
-int
-TAO_IR_TypedefDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
-}
-
-IR_TypedefDef_ptr
-TAO_IR_TypedefDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_TypedefDef_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_TypedefDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
-}
-
-TAO_IR_TypedefDef_Smart_Proxy_Base::TAO_IR_TypedefDef_Smart_Proxy_Base (::IR_TypedefDef_ptr proxy)
-: base_proxy_ (proxy)
-{
-}
-
-TAO_IR_TypedefDef_Smart_Proxy_Base::~TAO_IR_TypedefDef_Smart_Proxy_Base (void)
-{
+void *IR_TypedefDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_TypedefDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_TypedefDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/TypedefDef:1.0";
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_TypedefDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_TypedefDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_TypedefDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -8465,56 +9062,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypedefDef, &_tc_TAO_tc_IR_TypedefDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_TypeDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f54), ACE_NTOHL (0x79706544), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/TypeDescription:1.0
- 16, ACE_NTOHL (0x54797065), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = IR_TypeDescription
+ 16, ACE_NTOHL (0x54797065), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = TypeDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -8522,7 +9102,7 @@ static const CORBA::Long _oc_IR_TypeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -8534,76 +9114,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypeDescription, &_tc_TAO_tc_IR_TypeDescription)
TAO_NAMESPACE_END
+
void IR_TypeDescription::_tao_any_destructor (void *x)
{
IR_TypeDescription *tmp = ACE_static_cast (IR_TypeDescription*,x);
delete tmp;
}
-void IR_StructDef::_tao_any_destructor (void *x)
-{
- IR_StructDef *tmp = ACE_static_cast (IR_StructDef*,x);
- CORBA::release (tmp);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_StructDef_ptr IR_StructDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_StructDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StructDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_StructDef::_nil ());
- if (is_a == 0)
- return IR_StructDef::_nil ();
- return IR_StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+_TAO_StructDef_Proxy_Impl::_TAO_StructDef_Proxy_Impl (void)
+{}
-IR_StructDef_ptr IR_StructDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_StructDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_StructDef_ptr default_proxy = IR_StructDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_StructDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_StructDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_StructDef (stub), IR_StructDef::_nil ());
- return TAO_IR_StructDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
+{}
-IR_StructDef_ptr
-IR_StructDef::_duplicate (IR_StructDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+// Remote Implementation of the IDL interface methods
-IR_StructMemberSeq * IR_StructDef::members (
+IR_StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
IR_StructMemberSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
ACE_NEW_RETURN (_tao_retval, IR_StructMemberSeq, _tao_retval);
IR_StructMemberSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -8618,37 +9161,48 @@ IR_StructMemberSeq * IR_StructDef::members (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_StructDef::members (
+void _TAO_StructDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
@@ -8656,15 +9210,11 @@ void IR_StructDef::members (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_members",
@@ -8673,175 +9223,312 @@ void IR_StructDef::members (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << members)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StructDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_StructDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/StructDef:1.0";
+ static ::_TAO_StructDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_StructDef_Default_Proxy_Factory::TAO_IR_StructDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_StructDef_Remote_Proxy_Broker::_TAO_StructDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_StructDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_StructDef_Default_Proxy_Factory::~TAO_IR_StructDef_Default_Proxy_Factory (void)
+_TAO_StructDef_Remote_Proxy_Broker::~_TAO_StructDef_Remote_Proxy_Broker (void)
{
}
-IR_StructDef_ptr
-TAO_IR_StructDef_Default_Proxy_Factory::create_proxy (
- ::IR_StructDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_StructDef_Proxy_Impl&
+_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_StructDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_StructDef_Proxy_Factory_Adapter::TAO_IR_StructDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_StructDef::IR_StructDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_StructDef_Proxy_Factory_Adapter::~TAO_IR_StructDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_StructDef::~IR_StructDef (void)
+{}
+
+void
+IR_StructDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_StructDef_Proxy_Broker_ =
+ _TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_StructDef_Proxy_Broker_ =
+ ::the_TAO_StructDef_Remote_Proxy_Broker ();
+
+ IR_TypedefDef::_tao_setup_collocation (collocated);
+ IR_Container::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_StructDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_StructDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_StructDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_StructDef *tmp = ACE_static_cast (IR_StructDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_StructDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_StructDef_ptr IR_StructDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_StructDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StructDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_StructDef::_nil ());
+ if (is_a == 0)
+ return IR_StructDef::_nil ();
}
-return 0;
+ return IR_StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_StructDef_ptr
-TAO_IR_StructDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_StructDef_ptr proxy,
+IR_StructDef_ptr IR_StructDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_StructDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_StructDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_StructDef_ptr default_proxy = IR_StructDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_StructDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_StructDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_StructDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_StructDef (stub, 0, obj->_servant ()), IR_StructDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_StructDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_StructDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_StructDef_Smart_Proxy_Base::TAO_IR_StructDef_Smart_Proxy_Base (::IR_StructDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_StructDef_ptr
+IR_StructDef::_duplicate (IR_StructDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_StructDef_Smart_Proxy_Base::~TAO_IR_StructDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StructDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_StructDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_StructDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_StructDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_StructDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/StructDef:1.0";
}
-IR_StructMemberSeq * TAO_IR_StructDef_Smart_Proxy_Base::members (
+IR_StructMemberSeq * IR_StructDef::members (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->members (
+ return this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_StructDef_Smart_Proxy_Base::members (
+void IR_StructDef::members (
const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
@@ -8849,20 +9536,13 @@ void TAO_IR_StructDef_Smart_Proxy_Base::members (
CORBA::SystemException
))
{
- this->base_proxy_->members (
+ this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
members,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_StructDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_StructDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_StructDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -8874,71 +9554,34 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructDef, &_tc_TAO_tc_IR_StructDef)
TAO_NAMESPACE_END
-void IR_UnionDef::_tao_any_destructor (void *x)
-{
- IR_UnionDef *tmp = ACE_static_cast (IR_UnionDef*,x);
- CORBA::release (tmp);
-}
-IR_UnionDef_ptr IR_UnionDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_UnionDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UnionDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_UnionDef::_nil ());
- if (is_a == 0)
- return IR_UnionDef::_nil ();
- return IR_UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_UnionDef_ptr IR_UnionDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_UnionDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_UnionDef_ptr default_proxy = IR_UnionDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_UnionDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_UnionDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_UnionDef (stub), IR_UnionDef::_nil ());
- return TAO_IR_UnionDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_UnionDef_Proxy_Impl::_TAO_UnionDef_Proxy_Impl (void)
+{}
-IR_UnionDef_ptr
-IR_UnionDef::_duplicate (IR_UnionDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_UnionDef_Remote_Proxy_Impl::_TAO_UnionDef_Remote_Proxy_Impl (void)
+{}
-CORBA::TypeCode_ptr IR_UnionDef::discriminator_type (
+// Remote Implementation of the IDL interface methods
+
+CORBA::TypeCode_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_discriminator_type",
@@ -8951,53 +9594,61 @@ CORBA::TypeCode_ptr IR_UnionDef::discriminator_type (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_IDLType_ptr IR_UnionDef::discriminator_type_def (
+IR_IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_discriminator_type_def",
@@ -9006,42 +9657,52 @@ IR_IDLType_ptr IR_UnionDef::discriminator_type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_UnionDef::discriminator_type_def (
+void _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr discriminator_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -9049,15 +9710,11 @@ void IR_UnionDef::discriminator_type_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_discriminator_type_def",
@@ -9070,51 +9727,57 @@ void IR_UnionDef::discriminator_type_def (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << discriminator_type_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_UnionMemberSeq * IR_UnionDef::members (
+IR_UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
IR_UnionMemberSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
ACE_NEW_RETURN (_tao_retval, IR_UnionMemberSeq, _tao_retval);
IR_UnionMemberSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -9125,42 +9788,52 @@ IR_UnionMemberSeq * IR_UnionDef::members (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_UnionDef::members (
+void _TAO_UnionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
const IR_UnionMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
@@ -9168,15 +9841,11 @@ void IR_UnionDef::members (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_members",
@@ -9185,188 +9854,324 @@ void IR_UnionDef::members (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << members)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_UnionDef_Proxy_Broker::_TAO_UnionDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UnionDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_UnionDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/UnionDef:1.0";
+ static ::_TAO_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_UnionDef_Default_Proxy_Factory::TAO_IR_UnionDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_UnionDef_Remote_Proxy_Broker::_TAO_UnionDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_UnionDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_UnionDef_Default_Proxy_Factory::~TAO_IR_UnionDef_Default_Proxy_Factory (void)
+_TAO_UnionDef_Remote_Proxy_Broker::~_TAO_UnionDef_Remote_Proxy_Broker (void)
{
}
-IR_UnionDef_ptr
-TAO_IR_UnionDef_Default_Proxy_Factory::create_proxy (
- ::IR_UnionDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_UnionDef_Proxy_Impl&
+_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_UnionDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_UnionDef_Proxy_Factory_Adapter::TAO_IR_UnionDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_UnionDef::IR_UnionDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_UnionDef_Proxy_Factory_Adapter::~TAO_IR_UnionDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_UnionDef::~IR_UnionDef (void)
+{}
+
+void
+IR_UnionDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_UnionDef_Proxy_Broker_ =
+ _TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_UnionDef_Proxy_Broker_ =
+ ::the_TAO_UnionDef_Remote_Proxy_Broker ();
+
+ IR_TypedefDef::_tao_setup_collocation (collocated);
+ IR_Container::_tao_setup_collocation (collocated);
}
-int
-TAO_IR_UnionDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_UnionDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_UnionDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_UnionDef *tmp = ACE_static_cast (IR_UnionDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_UnionDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_UnionDef_ptr IR_UnionDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_UnionDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UnionDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_UnionDef::_nil ());
+ if (is_a == 0)
+ return IR_UnionDef::_nil ();
}
-return 0;
+ return IR_UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_UnionDef_ptr
-TAO_IR_UnionDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_UnionDef_ptr proxy,
+IR_UnionDef_ptr IR_UnionDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_UnionDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_UnionDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_UnionDef_ptr default_proxy = IR_UnionDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_UnionDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_UnionDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_UnionDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_UnionDef (stub, 0, obj->_servant ()), IR_UnionDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_UnionDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_UnionDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_UnionDef_Smart_Proxy_Base::TAO_IR_UnionDef_Smart_Proxy_Base (::IR_UnionDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_UnionDef_ptr
+IR_UnionDef::_duplicate (IR_UnionDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_UnionDef_Smart_Proxy_Base::~TAO_IR_UnionDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UnionDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_UnionDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_UnionDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_UnionDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_UnionDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/UnionDef:1.0";
}
-CORBA::TypeCode_ptr TAO_IR_UnionDef_Smart_Proxy_Base::discriminator_type (
+CORBA::TypeCode_ptr IR_UnionDef::discriminator_type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->discriminator_type (
+ return this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).discriminator_type (
+ this,
ACE_TRY_ENV
);
-
}
-IR_IDLType_ptr TAO_IR_UnionDef_Smart_Proxy_Base::discriminator_type_def (
+IR_IDLType_ptr IR_UnionDef::discriminator_type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->discriminator_type_def (
+ return this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).discriminator_type_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_UnionDef_Smart_Proxy_Base::discriminator_type_def (
+void IR_UnionDef::discriminator_type_def (
IR_IDLType_ptr discriminator_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -9374,27 +10179,27 @@ void TAO_IR_UnionDef_Smart_Proxy_Base::discriminator_type_def (
CORBA::SystemException
))
{
- this->base_proxy_->discriminator_type_def (
+ this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).discriminator_type_def (
+ this,
discriminator_type_def,
ACE_TRY_ENV
);
-
}
-IR_UnionMemberSeq * TAO_IR_UnionDef_Smart_Proxy_Base::members (
+IR_UnionMemberSeq * IR_UnionDef::members (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->members (
+ return this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_UnionDef_Smart_Proxy_Base::members (
+void IR_UnionDef::members (
const IR_UnionMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
@@ -9402,20 +10207,13 @@ void TAO_IR_UnionDef_Smart_Proxy_Base::members (
CORBA::SystemException
))
{
- this->base_proxy_->members (
+ this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
members,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_UnionDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_UnionDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_UnionDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -9427,70 +10225,33 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionDef, &_tc_TAO_tc_IR_UnionDef)
TAO_NAMESPACE_END
-void IR_EnumDef::_tao_any_destructor (void *x)
-{
- IR_EnumDef *tmp = ACE_static_cast (IR_EnumDef*,x);
- CORBA::release (tmp);
-}
-IR_EnumDef_ptr IR_EnumDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_EnumDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EnumDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_EnumDef::_nil ());
- if (is_a == 0)
- return IR_EnumDef::_nil ();
- return IR_EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_EnumDef_ptr IR_EnumDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_EnumDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_EnumDef_ptr default_proxy = IR_EnumDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_EnumDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_EnumDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_EnumDef (stub), IR_EnumDef::_nil ());
- return TAO_IR_EnumDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_EnumDef_Proxy_Impl::_TAO_EnumDef_Proxy_Impl (void)
+{}
-IR_EnumDef_ptr
-IR_EnumDef::_duplicate (IR_EnumDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
+{}
-IR_EnumMemberSeq * IR_EnumDef::members (
+// Remote Implementation of the IDL interface methods
+
+IR_EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
IR_EnumMemberSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
ACE_NEW_RETURN (_tao_retval, IR_EnumMemberSeq, _tao_retval);
IR_EnumMemberSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -9505,37 +10266,48 @@ IR_EnumMemberSeq * IR_EnumDef::members (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_EnumDef::members (
+void _TAO_EnumDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
const IR_EnumMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
@@ -9543,15 +10315,10 @@ void IR_EnumDef::members (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_members",
@@ -9560,174 +10327,298 @@ void IR_EnumDef::members (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << members)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EnumDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_EnumDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/EnumDef:1.0";
+ static ::_TAO_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_EnumDef_Default_Proxy_Factory::TAO_IR_EnumDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_EnumDef_Remote_Proxy_Broker::_TAO_EnumDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_EnumDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_EnumDef_Default_Proxy_Factory::~TAO_IR_EnumDef_Default_Proxy_Factory (void)
+_TAO_EnumDef_Remote_Proxy_Broker::~_TAO_EnumDef_Remote_Proxy_Broker (void)
{
}
-IR_EnumDef_ptr
-TAO_IR_EnumDef_Default_Proxy_Factory::create_proxy (
- ::IR_EnumDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_EnumDef_Proxy_Impl&
+_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_EnumDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_EnumDef_Proxy_Factory_Adapter::TAO_IR_EnumDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_EnumDef::IR_EnumDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_EnumDef_Proxy_Factory_Adapter::~TAO_IR_EnumDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_EnumDef::~IR_EnumDef (void)
+{}
+
+void
+IR_EnumDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_EnumDef_Proxy_Broker_ =
+ _TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_EnumDef_Proxy_Broker_ =
+ ::the_TAO_EnumDef_Remote_Proxy_Broker ();
+
+ IR_TypedefDef::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_EnumDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_EnumDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_EnumDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_EnumDef *tmp = ACE_static_cast (IR_EnumDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_EnumDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_EnumDef_ptr IR_EnumDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_EnumDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EnumDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_EnumDef::_nil ());
+ if (is_a == 0)
+ return IR_EnumDef::_nil ();
}
-return 0;
+ return IR_EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_EnumDef_ptr
-TAO_IR_EnumDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_EnumDef_ptr proxy,
+IR_EnumDef_ptr IR_EnumDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_EnumDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_EnumDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_EnumDef_ptr default_proxy = IR_EnumDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_EnumDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_EnumDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_EnumDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_EnumDef (stub, 0, obj->_servant ()), IR_EnumDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_EnumDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_EnumDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_EnumDef_Smart_Proxy_Base::TAO_IR_EnumDef_Smart_Proxy_Base (::IR_EnumDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_EnumDef_ptr
+IR_EnumDef::_duplicate (IR_EnumDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_EnumDef_Smart_Proxy_Base::~TAO_IR_EnumDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EnumDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_EnumDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_EnumDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_EnumDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_EnumDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/EnumDef:1.0";
}
-IR_EnumMemberSeq * TAO_IR_EnumDef_Smart_Proxy_Base::members (
+IR_EnumMemberSeq * IR_EnumDef::members (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->members (
+ return this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_EnumDef_Smart_Proxy_Base::members (
+void IR_EnumDef::members (
const IR_EnumMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
@@ -9735,20 +10626,13 @@ void TAO_IR_EnumDef_Smart_Proxy_Base::members (
CORBA::SystemException
))
{
- this->base_proxy_->members (
+ this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
members,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_EnumDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_EnumDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_EnumDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -9760,71 +10644,34 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumDef, &_tc_TAO_tc_IR_EnumDef)
TAO_NAMESPACE_END
-void IR_AliasDef::_tao_any_destructor (void *x)
-{
- IR_AliasDef *tmp = ACE_static_cast (IR_AliasDef*,x);
- CORBA::release (tmp);
-}
-IR_AliasDef_ptr IR_AliasDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_AliasDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AliasDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_AliasDef::_nil ());
- if (is_a == 0)
- return IR_AliasDef::_nil ();
- return IR_AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_AliasDef_ptr IR_AliasDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_AliasDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_AliasDef_ptr default_proxy = IR_AliasDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_AliasDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_AliasDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_AliasDef (stub), IR_AliasDef::_nil ());
- return TAO_IR_AliasDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
+{}
-IR_AliasDef_ptr
-IR_AliasDef::_duplicate (IR_AliasDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
+{}
-IR_IDLType_ptr IR_AliasDef::original_type_def (
+// Remote Implementation of the IDL interface methods
+
+IR_IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_original_type_def",
@@ -9832,41 +10679,53 @@ IR_IDLType_ptr IR_AliasDef::original_type_def (
0,
istub->orb_core ()
);
+
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_AliasDef::original_type_def (
+void _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr original_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -9874,15 +10733,10 @@ void IR_AliasDef::original_type_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_original_type_def",
@@ -9891,174 +10745,298 @@ void IR_AliasDef::original_type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << original_type_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AliasDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_AliasDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/AliasDef:1.0";
+ static ::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_AliasDef_Default_Proxy_Factory::TAO_IR_AliasDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_AliasDef_Remote_Proxy_Broker::_TAO_AliasDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_AliasDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_AliasDef_Default_Proxy_Factory::~TAO_IR_AliasDef_Default_Proxy_Factory (void)
+_TAO_AliasDef_Remote_Proxy_Broker::~_TAO_AliasDef_Remote_Proxy_Broker (void)
{
}
-IR_AliasDef_ptr
-TAO_IR_AliasDef_Default_Proxy_Factory::create_proxy (
- ::IR_AliasDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_AliasDef_Proxy_Impl&
+_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_AliasDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_AliasDef_Proxy_Factory_Adapter::TAO_IR_AliasDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_AliasDef::IR_AliasDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_AliasDef_Proxy_Factory_Adapter::~TAO_IR_AliasDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_AliasDef::~IR_AliasDef (void)
+{}
+
+void
+IR_AliasDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_AliasDef_Proxy_Broker_ =
+ _TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_AliasDef_Proxy_Broker_ =
+ ::the_TAO_AliasDef_Remote_Proxy_Broker ();
+
+ IR_TypedefDef::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_AliasDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_AliasDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_AliasDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_AliasDef *tmp = ACE_static_cast (IR_AliasDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_AliasDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_AliasDef_ptr IR_AliasDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_AliasDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AliasDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_AliasDef::_nil ());
+ if (is_a == 0)
+ return IR_AliasDef::_nil ();
}
-return 0;
+ return IR_AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_AliasDef_ptr
-TAO_IR_AliasDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_AliasDef_ptr proxy,
+IR_AliasDef_ptr IR_AliasDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_AliasDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_AliasDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_AliasDef_ptr default_proxy = IR_AliasDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_AliasDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_AliasDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_AliasDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_AliasDef (stub, 0, obj->_servant ()), IR_AliasDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_AliasDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_AliasDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_AliasDef_Smart_Proxy_Base::TAO_IR_AliasDef_Smart_Proxy_Base (::IR_AliasDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_AliasDef_ptr
+IR_AliasDef::_duplicate (IR_AliasDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_AliasDef_Smart_Proxy_Base::~TAO_IR_AliasDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AliasDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_AliasDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_AliasDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_AliasDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_AliasDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/AliasDef:1.0";
}
-IR_IDLType_ptr TAO_IR_AliasDef_Smart_Proxy_Base::original_type_def (
+IR_IDLType_ptr IR_AliasDef::original_type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->original_type_def (
+ return this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_AliasDef_Smart_Proxy_Base::original_type_def (
+void IR_AliasDef::original_type_def (
IR_IDLType_ptr original_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -10066,20 +11044,13 @@ void TAO_IR_AliasDef_Smart_Proxy_Base::original_type_def (
CORBA::SystemException
))
{
- this->base_proxy_->original_type_def (
+ this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
+ this,
original_type_def,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_AliasDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_AliasDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_AliasDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -10091,6 +11062,93 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AliasDef, &_tc_TAO_tc_IR_AliasDef)
TAO_NAMESPACE_END
+
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
+
+_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
+{}
+
+_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
+{
+}
+
+_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
+{
+}
+
+// Factory function Implementation.
+_TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void)
+{
+ static ::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+}
+
+_TAO_NativeDef_Remote_Proxy_Broker::_TAO_NativeDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_NativeDef_Remote_Proxy_Broker::~_TAO_NativeDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_NativeDef_Proxy_Impl&
+_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_NativeDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
+{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
+}
+
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_NativeDef::IR_NativeDef (int collocated)
+{
+ this->_tao_setup_collocation (collocated);
+}
+
+// destructor
+IR_NativeDef::~IR_NativeDef (void)
+{}
+
+void
+IR_NativeDef::_tao_setup_collocation (int collocated)
+{
+ if (collocated)
+ this->the_TAO_NativeDef_Proxy_Broker_ =
+ _TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_NativeDef_Proxy_Broker_ =
+ ::the_TAO_NativeDef_Remote_Proxy_Broker ();
+
+ IR_TypedefDef::_tao_setup_collocation (collocated);
+
+}
+
void IR_NativeDef::_tao_any_destructor (void *x)
{
IR_NativeDef *tmp = ACE_static_cast (IR_NativeDef*,x);
@@ -10104,10 +11162,13 @@ IR_NativeDef_ptr IR_NativeDef::_narrow (
{
if (CORBA::is_nil (obj))
return IR_NativeDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/NativeDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_NativeDef::_nil ());
- if (is_a == 0)
- return IR_NativeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/NativeDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_NativeDef::_nil ());
+ if (is_a == 0)
+ return IR_NativeDef::_nil ();
+ }
return IR_NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
@@ -10118,17 +11179,46 @@ IR_NativeDef_ptr IR_NativeDef::_unchecked_narrow (
{
if (CORBA::is_nil (obj))
return IR_NativeDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_NativeDef_ptr default_proxy = IR_NativeDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_NativeDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_NativeDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_NativeDef (stub), IR_NativeDef::_nil ());
- return TAO_IR_NativeDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_NativeDef_ptr default_proxy = IR_NativeDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_NativeDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_NativeDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_NativeDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_NativeDef (stub, 0, obj->_servant ()), IR_NativeDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_NativeDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_NativeDef::_narrow
+ )
+ )
+ );
}
IR_NativeDef_ptr
@@ -10153,119 +11243,75 @@ CORBA::Boolean IR_NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_NativeDef::_interface_repository_id (void) const
-{
- return "IDL:omg.org/IR/NativeDef:1.0";
-}
-
-TAO_IR_NativeDef_Default_Proxy_Factory::TAO_IR_NativeDef_Default_Proxy_Factory (int register_proxy_factory)
-{
- if (register_proxy_factory)
- {
- TAO_IR_NativeDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
-
-TAO_IR_NativeDef_Default_Proxy_Factory::~TAO_IR_NativeDef_Default_Proxy_Factory (void)
-{
-}
-
-IR_NativeDef_ptr
-TAO_IR_NativeDef_Default_Proxy_Factory::create_proxy (
- ::IR_NativeDef_ptr proxy,
- CORBA::Environment &
- )
-{
- return proxy;
-}
-
-TAO_IR_NativeDef_Proxy_Factory_Adapter::TAO_IR_NativeDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
-{
-}
-
-TAO_IR_NativeDef_Proxy_Factory_Adapter::~TAO_IR_NativeDef_Proxy_Factory_Adapter (void)
-{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
-}
-
-int
-TAO_IR_NativeDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_NativeDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
-}
-
-int
-TAO_IR_NativeDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
-}
-
-IR_NativeDef_ptr
-TAO_IR_NativeDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_NativeDef_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_NativeDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
-}
-
-TAO_IR_NativeDef_Smart_Proxy_Base::TAO_IR_NativeDef_Smart_Proxy_Base (::IR_NativeDef_ptr proxy)
-: base_proxy_ (proxy)
-{
-}
-
-TAO_IR_NativeDef_Smart_Proxy_Base::~TAO_IR_NativeDef_Smart_Proxy_Base (void)
-{
+void *IR_NativeDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_NativeDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_NativeDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_NativeDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/NativeDef:1.0";
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_NativeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_NativeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_NativeDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -10277,70 +11323,33 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NativeDef, &_tc_TAO_tc_IR_NativeDef)
TAO_NAMESPACE_END
-void IR_PrimitiveDef::_tao_any_destructor (void *x)
-{
- IR_PrimitiveDef *tmp = ACE_static_cast (IR_PrimitiveDef*,x);
- CORBA::release (tmp);
-}
-IR_PrimitiveDef_ptr IR_PrimitiveDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_PrimitiveDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimitiveDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_PrimitiveDef::_nil ());
- if (is_a == 0)
- return IR_PrimitiveDef::_nil ();
- return IR_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_PrimitiveDef_ptr IR_PrimitiveDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_PrimitiveDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_PrimitiveDef_ptr default_proxy = IR_PrimitiveDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_PrimitiveDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_PrimitiveDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_PrimitiveDef (stub), IR_PrimitiveDef::_nil ());
- return TAO_IR_PrimitiveDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_Proxy_Impl (void)
+{}
-IR_PrimitiveDef_ptr
-IR_PrimitiveDef::_duplicate (IR_PrimitiveDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl (void)
+{}
-IR::PrimitiveKind IR_PrimitiveDef::kind (
+// Remote Implementation of the IDL interface methods
+
+IR_PrimitiveKind _TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
- IR::PrimitiveKind _tao_retval = (IR::PrimitiveKind)0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+ IR_PrimitiveKind _tao_retval = (IR_PrimitiveKind)0;
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_kind",
@@ -10353,174 +11362,270 @@ IR::PrimitiveKind IR_PrimitiveDef::kind (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-CORBA::Boolean IR_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimitiveDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_PrimitiveDef::_interface_repository_id (void) const
+_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/PrimitiveDef:1.0";
}
-TAO_IR_PrimitiveDef_Default_Proxy_Factory::TAO_IR_PrimitiveDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_PrimitiveDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_PrimitiveDef_Default_Proxy_Factory::~TAO_IR_PrimitiveDef_Default_Proxy_Factory (void)
+_TAO_PrimitiveDef_Remote_Proxy_Broker::_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
{
}
-IR_PrimitiveDef_ptr
-TAO_IR_PrimitiveDef_Default_Proxy_Factory::create_proxy (
- ::IR_PrimitiveDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_PrimitiveDef_Remote_Proxy_Broker::~_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_PrimitiveDef_Proxy_Factory_Adapter::TAO_IR_PrimitiveDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_PrimitiveDef_Proxy_Impl&
+_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_PrimitiveDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_PrimitiveDef_Proxy_Factory_Adapter::~TAO_IR_PrimitiveDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_PrimitiveDef::IR_PrimitiveDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_PrimitiveDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_PrimitiveDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_PrimitiveDef::~IR_PrimitiveDef (void)
+{}
+
+void
+IR_PrimitiveDef::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_PrimitiveDef_Proxy_Broker_ =
+ _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_PrimitiveDef_Proxy_Broker_ =
+ ::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
+
+ IR_IDLType::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_PrimitiveDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_PrimitiveDef::_tao_any_destructor (void *x)
+{
+ IR_PrimitiveDef *tmp = ACE_static_cast (IR_PrimitiveDef*,x);
+ CORBA::release (tmp);
+}
+
+IR_PrimitiveDef_ptr IR_PrimitiveDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_PrimitiveDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimitiveDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_PrimitiveDef::_nil ());
+ if (is_a == 0)
+ return IR_PrimitiveDef::_nil ();
}
-return 0;
+ return IR_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_PrimitiveDef_ptr
-TAO_IR_PrimitiveDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_PrimitiveDef_ptr proxy,
+IR_PrimitiveDef_ptr IR_PrimitiveDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_PrimitiveDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_PrimitiveDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_PrimitiveDef_ptr default_proxy = IR_PrimitiveDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_PrimitiveDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_PrimitiveDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_PrimitiveDef (stub, 0, obj->_servant ()), IR_PrimitiveDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_PrimitiveDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_PrimitiveDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_PrimitiveDef_Smart_Proxy_Base::TAO_IR_PrimitiveDef_Smart_Proxy_Base (::IR_PrimitiveDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_PrimitiveDef_ptr
+IR_PrimitiveDef::_duplicate (IR_PrimitiveDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_PrimitiveDef_Smart_Proxy_Base::~TAO_IR_PrimitiveDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimitiveDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_PrimitiveDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_PrimitiveDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_PrimitiveDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/PrimitiveDef:1.0";
}
-IR::PrimitiveKind TAO_IR_PrimitiveDef_Smart_Proxy_Base::kind (
+IR_PrimitiveKind IR_PrimitiveDef::kind (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->kind (
+ return this->the_TAO_PrimitiveDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).kind (
+ this,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_PrimitiveDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_PrimitiveDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_PrimitiveDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -10532,70 +11637,33 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveDef, &_tc_TAO_tc_IR_PrimitiveDef)
TAO_NAMESPACE_END
-void IR_StringDef::_tao_any_destructor (void *x)
-{
- IR_StringDef *tmp = ACE_static_cast (IR_StringDef*,x);
- CORBA::release (tmp);
-}
-IR_StringDef_ptr IR_StringDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_StringDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StringDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_StringDef::_nil ());
- if (is_a == 0)
- return IR_StringDef::_nil ();
- return IR_StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_StringDef_ptr IR_StringDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_StringDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_StringDef_ptr default_proxy = IR_StringDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_StringDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_StringDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_StringDef (stub), IR_StringDef::_nil ());
- return TAO_IR_StringDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_StringDef_Proxy_Impl::_TAO_StringDef_Proxy_Impl (void)
+{}
-IR_StringDef_ptr
-IR_StringDef::_duplicate (IR_StringDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_StringDef_Remote_Proxy_Impl::_TAO_StringDef_Remote_Proxy_Impl (void)
+{}
-CORBA::ULong IR_StringDef::bound (
+// Remote Implementation of the IDL interface methods
+
+CORBA::ULong _TAO_StringDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
CORBA::ULong _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_bound",
@@ -10608,37 +11676,48 @@ CORBA::ULong IR_StringDef::bound (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_StringDef::bound (
+void _TAO_StringDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -10646,15 +11725,10 @@ void IR_StringDef::bound (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_bound",
@@ -10663,172 +11737,272 @@ void IR_StringDef::bound (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << bound)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_StringDef_Proxy_Broker::_TAO_StringDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_StringDef_Proxy_Broker::~_TAO_StringDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StringDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_StringDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/StringDef:1.0";
+ static ::_TAO_StringDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_StringDef_Default_Proxy_Factory::TAO_IR_StringDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_StringDef_Remote_Proxy_Broker::_TAO_StringDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_StringDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_StringDef_Default_Proxy_Factory::~TAO_IR_StringDef_Default_Proxy_Factory (void)
+_TAO_StringDef_Remote_Proxy_Broker::~_TAO_StringDef_Remote_Proxy_Broker (void)
{
}
-IR_StringDef_ptr
-TAO_IR_StringDef_Default_Proxy_Factory::create_proxy (
- ::IR_StringDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_StringDef_Proxy_Impl&
+_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_StringDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_StringDef_Proxy_Factory_Adapter::TAO_IR_StringDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_StringDef::IR_StringDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_StringDef_Proxy_Factory_Adapter::~TAO_IR_StringDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_StringDef::~IR_StringDef (void)
+{}
+
+void
+IR_StringDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_StringDef_Proxy_Broker_ =
+ _TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_StringDef_Proxy_Broker_ =
+ ::the_TAO_StringDef_Remote_Proxy_Broker ();
+
+ IR_IDLType::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_StringDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_StringDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_StringDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_StringDef *tmp = ACE_static_cast (IR_StringDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_StringDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_StringDef_ptr IR_StringDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_StringDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StringDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_StringDef::_nil ());
+ if (is_a == 0)
+ return IR_StringDef::_nil ();
}
-return 0;
+ return IR_StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_StringDef_ptr
-TAO_IR_StringDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_StringDef_ptr proxy,
+IR_StringDef_ptr IR_StringDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_StringDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_StringDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_StringDef_ptr default_proxy = IR_StringDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_StringDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_StringDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_StringDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_StringDef (stub, 0, obj->_servant ()), IR_StringDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_StringDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_StringDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_StringDef_Smart_Proxy_Base::TAO_IR_StringDef_Smart_Proxy_Base (::IR_StringDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_StringDef_ptr
+IR_StringDef::_duplicate (IR_StringDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_StringDef_Smart_Proxy_Base::~TAO_IR_StringDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StringDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_StringDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_StringDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_StringDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_StringDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/StringDef:1.0";
}
-CORBA::ULong TAO_IR_StringDef_Smart_Proxy_Base::bound (
+CORBA::ULong IR_StringDef::bound (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->bound (
+ return this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_StringDef_Smart_Proxy_Base::bound (
+void IR_StringDef::bound (
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -10836,20 +12010,13 @@ void TAO_IR_StringDef_Smart_Proxy_Base::bound (
CORBA::SystemException
))
{
- this->base_proxy_->bound (
+ this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
+ this,
bound,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_StringDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_StringDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_StringDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -10861,70 +12028,33 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringDef, &_tc_TAO_tc_IR_StringDef)
TAO_NAMESPACE_END
-void IR_WstringDef::_tao_any_destructor (void *x)
-{
- IR_WstringDef *tmp = ACE_static_cast (IR_WstringDef*,x);
- CORBA::release (tmp);
-}
-IR_WstringDef_ptr IR_WstringDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_WstringDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/WstringDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_WstringDef::_nil ());
- if (is_a == 0)
- return IR_WstringDef::_nil ();
- return IR_WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_WstringDef_ptr IR_WstringDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_WstringDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_WstringDef_ptr default_proxy = IR_WstringDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_WstringDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_WstringDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_WstringDef (stub), IR_WstringDef::_nil ());
- return TAO_IR_WstringDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_Proxy_Impl (void)
+{}
-IR_WstringDef_ptr
-IR_WstringDef::_duplicate (IR_WstringDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_WstringDef_Remote_Proxy_Impl::_TAO_WstringDef_Remote_Proxy_Impl (void)
+{}
-CORBA::ULong IR_WstringDef::bound (
+// Remote Implementation of the IDL interface methods
+
+CORBA::ULong _TAO_WstringDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
CORBA::ULong _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_bound",
@@ -10937,37 +12067,48 @@ CORBA::ULong IR_WstringDef::bound (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_WstringDef::bound (
+void _TAO_WstringDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -10975,15 +12116,10 @@ void IR_WstringDef::bound (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_bound",
@@ -10992,172 +12128,273 @@ void IR_WstringDef::bound (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << bound)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_WstringDef_Proxy_Broker::_TAO_WstringDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/WstringDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_WstringDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/WstringDef:1.0";
+ static ::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_WstringDef_Default_Proxy_Factory::TAO_IR_WstringDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_WstringDef_Remote_Proxy_Broker::_TAO_WstringDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_WstringDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_WstringDef_Default_Proxy_Factory::~TAO_IR_WstringDef_Default_Proxy_Factory (void)
+_TAO_WstringDef_Remote_Proxy_Broker::~_TAO_WstringDef_Remote_Proxy_Broker (void)
{
}
-IR_WstringDef_ptr
-TAO_IR_WstringDef_Default_Proxy_Factory::create_proxy (
- ::IR_WstringDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_WstringDef_Proxy_Impl&
+_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_WstringDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_WstringDef_Proxy_Factory_Adapter::TAO_IR_WstringDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_WstringDef::IR_WstringDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_WstringDef_Proxy_Factory_Adapter::~TAO_IR_WstringDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_WstringDef::~IR_WstringDef (void)
+{}
+
+void
+IR_WstringDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_WstringDef_Proxy_Broker_ =
+ _TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_WstringDef_Proxy_Broker_ =
+ ::the_TAO_WstringDef_Remote_Proxy_Broker ();
+
+ IR_IDLType::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_WstringDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_WstringDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_WstringDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_WstringDef *tmp = ACE_static_cast (IR_WstringDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_WstringDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_WstringDef_ptr IR_WstringDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_WstringDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/WstringDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_WstringDef::_nil ());
+ if (is_a == 0)
+ return IR_WstringDef::_nil ();
}
-return 0;
+ return IR_WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_WstringDef_ptr
-TAO_IR_WstringDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_WstringDef_ptr proxy,
+IR_WstringDef_ptr IR_WstringDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_WstringDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_WstringDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_WstringDef_ptr default_proxy = IR_WstringDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_WstringDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_WstringDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_WstringDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_WstringDef (stub, 0, obj->_servant ()), IR_WstringDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_WstringDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_WstringDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_WstringDef_Smart_Proxy_Base::TAO_IR_WstringDef_Smart_Proxy_Base (::IR_WstringDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_WstringDef_ptr
+IR_WstringDef::_duplicate (IR_WstringDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_WstringDef_Smart_Proxy_Base::~TAO_IR_WstringDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/WstringDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_WstringDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_WstringDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_WstringDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_WstringDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/WstringDef:1.0";
}
-CORBA::ULong TAO_IR_WstringDef_Smart_Proxy_Base::bound (
+CORBA::ULong IR_WstringDef::bound (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->bound (
+
+ return this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_WstringDef_Smart_Proxy_Base::bound (
+void IR_WstringDef::bound (
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -11165,20 +12402,14 @@ void TAO_IR_WstringDef_Smart_Proxy_Base::bound (
CORBA::SystemException
))
{
- this->base_proxy_->bound (
+
+ this->the_TAO_WstringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
+ this,
bound,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_WstringDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_WstringDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_WstringDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -11190,70 +12421,36 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WstringDef, &_tc_TAO_tc_IR_WstringDef)
TAO_NAMESPACE_END
-void IR_FixedDef::_tao_any_destructor (void *x)
-{
- IR_FixedDef *tmp = ACE_static_cast (IR_FixedDef*,x);
- CORBA::release (tmp);
-}
-IR_FixedDef_ptr IR_FixedDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_FixedDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FixedDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_FixedDef::_nil ());
- if (is_a == 0)
- return IR_FixedDef::_nil ();
- return IR_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_FixedDef_ptr IR_FixedDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_FixedDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_FixedDef_ptr default_proxy = IR_FixedDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_FixedDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_FixedDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_FixedDef (stub), IR_FixedDef::_nil ());
- return TAO_IR_FixedDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
+{}
-IR_FixedDef_ptr
-IR_FixedDef::_duplicate (IR_FixedDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_FixedDef_Remote_Proxy_Impl::_TAO_FixedDef_Remote_Proxy_Impl (void)
+{}
-CORBA::UShort IR_FixedDef::digits (
+// Remote Implementation of the IDL interface methods
+
+CORBA::UShort _TAO_FixedDef_Remote_Proxy_Impl::digits (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::UShort _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_digits",
@@ -11266,37 +12463,48 @@ CORBA::UShort IR_FixedDef::digits (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_FixedDef::digits (
+void _TAO_FixedDef_Remote_Proxy_Impl::digits (
+ CORBA_Object *_collocated_tao_target_,
CORBA::UShort digits,
CORBA::Environment &ACE_TRY_ENV
)
@@ -11304,15 +12512,10 @@ void IR_FixedDef::digits (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_digits",
@@ -11321,56 +12524,64 @@ void IR_FixedDef::digits (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << digits)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Short IR_FixedDef::scale (
+CORBA::Short _TAO_FixedDef_Remote_Proxy_Impl::scale (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Short _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_scale",
@@ -11379,42 +12590,52 @@ CORBA::Short IR_FixedDef::scale (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_FixedDef::scale (
+void _TAO_FixedDef_Remote_Proxy_Impl::scale (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Short scale,
CORBA::Environment &ACE_TRY_ENV
)
@@ -11422,15 +12643,10 @@ void IR_FixedDef::scale (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_scale",
@@ -11443,167 +12659,269 @@ void IR_FixedDef::scale (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << scale)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+_TAO_FixedDef_Proxy_Broker::_TAO_FixedDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FixedDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_FixedDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/FixedDef:1.0";
+ static ::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_FixedDef_Default_Proxy_Factory::TAO_IR_FixedDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_FixedDef_Remote_Proxy_Broker::_TAO_FixedDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_FixedDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_FixedDef_Default_Proxy_Factory::~TAO_IR_FixedDef_Default_Proxy_Factory (void)
+_TAO_FixedDef_Remote_Proxy_Broker::~_TAO_FixedDef_Remote_Proxy_Broker (void)
{
}
-IR_FixedDef_ptr
-TAO_IR_FixedDef_Default_Proxy_Factory::create_proxy (
- ::IR_FixedDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_FixedDef_Proxy_Impl&
+_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_FixedDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_FixedDef_Proxy_Factory_Adapter::TAO_IR_FixedDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_FixedDef::IR_FixedDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_FixedDef_Proxy_Factory_Adapter::~TAO_IR_FixedDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_FixedDef::~IR_FixedDef (void)
+{}
+
+void
+IR_FixedDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_FixedDef_Proxy_Broker_ =
+ _TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_FixedDef_Proxy_Broker_ =
+ ::the_TAO_FixedDef_Remote_Proxy_Broker ();
+
+ IR_IDLType::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_FixedDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_FixedDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_FixedDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_FixedDef *tmp = ACE_static_cast (IR_FixedDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_FixedDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_FixedDef_ptr IR_FixedDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_FixedDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FixedDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_FixedDef::_nil ());
+ if (is_a == 0)
+ return IR_FixedDef::_nil ();
}
-return 0;
+ return IR_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_FixedDef_ptr
-TAO_IR_FixedDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_FixedDef_ptr proxy,
+IR_FixedDef_ptr IR_FixedDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_FixedDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_FixedDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_FixedDef_ptr default_proxy = IR_FixedDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_FixedDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_FixedDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_FixedDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_FixedDef (stub, 0, obj->_servant ()), IR_FixedDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_FixedDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_FixedDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_FixedDef_Smart_Proxy_Base::TAO_IR_FixedDef_Smart_Proxy_Base (::IR_FixedDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_FixedDef_ptr
+IR_FixedDef::_duplicate (IR_FixedDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_FixedDef_Smart_Proxy_Base::~TAO_IR_FixedDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FixedDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_FixedDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_FixedDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_FixedDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_FixedDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/FixedDef:1.0";
}
-CORBA::UShort TAO_IR_FixedDef_Smart_Proxy_Base::digits (
+CORBA::UShort IR_FixedDef::digits (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->digits (
+
+ return this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).digits (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_FixedDef_Smart_Proxy_Base::digits (
+void IR_FixedDef::digits (
CORBA::UShort digits,
CORBA::Environment &ACE_TRY_ENV
)
@@ -11611,27 +12929,29 @@ void TAO_IR_FixedDef_Smart_Proxy_Base::digits (
CORBA::SystemException
))
{
- this->base_proxy_->digits (
+
+ this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).digits (
+ this,
digits,
ACE_TRY_ENV
);
-
}
-CORBA::Short TAO_IR_FixedDef_Smart_Proxy_Base::scale (
+CORBA::Short IR_FixedDef::scale (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->scale (
+
+ return this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).scale (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_FixedDef_Smart_Proxy_Base::scale (
+void IR_FixedDef::scale (
CORBA::Short scale,
CORBA::Environment &ACE_TRY_ENV
)
@@ -11639,20 +12959,14 @@ void TAO_IR_FixedDef_Smart_Proxy_Base::scale (
CORBA::SystemException
))
{
- this->base_proxy_->scale (
+
+ this->the_TAO_FixedDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).scale (
+ this,
scale,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_FixedDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_FixedDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_FixedDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -11664,70 +12978,36 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FixedDef, &_tc_TAO_tc_IR_FixedDef)
TAO_NAMESPACE_END
-void IR_SequenceDef::_tao_any_destructor (void *x)
-{
- IR_SequenceDef *tmp = ACE_static_cast (IR_SequenceDef*,x);
- CORBA::release (tmp);
-}
-IR_SequenceDef_ptr IR_SequenceDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_SequenceDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/SequenceDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_SequenceDef::_nil ());
- if (is_a == 0)
- return IR_SequenceDef::_nil ();
- return IR_SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_SequenceDef_ptr IR_SequenceDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_SequenceDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_SequenceDef_ptr default_proxy = IR_SequenceDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_SequenceDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_SequenceDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_SequenceDef (stub), IR_SequenceDef::_nil ());
- return TAO_IR_SequenceDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_Proxy_Impl (void)
+{}
-IR_SequenceDef_ptr
-IR_SequenceDef::_duplicate (IR_SequenceDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_SequenceDef_Remote_Proxy_Impl::_TAO_SequenceDef_Remote_Proxy_Impl (void)
+{}
-CORBA::ULong IR_SequenceDef::bound (
+// Remote Implementation of the IDL interface methods
+
+CORBA::ULong _TAO_SequenceDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::ULong _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_bound",
@@ -11740,37 +13020,48 @@ CORBA::ULong IR_SequenceDef::bound (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_SequenceDef::bound (
+void _TAO_SequenceDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -11778,15 +13069,10 @@ void IR_SequenceDef::bound (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_bound",
@@ -11795,57 +13081,65 @@ void IR_SequenceDef::bound (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << bound)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::TypeCode_ptr IR_SequenceDef::element_type (
+CORBA::TypeCode_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_element_type",
@@ -11854,58 +13148,68 @@ CORBA::TypeCode_ptr IR_SequenceDef::element_type (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_IDLType_ptr IR_SequenceDef::element_type_def (
+IR_IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_element_type_def",
@@ -11914,42 +13218,52 @@ IR_IDLType_ptr IR_SequenceDef::element_type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_SequenceDef::element_type_def (
+void _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr element_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -11957,15 +13271,10 @@ void IR_SequenceDef::element_type_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_element_type_def",
@@ -11974,171 +13283,273 @@ void IR_SequenceDef::element_type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << element_type_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_SequenceDef_Proxy_Broker::_TAO_SequenceDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/SequenceDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_SequenceDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/SequenceDef:1.0";
+ static ::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_SequenceDef_Default_Proxy_Factory::TAO_IR_SequenceDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_SequenceDef_Remote_Proxy_Broker::_TAO_SequenceDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_SequenceDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_SequenceDef_Default_Proxy_Factory::~TAO_IR_SequenceDef_Default_Proxy_Factory (void)
+_TAO_SequenceDef_Remote_Proxy_Broker::~_TAO_SequenceDef_Remote_Proxy_Broker (void)
{
}
-IR_SequenceDef_ptr
-TAO_IR_SequenceDef_Default_Proxy_Factory::create_proxy (
- ::IR_SequenceDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_SequenceDef_Proxy_Impl&
+_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_SequenceDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_SequenceDef_Proxy_Factory_Adapter::TAO_IR_SequenceDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_SequenceDef::IR_SequenceDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_SequenceDef_Proxy_Factory_Adapter::~TAO_IR_SequenceDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_SequenceDef::~IR_SequenceDef (void)
+{}
+
+void
+IR_SequenceDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_SequenceDef_Proxy_Broker_ =
+ _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_SequenceDef_Proxy_Broker_ =
+ ::the_TAO_SequenceDef_Remote_Proxy_Broker ();
+
+ IR_IDLType::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_SequenceDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_SequenceDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_SequenceDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_SequenceDef *tmp = ACE_static_cast (IR_SequenceDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_SequenceDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_SequenceDef_ptr IR_SequenceDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_SequenceDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/SequenceDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_SequenceDef::_nil ());
+ if (is_a == 0)
+ return IR_SequenceDef::_nil ();
}
-return 0;
+ return IR_SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_SequenceDef_ptr
-TAO_IR_SequenceDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_SequenceDef_ptr proxy,
+IR_SequenceDef_ptr IR_SequenceDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_SequenceDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_SequenceDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_SequenceDef_ptr default_proxy = IR_SequenceDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_SequenceDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_SequenceDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_SequenceDef (stub, 0, obj->_servant ()), IR_SequenceDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_SequenceDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_SequenceDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_SequenceDef_Smart_Proxy_Base::TAO_IR_SequenceDef_Smart_Proxy_Base (::IR_SequenceDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_SequenceDef_ptr
+IR_SequenceDef::_duplicate (IR_SequenceDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_SequenceDef_Smart_Proxy_Base::~TAO_IR_SequenceDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/SequenceDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_SequenceDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_SequenceDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_SequenceDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_SequenceDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/SequenceDef:1.0";
}
-CORBA::ULong TAO_IR_SequenceDef_Smart_Proxy_Base::bound (
+CORBA::ULong IR_SequenceDef::bound (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->bound (
+
+ return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_SequenceDef_Smart_Proxy_Base::bound (
+void IR_SequenceDef::bound (
CORBA::ULong bound,
CORBA::Environment &ACE_TRY_ENV
)
@@ -12146,40 +13557,43 @@ void TAO_IR_SequenceDef_Smart_Proxy_Base::bound (
CORBA::SystemException
))
{
- this->base_proxy_->bound (
+
+ this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
+ this,
bound,
ACE_TRY_ENV
);
-
}
-CORBA::TypeCode_ptr TAO_IR_SequenceDef_Smart_Proxy_Base::element_type (
+CORBA::TypeCode_ptr IR_SequenceDef::element_type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->element_type (
+
+ return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type (
+ this,
ACE_TRY_ENV
);
-
}
-IR_IDLType_ptr TAO_IR_SequenceDef_Smart_Proxy_Base::element_type_def (
+IR_IDLType_ptr IR_SequenceDef::element_type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->element_type_def (
+
+ return this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_SequenceDef_Smart_Proxy_Base::element_type_def (
+void IR_SequenceDef::element_type_def (
IR_IDLType_ptr element_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -12187,20 +13601,14 @@ void TAO_IR_SequenceDef_Smart_Proxy_Base::element_type_def (
CORBA::SystemException
))
{
- this->base_proxy_->element_type_def (
+
+ this->the_TAO_SequenceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
+ this,
element_type_def,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_SequenceDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_SequenceDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_SequenceDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -12212,70 +13620,36 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SequenceDef, &_tc_TAO_tc_IR_SequenceDef)
TAO_NAMESPACE_END
-void IR_ArrayDef::_tao_any_destructor (void *x)
-{
- IR_ArrayDef *tmp = ACE_static_cast (IR_ArrayDef*,x);
- CORBA::release (tmp);
-}
-IR_ArrayDef_ptr IR_ArrayDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ArrayDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ArrayDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ArrayDef::_nil ());
- if (is_a == 0)
- return IR_ArrayDef::_nil ();
- return IR_ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ArrayDef_ptr IR_ArrayDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ArrayDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ArrayDef_ptr default_proxy = IR_ArrayDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ArrayDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ArrayDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ArrayDef (stub), IR_ArrayDef::_nil ());
- return TAO_IR_ArrayDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
+{}
-IR_ArrayDef_ptr
-IR_ArrayDef::_duplicate (IR_ArrayDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
+{}
-CORBA::ULong IR_ArrayDef::length (
+// Remote Implementation of the IDL interface methods
+
+CORBA::ULong _TAO_ArrayDef_Remote_Proxy_Impl::length (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::ULong _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_length",
@@ -12288,37 +13662,48 @@ CORBA::ULong IR_ArrayDef::length (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_ArrayDef::length (
+void _TAO_ArrayDef_Remote_Proxy_Impl::length (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong length,
CORBA::Environment &ACE_TRY_ENV
)
@@ -12326,15 +13711,10 @@ void IR_ArrayDef::length (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_length",
@@ -12343,57 +13723,65 @@ void IR_ArrayDef::length (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << length)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::TypeCode_ptr IR_ArrayDef::element_type (
+CORBA::TypeCode_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_element_type",
@@ -12406,53 +13794,64 @@ CORBA::TypeCode_ptr IR_ArrayDef::element_type (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_IDLType_ptr IR_ArrayDef::element_type_def (
+IR_IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_element_type_def",
@@ -12461,42 +13860,52 @@ IR_IDLType_ptr IR_ArrayDef::element_type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ArrayDef::element_type_def (
+void _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr element_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -12504,15 +13913,10 @@ void IR_ArrayDef::element_type_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_element_type_def",
@@ -12521,172 +13925,273 @@ void IR_ArrayDef::element_type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << element_type_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ArrayDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ArrayDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ArrayDef:1.0";
+ static ::_TAO_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ArrayDef_Default_Proxy_Factory::TAO_IR_ArrayDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_ArrayDef_Remote_Proxy_Broker::_TAO_ArrayDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ArrayDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_ArrayDef_Default_Proxy_Factory::~TAO_IR_ArrayDef_Default_Proxy_Factory (void)
+_TAO_ArrayDef_Remote_Proxy_Broker::~_TAO_ArrayDef_Remote_Proxy_Broker (void)
{
}
-IR_ArrayDef_ptr
-TAO_IR_ArrayDef_Default_Proxy_Factory::create_proxy (
- ::IR_ArrayDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ArrayDef_Proxy_Impl&
+_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ArrayDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ArrayDef_Proxy_Factory_Adapter::TAO_IR_ArrayDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ArrayDef::IR_ArrayDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_ArrayDef_Proxy_Factory_Adapter::~TAO_IR_ArrayDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_ArrayDef::~IR_ArrayDef (void)
+{}
+
+void
+IR_ArrayDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_ArrayDef_Proxy_Broker_ =
+ _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ArrayDef_Proxy_Broker_ =
+ ::the_TAO_ArrayDef_Remote_Proxy_Broker ();
+
+ IR_IDLType::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_ArrayDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ArrayDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_ArrayDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_ArrayDef *tmp = ACE_static_cast (IR_ArrayDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_ArrayDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_ArrayDef_ptr IR_ArrayDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_ArrayDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ArrayDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ArrayDef::_nil ());
+ if (is_a == 0)
+ return IR_ArrayDef::_nil ();
}
-return 0;
+ return IR_ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ArrayDef_ptr
-TAO_IR_ArrayDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ArrayDef_ptr proxy,
+IR_ArrayDef_ptr IR_ArrayDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ArrayDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ArrayDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ArrayDef_ptr default_proxy = IR_ArrayDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ArrayDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ArrayDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ArrayDef (stub, 0, obj->_servant ()), IR_ArrayDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ArrayDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ArrayDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_ArrayDef_Smart_Proxy_Base::TAO_IR_ArrayDef_Smart_Proxy_Base (::IR_ArrayDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_ArrayDef_ptr
+IR_ArrayDef::_duplicate (IR_ArrayDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ArrayDef_Smart_Proxy_Base::~TAO_IR_ArrayDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ArrayDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_ArrayDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_ArrayDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ArrayDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_ArrayDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ArrayDef:1.0";
}
-CORBA::ULong TAO_IR_ArrayDef_Smart_Proxy_Base::length (
+CORBA::ULong IR_ArrayDef::length (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->length (
+
+ return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).length (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ArrayDef_Smart_Proxy_Base::length (
+void IR_ArrayDef::length (
CORBA::ULong length,
CORBA::Environment &ACE_TRY_ENV
)
@@ -12694,40 +14199,43 @@ void TAO_IR_ArrayDef_Smart_Proxy_Base::length (
CORBA::SystemException
))
{
- this->base_proxy_->length (
+
+ this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).length (
+ this,
length,
ACE_TRY_ENV
);
-
}
-CORBA::TypeCode_ptr TAO_IR_ArrayDef_Smart_Proxy_Base::element_type (
+CORBA::TypeCode_ptr IR_ArrayDef::element_type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->element_type (
+
+ return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type (
+ this,
ACE_TRY_ENV
);
-
}
-IR_IDLType_ptr TAO_IR_ArrayDef_Smart_Proxy_Base::element_type_def (
+IR_IDLType_ptr IR_ArrayDef::element_type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->element_type_def (
+
+ return this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ArrayDef_Smart_Proxy_Base::element_type_def (
+void IR_ArrayDef::element_type_def (
IR_IDLType_ptr element_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -12735,20 +14243,14 @@ void TAO_IR_ArrayDef_Smart_Proxy_Base::element_type_def (
CORBA::SystemException
))
{
- this->base_proxy_->element_type_def (
+
+ this->the_TAO_ArrayDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).element_type_def (
+ this,
element_type_def,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ArrayDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ArrayDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ArrayDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -12760,71 +14262,37 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ArrayDef, &_tc_TAO_tc_IR_ArrayDef)
TAO_NAMESPACE_END
-void IR_ExceptionDef::_tao_any_destructor (void *x)
-{
- IR_ExceptionDef *tmp = ACE_static_cast (IR_ExceptionDef*,x);
- CORBA::release (tmp);
-}
-IR_ExceptionDef_ptr IR_ExceptionDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ExceptionDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ExceptionDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ExceptionDef::_nil ());
- if (is_a == 0)
- return IR_ExceptionDef::_nil ();
- return IR_ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ExceptionDef_ptr IR_ExceptionDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ExceptionDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ExceptionDef_ptr default_proxy = IR_ExceptionDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ExceptionDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ExceptionDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ExceptionDef (stub), IR_ExceptionDef::_nil ());
- return TAO_IR_ExceptionDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ExceptionDef_Proxy_Impl::_TAO_ExceptionDef_Proxy_Impl (void)
+{}
-IR_ExceptionDef_ptr
-IR_ExceptionDef::_duplicate (IR_ExceptionDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_ExceptionDef_Remote_Proxy_Impl::_TAO_ExceptionDef_Remote_Proxy_Impl (void)
+{}
-CORBA::TypeCode_ptr IR_ExceptionDef::type (
+// Remote Implementation of the IDL interface methods
+
+CORBA::TypeCode_ptr _TAO_ExceptionDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_type",
@@ -12837,52 +14305,63 @@ CORBA::TypeCode_ptr IR_ExceptionDef::type (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_StructMemberSeq * IR_ExceptionDef::members (
+IR_StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_StructMemberSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_StructMemberSeq, _tao_retval);
IR_StructMemberSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -12893,42 +14372,52 @@ IR_StructMemberSeq * IR_ExceptionDef::members (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ExceptionDef::members (
+void _TAO_ExceptionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
@@ -12936,15 +14425,10 @@ void IR_ExceptionDef::members (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_members",
@@ -12957,181 +14441,297 @@ void IR_ExceptionDef::members (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << members)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ExceptionDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ExceptionDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ExceptionDef:1.0";
+ static ::_TAO_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ExceptionDef_Default_Proxy_Factory::TAO_IR_ExceptionDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_ExceptionDef_Remote_Proxy_Broker::_TAO_ExceptionDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ExceptionDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_ExceptionDef_Default_Proxy_Factory::~TAO_IR_ExceptionDef_Default_Proxy_Factory (void)
+_TAO_ExceptionDef_Remote_Proxy_Broker::~_TAO_ExceptionDef_Remote_Proxy_Broker (void)
{
}
-IR_ExceptionDef_ptr
-TAO_IR_ExceptionDef_Default_Proxy_Factory::create_proxy (
- ::IR_ExceptionDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ExceptionDef_Proxy_Impl&
+_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ExceptionDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ExceptionDef_Proxy_Factory_Adapter::TAO_IR_ExceptionDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ExceptionDef::IR_ExceptionDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_ExceptionDef_Proxy_Factory_Adapter::~TAO_IR_ExceptionDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_ExceptionDef::~IR_ExceptionDef (void)
+{}
+
+void
+IR_ExceptionDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_ExceptionDef_Proxy_Broker_ =
+ _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ExceptionDef_Proxy_Broker_ =
+ ::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+ IR_Container::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_ExceptionDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ExceptionDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_ExceptionDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_ExceptionDef *tmp = ACE_static_cast (IR_ExceptionDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_ExceptionDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_ExceptionDef_ptr IR_ExceptionDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_ExceptionDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ExceptionDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ExceptionDef::_nil ());
+ if (is_a == 0)
+ return IR_ExceptionDef::_nil ();
}
-return 0;
+ return IR_ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ExceptionDef_ptr
-TAO_IR_ExceptionDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ExceptionDef_ptr proxy,
+IR_ExceptionDef_ptr IR_ExceptionDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ExceptionDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ExceptionDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ExceptionDef_ptr default_proxy = IR_ExceptionDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ExceptionDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ExceptionDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ExceptionDef (stub, 0, obj->_servant ()), IR_ExceptionDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ExceptionDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ExceptionDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_ExceptionDef_Smart_Proxy_Base::TAO_IR_ExceptionDef_Smart_Proxy_Base (::IR_ExceptionDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_ExceptionDef_ptr
+IR_ExceptionDef::_duplicate (IR_ExceptionDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ExceptionDef_Smart_Proxy_Base::~TAO_IR_ExceptionDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ExceptionDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_ExceptionDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ExceptionDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_ExceptionDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ExceptionDef:1.0";
}
-CORBA::TypeCode_ptr TAO_IR_ExceptionDef_Smart_Proxy_Base::type (
+CORBA::TypeCode_ptr IR_ExceptionDef::type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->type (
+
+ return this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
+ this,
ACE_TRY_ENV
);
-
}
-IR_StructMemberSeq * TAO_IR_ExceptionDef_Smart_Proxy_Base::members (
+IR_StructMemberSeq * IR_ExceptionDef::members (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->members (
+
+ return this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ExceptionDef_Smart_Proxy_Base::members (
+void IR_ExceptionDef::members (
const IR_StructMemberSeq & members,
CORBA::Environment &ACE_TRY_ENV
)
@@ -13139,20 +14739,14 @@ void TAO_IR_ExceptionDef_Smart_Proxy_Base::members (
CORBA::SystemException
))
{
- this->base_proxy_->members (
+
+ this->the_TAO_ExceptionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
members,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ExceptionDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ExceptionDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ExceptionDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -13164,56 +14758,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDef, &_tc_TAO_tc_IR_ExceptionDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ExceptionDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -13221,7 +14798,7 @@ static const CORBA::Long _oc_IR_ExceptionDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -13233,25 +14810,22 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDescription, &_tc_TAO_tc_IR_ExceptionDescription)
TAO_NAMESPACE_END
+
void IR_ExceptionDescription::_tao_any_destructor (void *x)
{
IR_ExceptionDescription *tmp = ACE_static_cast (IR_ExceptionDescription*,x);
delete tmp;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CS_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CS_
-
+
// The Base_Sequence functions, please see tao/Sequence.h
void
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ExceptionDef **tmp = 0;
tmp = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ExceptionDef **old = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
@@ -13260,14 +14834,14 @@ void IR_ExceptionDescription::_tao_any_destructor (void *x)
tmp[i] = IR_ExceptionDef::_duplicate (old[i]);
else
tmp[i] = old[i];
-
+
if (this->release_)
delete[] old;
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_deallocate_buffer (void)
{
@@ -13282,24 +14856,24 @@ void IR_ExceptionDescription::_tao_any_destructor (void *x)
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (tmp);
this->buffer_ = 0;
}
-
+
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
{
this->_deallocate_buffer ();
}
-
+
void
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
{
IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
-
+
for (CORBA::ULong i = nl; i < ol; ++i)
{
CORBA::release (tmp[i]);
tmp[i] = IR_ExceptionDef::_nil ();
}
}
- void
+ void
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_downcast (
void* target,
CORBA_Object *src,
@@ -13316,14 +14890,8 @@ void IR_ExceptionDescription::_tao_any_destructor (void *x)
IR_ExceptionDef **tmp = ACE_static_cast (IR_ExceptionDef**, src);
return *tmp;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_EXCEPTIONDEFSEQ_CS_)
-#define _IR_EXCEPTIONDEFSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ExceptionDefSeq
@@ -13332,30 +14900,30 @@ void IR_ExceptionDescription::_tao_any_destructor (void *x)
IR_ExceptionDefSeq::IR_ExceptionDefSeq (void)
{}
IR_ExceptionDefSeq::IR_ExceptionDefSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ExceptionDefSeq::IR_ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ExceptionDef_ptr *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ExceptionDefSeq::IR_ExceptionDefSeq (const IR_ExceptionDefSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ExceptionDefSeq::~IR_ExceptionDefSeq (void) // dtor
@@ -13366,14 +14934,11 @@ void IR_ExceptionDefSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ExceptionDefSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ExceptionDefSeq:1.0
- 16, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x53657100), // name = IR_ExceptionDefSeq
+ 16, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x53657100), // name = ExceptionDefSeq
CORBA::tk_sequence, // typecode kind
76, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -13393,55 +14958,45 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDefSeq, &_tc_TAO_tc_IR_E
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ExceptionDescription* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ExceptionDescription *old = ACE_reinterpret_cast (IR_ExceptionDescription *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_ExceptionDescription *tmp = ACE_reinterpret_cast (IR_ExceptionDescription *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_EXCDESCRIPTIONSEQ_CS_)
-#define _IR_EXCDESCRIPTIONSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ExcDescriptionSeq
@@ -13450,30 +15005,30 @@ TAO_NAMESPACE_END
IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (void)
{}
IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_ExceptionDescription *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (const IR_ExcDescriptionSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ExcDescriptionSeq::~IR_ExcDescriptionSeq (void) // dtor
@@ -13484,67 +15039,46 @@ void IR_ExcDescriptionSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ExcDescriptionSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -13552,7 +15086,7 @@ static const CORBA::Long _oc_IR_ExcDescriptionSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -13567,6 +15101,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExcDescriptionSeq, &_tc_TAO_tc_IR_ExcDescriptionSeq)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_AttributeMode[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -13576,76 +15111,42 @@ static const CORBA::Long _oc_IR_AttributeMode[] =
12, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f4e4f52), ACE_NTOHL (0x4d414c00), // name = ATTR_NORMAL
14, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f524541), ACE_NTOHL (0x444f4e4c), ACE_NTOHL (0x59000000), // name = ATTR_READONLY
};
-static CORBA::TypeCode _tc_TAO_tc_IR_AttributeMode (CORBA::tk_enum, sizeof (_oc_IR_AttributeMode), (char *) &_oc_IR_AttributeMode, 0, sizeof (IR::AttributeMode));
+static CORBA::TypeCode _tc_TAO_tc_IR_AttributeMode (CORBA::tk_enum, sizeof (_oc_IR_AttributeMode), (char *) &_oc_IR_AttributeMode, 0, sizeof (IR_AttributeMode));
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeMode, &_tc_TAO_tc_IR_AttributeMode)
TAO_NAMESPACE_END
-void IR_AttributeDef::_tao_any_destructor (void *x)
-{
- IR_AttributeDef *tmp = ACE_static_cast (IR_AttributeDef*,x);
- CORBA::release (tmp);
-}
-IR_AttributeDef_ptr IR_AttributeDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_AttributeDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AttributeDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_AttributeDef::_nil ());
- if (is_a == 0)
- return IR_AttributeDef::_nil ();
- return IR_AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_AttributeDef_ptr IR_AttributeDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_AttributeDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_AttributeDef_ptr default_proxy = IR_AttributeDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_AttributeDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_AttributeDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_AttributeDef (stub), IR_AttributeDef::_nil ());
- return TAO_IR_AttributeDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_AttributeDef_Proxy_Impl::_TAO_AttributeDef_Proxy_Impl (void)
+{}
-IR_AttributeDef_ptr
-IR_AttributeDef::_duplicate (IR_AttributeDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_Remote_Proxy_Impl (void)
+{}
-CORBA::TypeCode_ptr IR_AttributeDef::type (
+// Remote Implementation of the IDL interface methods
+
+CORBA::TypeCode_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_type",
@@ -13658,53 +15159,64 @@ CORBA::TypeCode_ptr IR_AttributeDef::type (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_IDLType_ptr IR_AttributeDef::type_def (
+IR_IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_type_def",
@@ -13713,42 +15225,52 @@ IR_IDLType_ptr IR_AttributeDef::type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_AttributeDef::type_def (
+void _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -13756,15 +15278,10 @@ void IR_AttributeDef::type_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_type_def",
@@ -13773,56 +15290,64 @@ void IR_AttributeDef::type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << type_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR::AttributeMode IR_AttributeDef::mode (
+IR_AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
- IR::AttributeMode _tao_retval = (IR::AttributeMode)0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ IR_AttributeMode _tao_retval = (IR_AttributeMode)0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_mode",
@@ -13831,58 +15356,63 @@ IR::AttributeMode IR_AttributeDef::mode (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_AttributeDef::mode (
- IR::AttributeMode mode,
+void _TAO_AttributeDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+ IR_AttributeMode mode,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_mode",
@@ -13895,180 +15425,283 @@ void IR_AttributeDef::mode (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << mode)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AttributeDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_AttributeDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/AttributeDef:1.0";
+ static ::_TAO_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_AttributeDef_Default_Proxy_Factory::TAO_IR_AttributeDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_AttributeDef_Remote_Proxy_Broker::_TAO_AttributeDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_AttributeDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_AttributeDef_Default_Proxy_Factory::~TAO_IR_AttributeDef_Default_Proxy_Factory (void)
+_TAO_AttributeDef_Remote_Proxy_Broker::~_TAO_AttributeDef_Remote_Proxy_Broker (void)
{
}
-IR_AttributeDef_ptr
-TAO_IR_AttributeDef_Default_Proxy_Factory::create_proxy (
- ::IR_AttributeDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_AttributeDef_Proxy_Impl&
+_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_AttributeDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_AttributeDef_Proxy_Factory_Adapter::TAO_IR_AttributeDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_AttributeDef::IR_AttributeDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_AttributeDef_Proxy_Factory_Adapter::~TAO_IR_AttributeDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_AttributeDef::~IR_AttributeDef (void)
+{}
+
+void
+IR_AttributeDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_AttributeDef_Proxy_Broker_ =
+ _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_AttributeDef_Proxy_Broker_ =
+ ::the_TAO_AttributeDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_AttributeDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_AttributeDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_AttributeDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_AttributeDef *tmp = ACE_static_cast (IR_AttributeDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_AttributeDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_AttributeDef_ptr IR_AttributeDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_AttributeDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AttributeDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_AttributeDef::_nil ());
+ if (is_a == 0)
+ return IR_AttributeDef::_nil ();
}
-return 0;
+ return IR_AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_AttributeDef_ptr
-TAO_IR_AttributeDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_AttributeDef_ptr proxy,
+IR_AttributeDef_ptr IR_AttributeDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_AttributeDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_AttributeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_AttributeDef_ptr default_proxy = IR_AttributeDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_AttributeDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_AttributeDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_AttributeDef (stub, 0, obj->_servant ()), IR_AttributeDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_AttributeDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_AttributeDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_AttributeDef_Smart_Proxy_Base::TAO_IR_AttributeDef_Smart_Proxy_Base (::IR_AttributeDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_AttributeDef_ptr
+IR_AttributeDef::_duplicate (IR_AttributeDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_AttributeDef_Smart_Proxy_Base::~TAO_IR_AttributeDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AttributeDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_AttributeDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_AttributeDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_AttributeDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_AttributeDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/AttributeDef:1.0";
}
-CORBA::TypeCode_ptr TAO_IR_AttributeDef_Smart_Proxy_Base::type (
+CORBA::TypeCode_ptr IR_AttributeDef::type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->type (
+
+ return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
+ this,
ACE_TRY_ENV
);
-
}
-IR_IDLType_ptr TAO_IR_AttributeDef_Smart_Proxy_Base::type_def (
+IR_IDLType_ptr IR_AttributeDef::type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->type_def (
+
+ return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_AttributeDef_Smart_Proxy_Base::type_def (
+void IR_AttributeDef::type_def (
IR_IDLType_ptr type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -14076,48 +15709,44 @@ void TAO_IR_AttributeDef_Smart_Proxy_Base::type_def (
CORBA::SystemException
))
{
- this->base_proxy_->type_def (
+
+ this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
+ this,
type_def,
ACE_TRY_ENV
);
-
}
-IR::AttributeMode TAO_IR_AttributeDef_Smart_Proxy_Base::mode (
+IR_AttributeMode IR_AttributeDef::mode (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->mode (
+
+ return this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_AttributeDef_Smart_Proxy_Base::mode (
- IR::AttributeMode mode,
+void IR_AttributeDef::mode (
+ IR_AttributeMode mode,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->base_proxy_->mode (
+
+ this->the_TAO_AttributeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
+ this,
mode,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_AttributeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_AttributeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_AttributeDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -14129,56 +15758,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDef, &_tc_TAO_tc_IR_AttributeDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_AttributeDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/AttributeDescription:1.0
- 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_AttributeDescription
+ 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = AttributeDescription
8, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -14186,7 +15798,7 @@ static const CORBA::Long _oc_IR_AttributeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -14204,63 +15816,45 @@ static const CORBA::Long _oc_IR_AttributeDescription[] =
15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -14268,7 +15862,7 @@ static const CORBA::Long _oc_IR_AttributeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -14280,63 +15874,45 @@ static const CORBA::Long _oc_IR_AttributeDescription[] =
15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -14344,7 +15920,7 @@ static const CORBA::Long _oc_IR_AttributeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -14360,6 +15936,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDescription, &_tc_TAO_tc_IR_AttributeDescription)
TAO_NAMESPACE_END
+
void IR_AttributeDescription::_tao_any_destructor (void *x)
{
IR_AttributeDescription *tmp = ACE_static_cast (IR_AttributeDescription*,x);
@@ -14375,11 +15952,12 @@ static const CORBA::Long _oc_IR_OperationMode[] =
10, ACE_NTOHL (0x4f505f4e), ACE_NTOHL (0x4f524d41), ACE_NTOHL (0x4c000000), // name = OP_NORMAL
10, ACE_NTOHL (0x4f505f4f), ACE_NTOHL (0x4e455741), ACE_NTOHL (0x59000000), // name = OP_ONEWAY
};
-static CORBA::TypeCode _tc_TAO_tc_IR_OperationMode (CORBA::tk_enum, sizeof (_oc_IR_OperationMode), (char *) &_oc_IR_OperationMode, 0, sizeof (IR::OperationMode));
+static CORBA::TypeCode _tc_TAO_tc_IR_OperationMode (CORBA::tk_enum, sizeof (_oc_IR_OperationMode), (char *) &_oc_IR_OperationMode, 0, sizeof (IR_OperationMode));
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationMode, &_tc_TAO_tc_IR_OperationMode)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ParameterMode[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -14390,31 +15968,26 @@ static const CORBA::Long _oc_IR_ParameterMode[] =
10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000), // name = PARAM_OUT
12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400), // name = PARAM_INOUT
};
-static CORBA::TypeCode _tc_TAO_tc_IR_ParameterMode (CORBA::tk_enum, sizeof (_oc_IR_ParameterMode), (char *) &_oc_IR_ParameterMode, 0, sizeof (IR::ParameterMode));
+static CORBA::TypeCode _tc_TAO_tc_IR_ParameterMode (CORBA::tk_enum, sizeof (_oc_IR_ParameterMode), (char *) &_oc_IR_ParameterMode, 0, sizeof (IR_ParameterMode));
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterMode, &_tc_TAO_tc_IR_ParameterMode)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ParameterDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ParameterDescription:1.0
- 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ParameterDescription
+ 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ParameterDescription
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -14443,6 +16016,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterDescription, &_tc_TAO_tc_IR_ParameterDescription)
TAO_NAMESPACE_END
+
void IR_ParameterDescription::_tao_any_destructor (void *x)
{
IR_ParameterDescription *tmp = ACE_static_cast (IR_ParameterDescription*,x);
@@ -14451,55 +16025,45 @@ void IR_ParameterDescription::_tao_any_destructor (void *x)
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ParameterDescription* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ParameterDescription *old = ACE_reinterpret_cast (IR_ParameterDescription *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_ParameterDescription *tmp = ACE_reinterpret_cast (IR_ParameterDescription *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PARDESCRIPTIONSEQ_CS_)
-#define _IR_PARDESCRIPTIONSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ParDescriptionSeq
@@ -14508,30 +16072,30 @@ void IR_ParameterDescription::_tao_any_destructor (void *x)
IR_ParDescriptionSeq::IR_ParDescriptionSeq (void)
{}
IR_ParDescriptionSeq::IR_ParDescriptionSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ParDescriptionSeq::IR_ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_ParameterDescription *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ParDescriptionSeq::IR_ParDescriptionSeq (const IR_ParDescriptionSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ParDescriptionSeq::~IR_ParDescriptionSeq (void) // dtor
@@ -14542,37 +16106,28 @@ void IR_ParDescriptionSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ParDescriptionSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x61724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParDescriptionSeq:1.0
- 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ParDescriptionSeq
+ 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ParDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 472, // encapsulation length
+ 404, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 456, // encapsulation length
+ 388, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ParameterDescription:1.0
- 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ParameterDescription
+ 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ParameterDescription
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -14604,24 +16159,19 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParDescriptionSeq, &_tc_TAO_tc_IR_ParDescriptionSeq)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ContextIdentifier[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ContextIdentifier:1.0
18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000), // name = ContextIdentifier
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
};
static CORBA::TypeCode _tc_TAO_tc_IR_ContextIdentifier (CORBA::tk_alias, sizeof (_oc_IR_ContextIdentifier), (char *) &_oc_IR_ContextIdentifier, 0, sizeof (IR::ContextIdentifier));
@@ -14630,9 +16180,6 @@ TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdentifier, &_tc_TAO_tc_IR_ContextIdentifier)
TAO_NAMESPACE_END
-#if !defined (_IR_CONTEXTIDSEQ_CS_)
-#define _IR_CONTEXTIDSEQ_CS_
-
// *************************************************************
// IR_ContextIdSeq
// *************************************************************
@@ -14640,30 +16187,30 @@ TAO_NAMESPACE_END
IR_ContextIdSeq::IR_ContextIdSeq (void)
{}
IR_ContextIdSeq::IR_ContextIdSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ContextIdSeq::IR_ContextIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ContextIdSeq::IR_ContextIdSeq (const IR_ContextIdSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ContextIdSeq::~IR_ContextIdSeq (void) // dtor
@@ -14674,35 +16221,26 @@ void IR_ContextIdSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ContextIdSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ContextIdSeq:1.0
- 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = IR_ContextIdSeq
+ 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = ContextIdSeq
CORBA::tk_sequence, // typecode kind
- 228, // encapsulation length
+ 160, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 212, // encapsulation length
+ 144, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ContextIdentifier:1.0
18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000), // name = ContextIdentifier
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -14713,71 +16251,37 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdSeq, &_tc_TAO_tc_IR_ContextIdSeq)
TAO_NAMESPACE_END
-void IR_OperationDef::_tao_any_destructor (void *x)
-{
- IR_OperationDef *tmp = ACE_static_cast (IR_OperationDef*,x);
- CORBA::release (tmp);
-}
-IR_OperationDef_ptr IR_OperationDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_OperationDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/OperationDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_OperationDef::_nil ());
- if (is_a == 0)
- return IR_OperationDef::_nil ();
- return IR_OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_OperationDef_ptr IR_OperationDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_OperationDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_OperationDef_ptr default_proxy = IR_OperationDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_OperationDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_OperationDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_OperationDef (stub), IR_OperationDef::_nil ());
- return TAO_IR_OperationDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_OperationDef_Proxy_Impl::_TAO_OperationDef_Proxy_Impl (void)
+{}
-IR_OperationDef_ptr
-IR_OperationDef::_duplicate (IR_OperationDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_OperationDef_Remote_Proxy_Impl::_TAO_OperationDef_Remote_Proxy_Impl (void)
+{}
-CORBA::TypeCode_ptr IR_OperationDef::result (
+// Remote Implementation of the IDL interface methods
+
+CORBA::TypeCode_ptr _TAO_OperationDef_Remote_Proxy_Impl::result (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_result",
@@ -14790,53 +16294,64 @@ CORBA::TypeCode_ptr IR_OperationDef::result (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_IDLType_ptr IR_OperationDef::result_def (
+IR_IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_result_def",
@@ -14849,37 +16364,48 @@ IR_IDLType_ptr IR_OperationDef::result_def (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_OperationDef::result_def (
+void _TAO_OperationDef_Remote_Proxy_Impl::result_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr result_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -14887,15 +16413,10 @@ void IR_OperationDef::result_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_result_def",
@@ -14904,56 +16425,64 @@ void IR_OperationDef::result_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << result_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_ParDescriptionSeq * IR_OperationDef::params (
+IR_ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ParDescriptionSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_ParDescriptionSeq, _tao_retval);
IR_ParDescriptionSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -14968,37 +16497,48 @@ IR_ParDescriptionSeq * IR_OperationDef::params (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_OperationDef::params (
+void _TAO_OperationDef_Remote_Proxy_Impl::params (
+ CORBA_Object *_collocated_tao_target_,
const IR_ParDescriptionSeq & params,
CORBA::Environment &ACE_TRY_ENV
)
@@ -15006,15 +16546,10 @@ void IR_OperationDef::params (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_params",
@@ -15023,56 +16558,64 @@ void IR_OperationDef::params (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << params)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR::OperationMode IR_OperationDef::mode (
+IR_OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
- IR::OperationMode _tao_retval = (IR::OperationMode)0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+ IR_OperationMode _tao_retval = (IR_OperationMode)0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_mode",
@@ -15081,58 +16624,63 @@ IR::OperationMode IR_OperationDef::mode (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_OperationDef::mode (
- IR::OperationMode mode,
+void _TAO_OperationDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+ IR_OperationMode mode,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_mode",
@@ -15141,56 +16689,64 @@ void IR_OperationDef::mode (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << mode)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_ContextIdSeq * IR_OperationDef::contexts (
+IR_ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ContextIdSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_ContextIdSeq, _tao_retval);
IR_ContextIdSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -15201,42 +16757,52 @@ IR_ContextIdSeq * IR_OperationDef::contexts (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_OperationDef::contexts (
+void _TAO_OperationDef_Remote_Proxy_Impl::contexts (
+ CORBA_Object *_collocated_tao_target_,
const IR_ContextIdSeq & contexts,
CORBA::Environment &ACE_TRY_ENV
)
@@ -15244,15 +16810,10 @@ void IR_OperationDef::contexts (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_contexts",
@@ -15261,56 +16822,64 @@ void IR_OperationDef::contexts (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << contexts)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_ExceptionDefSeq * IR_OperationDef::exceptions (
+IR_ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ExceptionDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_ExceptionDefSeq, _tao_retval);
IR_ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -15325,37 +16894,48 @@ IR_ExceptionDefSeq * IR_OperationDef::exceptions (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_OperationDef::exceptions (
+void _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
+ CORBA_Object *_collocated_tao_target_,
const IR_ExceptionDefSeq & exceptions,
CORBA::Environment &ACE_TRY_ENV
)
@@ -15363,15 +16943,10 @@ void IR_OperationDef::exceptions (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_exceptions",
@@ -15380,185 +16955,287 @@ void IR_OperationDef::exceptions (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << exceptions)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_OperationDef_Proxy_Broker::_TAO_OperationDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/OperationDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_OperationDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/OperationDef:1.0";
+ static ::_TAO_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_OperationDef_Default_Proxy_Factory::TAO_IR_OperationDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_OperationDef_Remote_Proxy_Broker::_TAO_OperationDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_OperationDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_OperationDef_Default_Proxy_Factory::~TAO_IR_OperationDef_Default_Proxy_Factory (void)
+_TAO_OperationDef_Remote_Proxy_Broker::~_TAO_OperationDef_Remote_Proxy_Broker (void)
{
}
-IR_OperationDef_ptr
-TAO_IR_OperationDef_Default_Proxy_Factory::create_proxy (
- ::IR_OperationDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_OperationDef_Proxy_Impl&
+_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_OperationDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_OperationDef_Proxy_Factory_Adapter::TAO_IR_OperationDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_OperationDef::IR_OperationDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_OperationDef_Proxy_Factory_Adapter::~TAO_IR_OperationDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_OperationDef::~IR_OperationDef (void)
+{}
+
+void
+IR_OperationDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_OperationDef_Proxy_Broker_ =
+ _TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_OperationDef_Proxy_Broker_ =
+ ::the_TAO_OperationDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_OperationDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_OperationDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_OperationDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_OperationDef *tmp = ACE_static_cast (IR_OperationDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_OperationDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_OperationDef_ptr IR_OperationDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_OperationDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/OperationDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_OperationDef::_nil ());
+ if (is_a == 0)
+ return IR_OperationDef::_nil ();
}
-return 0;
+ return IR_OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_OperationDef_ptr
-TAO_IR_OperationDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_OperationDef_ptr proxy,
+IR_OperationDef_ptr IR_OperationDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_OperationDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_OperationDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_OperationDef_ptr default_proxy = IR_OperationDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_OperationDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_OperationDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_OperationDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_OperationDef (stub, 0, obj->_servant ()), IR_OperationDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_OperationDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_OperationDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_OperationDef_Smart_Proxy_Base::TAO_IR_OperationDef_Smart_Proxy_Base (::IR_OperationDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_OperationDef_ptr
+IR_OperationDef::_duplicate (IR_OperationDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_OperationDef_Smart_Proxy_Base::~TAO_IR_OperationDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/OperationDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_OperationDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_OperationDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_OperationDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_OperationDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/OperationDef:1.0";
}
-CORBA::TypeCode_ptr TAO_IR_OperationDef_Smart_Proxy_Base::result (
+CORBA::TypeCode_ptr IR_OperationDef::result (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->result (
+
+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result (
+ this,
ACE_TRY_ENV
);
-
}
-IR_IDLType_ptr TAO_IR_OperationDef_Smart_Proxy_Base::result_def (
+IR_IDLType_ptr IR_OperationDef::result_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->result_def (
+
+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_OperationDef_Smart_Proxy_Base::result_def (
+void IR_OperationDef::result_def (
IR_IDLType_ptr result_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -15566,27 +17243,29 @@ void TAO_IR_OperationDef_Smart_Proxy_Base::result_def (
CORBA::SystemException
))
{
- this->base_proxy_->result_def (
+
+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result_def (
+ this,
result_def,
ACE_TRY_ENV
);
-
}
-IR_ParDescriptionSeq * TAO_IR_OperationDef_Smart_Proxy_Base::params (
+IR_ParDescriptionSeq * IR_OperationDef::params (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->params (
+
+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).params (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_OperationDef_Smart_Proxy_Base::params (
+void IR_OperationDef::params (
const IR_ParDescriptionSeq & params,
CORBA::Environment &ACE_TRY_ENV
)
@@ -15594,55 +17273,59 @@ void TAO_IR_OperationDef_Smart_Proxy_Base::params (
CORBA::SystemException
))
{
- this->base_proxy_->params (
+
+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).params (
+ this,
params,
ACE_TRY_ENV
);
-
}
-IR::OperationMode TAO_IR_OperationDef_Smart_Proxy_Base::mode (
+IR_OperationMode IR_OperationDef::mode (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->mode (
+
+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_OperationDef_Smart_Proxy_Base::mode (
- IR::OperationMode mode,
+void IR_OperationDef::mode (
+ IR_OperationMode mode,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- this->base_proxy_->mode (
+
+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
+ this,
mode,
ACE_TRY_ENV
);
-
}
-IR_ContextIdSeq * TAO_IR_OperationDef_Smart_Proxy_Base::contexts (
+IR_ContextIdSeq * IR_OperationDef::contexts (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->contexts (
+
+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contexts (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_OperationDef_Smart_Proxy_Base::contexts (
+void IR_OperationDef::contexts (
const IR_ContextIdSeq & contexts,
CORBA::Environment &ACE_TRY_ENV
)
@@ -15650,27 +17333,29 @@ void TAO_IR_OperationDef_Smart_Proxy_Base::contexts (
CORBA::SystemException
))
{
- this->base_proxy_->contexts (
+
+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contexts (
+ this,
contexts,
ACE_TRY_ENV
);
-
}
-IR_ExceptionDefSeq * TAO_IR_OperationDef_Smart_Proxy_Base::exceptions (
+IR_ExceptionDefSeq * IR_OperationDef::exceptions (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->exceptions (
+
+ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).exceptions (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_OperationDef_Smart_Proxy_Base::exceptions (
+void IR_OperationDef::exceptions (
const IR_ExceptionDefSeq & exceptions,
CORBA::Environment &ACE_TRY_ENV
)
@@ -15678,20 +17363,14 @@ void TAO_IR_OperationDef_Smart_Proxy_Base::exceptions (
CORBA::SystemException
))
{
- this->base_proxy_->exceptions (
+
+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).exceptions (
+ this,
exceptions,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_OperationDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_OperationDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_OperationDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -15703,56 +17382,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDef, &_tc_TAO_tc_IR_OperationDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_OperationDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OperationDescription:1.0
- 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_OperationDescription
+ 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = OperationDescription
9, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -15760,7 +17422,7 @@ static const CORBA::Long _oc_IR_OperationDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
@@ -15778,31 +17440,25 @@ static const CORBA::Long _oc_IR_OperationDescription[] =
9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
CORBA::tk_alias, // typecode kind for typedefs
- 296, // encapsulation length
+ 228, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ContextIdSeq:1.0
- 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = IR_ContextIdSeq
+ 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = ContextIdSeq
CORBA::tk_sequence, // typecode kind
- 228, // encapsulation length
+ 160, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 212, // encapsulation length
+ 144, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ContextIdentifier:1.0
18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000), // name = ContextIdentifier
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -15810,33 +17466,27 @@ static const CORBA::Long _oc_IR_OperationDescription[] =
11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
CORBA::tk_alias, // typecode kind for typedefs
- 552, // encapsulation length
+ 484, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x61724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParDescriptionSeq:1.0
- 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ParDescriptionSeq
+ 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ParDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 472, // encapsulation length
+ 404, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 456, // encapsulation length
+ 388, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ParameterDescription:1.0
- 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ParameterDescription
+ 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ParameterDescription
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -15865,63 +17515,45 @@ static const CORBA::Long _oc_IR_OperationDescription[] =
11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -15929,7 +17561,7 @@ static const CORBA::Long _oc_IR_OperationDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -15945,16 +17577,13 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDescription, &_tc_TAO_tc_IR_OperationDescription)
TAO_NAMESPACE_END
+
void IR_OperationDescription::_tao_any_destructor (void *x)
{
IR_OperationDescription *tmp = ACE_static_cast (IR_OperationDescription*,x);
delete tmp;
}
-
-#if !defined (_IR_REPOSITORYIDSEQ_CS_)
-#define _IR_REPOSITORYIDSEQ_CS_
-
// *************************************************************
// IR_RepositoryIdSeq
// *************************************************************
@@ -15962,30 +17591,30 @@ void IR_OperationDescription::_tao_any_destructor (void *x)
IR_RepositoryIdSeq::IR_RepositoryIdSeq (void)
{}
IR_RepositoryIdSeq::IR_RepositoryIdSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_RepositoryIdSeq::IR_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_RepositoryIdSeq::IR_RepositoryIdSeq (const IR_RepositoryIdSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_RepositoryIdSeq::~IR_RepositoryIdSeq (void) // dtor
@@ -15996,30 +17625,21 @@ void IR_RepositoryIdSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_RepositoryIdSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
- 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = IR_RepositoryIdSeq
+ 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = RepositoryIdSeq
CORBA::tk_sequence, // typecode kind
- 156, // encapsulation length
+ 84, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -16031,55 +17651,45 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, &_tc_TAO_tc_IR_R
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
{
IR_OperationDescription* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_OperationDescription *old = ACE_reinterpret_cast (IR_OperationDescription *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_OperationDescription *tmp = ACE_reinterpret_cast (IR_OperationDescription *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_OPDESCRIPTIONSEQ_CS_)
-#define _IR_OPDESCRIPTIONSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_OpDescriptionSeq
@@ -16088,30 +17698,30 @@ TAO_NAMESPACE_END
IR_OpDescriptionSeq::IR_OpDescriptionSeq (void)
{}
IR_OpDescriptionSeq::IR_OpDescriptionSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_OpDescriptionSeq::IR_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_OperationDescription *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_OpDescriptionSeq::IR_OpDescriptionSeq (const IR_OpDescriptionSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_OpDescriptionSeq::~IR_OpDescriptionSeq (void) // dtor
@@ -16122,67 +17732,46 @@ void IR_OpDescriptionSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OpDescriptionSeq:1.0
- 17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0), // name = IR_OpDescriptionSeq
+ 17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0), // name = OpDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2456, // encapsulation length
+ 1896, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2440, // encapsulation length
+ 1880, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OperationDescription:1.0
- 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_OperationDescription
+ 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = OperationDescription
9, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -16190,7 +17779,7 @@ static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
@@ -16208,31 +17797,25 @@ static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
CORBA::tk_alias, // typecode kind for typedefs
- 296, // encapsulation length
+ 228, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ContextIdSeq:1.0
- 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = IR_ContextIdSeq
+ 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = ContextIdSeq
CORBA::tk_sequence, // typecode kind
- 228, // encapsulation length
+ 160, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 212, // encapsulation length
+ 144, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ContextIdentifier:1.0
18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000), // name = ContextIdentifier
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -16240,33 +17823,27 @@ static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
CORBA::tk_alias, // typecode kind for typedefs
- 552, // encapsulation length
+ 484, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x61724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParDescriptionSeq:1.0
- 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ParDescriptionSeq
+ 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ParDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 472, // encapsulation length
+ 404, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 456, // encapsulation length
+ 388, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ParameterDescription:1.0
- 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ParameterDescription
+ 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ParameterDescription
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -16295,63 +17872,45 @@ static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -16359,7 +17918,7 @@ static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -16380,55 +17939,45 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OpDescriptionSeq, &_tc_TAO_tc_IR_
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
{
IR_AttributeDescription* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_AttributeDescription *old = ACE_reinterpret_cast (IR_AttributeDescription *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_AttributeDescription *tmp = ACE_reinterpret_cast (IR_AttributeDescription *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_ATTRDESCRIPTIONSEQ_CS_)
-#define _IR_ATTRDESCRIPTIONSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_AttrDescriptionSeq
@@ -16437,30 +17986,30 @@ TAO_NAMESPACE_END
IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (void)
{}
IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_AttributeDescription *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (const IR_AttrDescriptionSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_AttrDescriptionSeq::~IR_AttrDescriptionSeq (void) // dtor
@@ -16471,67 +18020,46 @@ void IR_AttrDescriptionSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/AttrDescriptionSeq:1.0
- 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = IR_AttrDescriptionSeq
+ 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = AttrDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2344, // encapsulation length
+ 1708, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2328, // encapsulation length
+ 1692, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/AttributeDescription:1.0
- 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_AttributeDescription
+ 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = AttributeDescription
8, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -16539,7 +18067,7 @@ static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -16557,63 +18085,45 @@ static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -16621,7 +18131,7 @@ static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -16633,63 +18143,45 @@ static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -16697,7 +18189,7 @@ static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -16716,70 +18208,36 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttrDescriptionSeq, &_tc_TAO_tc_IR_AttrDescriptionSeq)
TAO_NAMESPACE_END
-void IR_InterfaceDef::_tao_any_destructor (void *x)
-{
- IR_InterfaceDef *tmp = ACE_static_cast (IR_InterfaceDef*,x);
- CORBA::release (tmp);
-}
-IR_InterfaceDef_ptr IR_InterfaceDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_InterfaceDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/InterfaceDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_InterfaceDef::_nil ());
- if (is_a == 0)
- return IR_InterfaceDef::_nil ();
- return IR_InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_InterfaceDef_ptr IR_InterfaceDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_InterfaceDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_InterfaceDef_ptr default_proxy = IR_InterfaceDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_InterfaceDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_InterfaceDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_InterfaceDef (stub), IR_InterfaceDef::_nil ());
- return TAO_IR_InterfaceDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
+{}
-IR_InterfaceDef_ptr
-IR_InterfaceDef::_duplicate (IR_InterfaceDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl (void)
+{}
-IR_InterfaceDefSeq * IR_InterfaceDef::base_interfaces (
+// Remote Implementation of the IDL interface methods
+
+IR_InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_InterfaceDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -16789,41 +18247,53 @@ IR_InterfaceDefSeq * IR_InterfaceDef::base_interfaces (
0,
istub->orb_core ()
);
+
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_InterfaceDef::base_interfaces (
+void _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
const IR_InterfaceDefSeq & base_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
@@ -16831,15 +18301,11 @@ void IR_InterfaceDef::base_interfaces (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_base_interfaces",
@@ -16848,56 +18314,64 @@ void IR_InterfaceDef::base_interfaces (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << base_interfaces)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Boolean IR_InterfaceDef::is_abstract (
+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_is_abstract",
@@ -16906,42 +18380,52 @@ CORBA::Boolean IR_InterfaceDef::is_abstract (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_InterfaceDef::is_abstract (
+void _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_abstract,
CORBA::Environment &ACE_TRY_ENV
)
@@ -16949,15 +18433,11 @@ void IR_InterfaceDef::is_abstract (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_is_abstract",
@@ -16966,56 +18446,64 @@ void IR_InterfaceDef::is_abstract (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << CORBA::Any::from_boolean (is_abstract))
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Boolean IR_InterfaceDef::is_local (
+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_is_local",
@@ -17023,41 +18511,53 @@ CORBA::Boolean IR_InterfaceDef::is_local (
0,
istub->orb_core ()
);
+
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_InterfaceDef::is_local (
+void _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
)
@@ -17065,15 +18565,11 @@ void IR_InterfaceDef::is_local (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_is_local",
@@ -17082,41 +18578,49 @@ void IR_InterfaceDef::is_local (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << CORBA::Any::from_boolean (is_local))
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Boolean IR_InterfaceDef::is_a (
+CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
const char * interface_id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -17124,15 +18628,15 @@ CORBA::Boolean IR_InterfaceDef::is_a (
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"is_a",
@@ -17145,48 +18649,63 @@ CORBA::Boolean IR_InterfaceDef::is_a (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << interface_id)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ _tao_retval
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-IR_AttributeDef_ptr IR_InterfaceDef::create_attribute (
+IR_AttributeDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr type,
- IR::AttributeMode mode,
+ IR_AttributeMode mode,
const IR_ExceptionDefSeq & get_exceptions,
const IR_ExceptionDefSeq & put_exceptions,
CORBA::Environment &ACE_TRY_ENV
@@ -17195,16 +18714,16 @@ IR_AttributeDef_ptr IR_InterfaceDef::create_attribute (
CORBA::SystemException
))
{
-
+
IR_AttributeDef_ptr _tao_retval = IR_AttributeDef::_nil ();
IR_AttributeDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_attribute",
@@ -17213,18 +18732,19 @@ IR_AttributeDef_ptr IR_InterfaceDef::create_attribute (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -17235,37 +18755,50 @@ IR_AttributeDef_ptr IR_InterfaceDef::create_attribute (
(_tao_out << get_exceptions) &&
(_tao_out << put_exceptions)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_OperationDef_ptr IR_InterfaceDef::create_operation (
+IR_OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr result,
- IR::OperationMode mode,
+ IR_OperationMode mode,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
const IR_ContextIdSeq & contexts,
@@ -17275,16 +18808,16 @@ IR_OperationDef_ptr IR_InterfaceDef::create_operation (
CORBA::SystemException
))
{
-
+
IR_OperationDef_ptr _tao_retval = IR_OperationDef::_nil ();
IR_OperationDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_operation",
@@ -17293,18 +18826,19 @@ IR_OperationDef_ptr IR_InterfaceDef::create_operation (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -17316,165 +18850,297 @@ IR_OperationDef_ptr IR_InterfaceDef::create_operation (
(_tao_out << exceptions) &&
(_tao_out << contexts)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_InterfaceDef_Proxy_Broker::_TAO_InterfaceDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/InterfaceDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_InterfaceDef::_interface_repository_id (void) const
+_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/InterfaceDef:1.0";
}
-TAO_IR_InterfaceDef_Default_Proxy_Factory::TAO_IR_InterfaceDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_InterfaceDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_InterfaceDef_Default_Proxy_Factory::~TAO_IR_InterfaceDef_Default_Proxy_Factory (void)
+_TAO_InterfaceDef_Remote_Proxy_Broker::_TAO_InterfaceDef_Remote_Proxy_Broker (void)
{
}
-IR_InterfaceDef_ptr
-TAO_IR_InterfaceDef_Default_Proxy_Factory::create_proxy (
- ::IR_InterfaceDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_InterfaceDef_Remote_Proxy_Broker::~_TAO_InterfaceDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_InterfaceDef_Proxy_Factory_Adapter::TAO_IR_InterfaceDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_InterfaceDef_Proxy_Impl&
+_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_InterfaceDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_InterfaceDef_Proxy_Factory_Adapter::~TAO_IR_InterfaceDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_InterfaceDef::IR_InterfaceDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_InterfaceDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_InterfaceDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_InterfaceDef::~IR_InterfaceDef (void)
+{}
+
+void
+IR_InterfaceDef::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_InterfaceDef_Proxy_Broker_ =
+ _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_InterfaceDef_Proxy_Broker_ =
+ ::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
+
+ IR_Container::_tao_setup_collocation (collocated);
+ IR_Contained::_tao_setup_collocation (collocated);
+ IR_IDLType::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_InterfaceDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_InterfaceDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ IR_InterfaceDef *tmp = ACE_static_cast (IR_InterfaceDef*,x);
+ CORBA::release (tmp);
+}
+
+IR_InterfaceDef_ptr IR_InterfaceDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+{
+ if (CORBA::is_nil (obj))
+ return IR_InterfaceDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/InterfaceDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_InterfaceDef::_nil ());
+ if (is_a == 0)
+ return IR_InterfaceDef::_nil ();
}
-return 0;
+ return IR_InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_InterfaceDef_ptr
-TAO_IR_InterfaceDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_InterfaceDef_ptr proxy,
+IR_InterfaceDef_ptr IR_InterfaceDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_InterfaceDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_InterfaceDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_InterfaceDef_ptr default_proxy = IR_InterfaceDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_InterfaceDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_InterfaceDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_InterfaceDef (stub, 0, obj->_servant ()), IR_InterfaceDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_InterfaceDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_InterfaceDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_InterfaceDef_Smart_Proxy_Base::TAO_IR_InterfaceDef_Smart_Proxy_Base (::IR_InterfaceDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_InterfaceDef_ptr
+IR_InterfaceDef::_duplicate (IR_InterfaceDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_InterfaceDef_Smart_Proxy_Base::~TAO_IR_InterfaceDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/InterfaceDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_InterfaceDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_InterfaceDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_InterfaceDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/InterfaceDef:1.0";
}
-IR_InterfaceDefSeq * TAO_IR_InterfaceDef_Smart_Proxy_Base::base_interfaces (
+IR_InterfaceDefSeq * IR_InterfaceDef::base_interfaces (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->base_interfaces (
+
+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_interfaces (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_InterfaceDef_Smart_Proxy_Base::base_interfaces (
+void IR_InterfaceDef::base_interfaces (
const IR_InterfaceDefSeq & base_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
@@ -17482,27 +19148,29 @@ void TAO_IR_InterfaceDef_Smart_Proxy_Base::base_interfaces (
CORBA::SystemException
))
{
- this->base_proxy_->base_interfaces (
+
+ this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_interfaces (
+ this,
base_interfaces,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_InterfaceDef_Smart_Proxy_Base::is_abstract (
+CORBA::Boolean IR_InterfaceDef::is_abstract (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->is_abstract (
+
+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_InterfaceDef_Smart_Proxy_Base::is_abstract (
+void IR_InterfaceDef::is_abstract (
CORBA::Boolean is_abstract,
CORBA::Environment &ACE_TRY_ENV
)
@@ -17510,27 +19178,29 @@ void TAO_IR_InterfaceDef_Smart_Proxy_Base::is_abstract (
CORBA::SystemException
))
{
- this->base_proxy_->is_abstract (
+
+ this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
+ this,
is_abstract,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_InterfaceDef_Smart_Proxy_Base::is_local (
+CORBA::Boolean IR_InterfaceDef::is_local (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->is_local (
+
+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_local (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_InterfaceDef_Smart_Proxy_Base::is_local (
+void IR_InterfaceDef::is_local (
CORBA::Boolean is_local,
CORBA::Environment &ACE_TRY_ENV
)
@@ -17538,14 +19208,15 @@ void TAO_IR_InterfaceDef_Smart_Proxy_Base::is_local (
CORBA::SystemException
))
{
- this->base_proxy_->is_local (
+
+ this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_local (
+ this,
is_local,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_InterfaceDef_Smart_Proxy_Base::is_a (
+CORBA::Boolean IR_InterfaceDef::is_a (
const char * interface_id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -17553,19 +19224,20 @@ CORBA::Boolean TAO_IR_InterfaceDef_Smart_Proxy_Base::is_a (
CORBA::SystemException
))
{
- return this->base_proxy_->is_a (
+
+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
+ this,
interface_id,
ACE_TRY_ENV
);
-
}
-IR_AttributeDef_ptr TAO_IR_InterfaceDef_Smart_Proxy_Base::create_attribute (
+IR_AttributeDef_ptr IR_InterfaceDef::create_attribute (
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr type,
- IR::AttributeMode mode,
+ IR_AttributeMode mode,
const IR_ExceptionDefSeq & get_exceptions,
const IR_ExceptionDefSeq & put_exceptions,
CORBA::Environment &ACE_TRY_ENV
@@ -17574,7 +19246,9 @@ IR_AttributeDef_ptr TAO_IR_InterfaceDef_Smart_Proxy_Base::create_attribute (
CORBA::SystemException
))
{
- return this->base_proxy_->create_attribute (
+
+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_attribute (
+ this,
id,
name,
version,
@@ -17584,15 +19258,14 @@ IR_AttributeDef_ptr TAO_IR_InterfaceDef_Smart_Proxy_Base::create_attribute (
put_exceptions,
ACE_TRY_ENV
);
-
}
-IR_OperationDef_ptr TAO_IR_InterfaceDef_Smart_Proxy_Base::create_operation (
+IR_OperationDef_ptr IR_InterfaceDef::create_operation (
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr result,
- IR::OperationMode mode,
+ IR_OperationMode mode,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
const IR_ContextIdSeq & contexts,
@@ -17602,7 +19275,9 @@ IR_OperationDef_ptr TAO_IR_InterfaceDef_Smart_Proxy_Base::create_operation (
CORBA::SystemException
))
{
- return this->base_proxy_->create_operation (
+
+ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_operation (
+ this,
id,
name,
version,
@@ -17613,16 +19288,8 @@ IR_OperationDef_ptr TAO_IR_InterfaceDef_Smart_Proxy_Base::create_operation (
contexts,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_InterfaceDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_InterfaceDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_InterfaceDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -17634,56 +19301,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDef, &_tc_TAO_tc_IR_InterfaceDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_InterfaceDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/InterfaceDescription:1.0
- 21, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_InterfaceDescription
+ 21, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = InterfaceDescription
10, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -17691,68 +19341,50 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000), // name = operations
CORBA::tk_alias, // typecode kind for typedefs
- 2532, // encapsulation length
+ 1972, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OpDescriptionSeq:1.0
- 17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0), // name = IR_OpDescriptionSeq
+ 17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0), // name = OpDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2456, // encapsulation length
+ 1896, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2440, // encapsulation length
+ 1880, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OperationDescription:1.0
- 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_OperationDescription
+ 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = OperationDescription
9, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -17760,7 +19392,7 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
@@ -17778,31 +19410,25 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
CORBA::tk_alias, // typecode kind for typedefs
- 296, // encapsulation length
+ 228, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ContextIdSeq:1.0
- 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = IR_ContextIdSeq
+ 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = ContextIdSeq
CORBA::tk_sequence, // typecode kind
- 228, // encapsulation length
+ 160, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 212, // encapsulation length
+ 144, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ContextIdentifier:1.0
18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000), // name = ContextIdentifier
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -17810,33 +19436,27 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
CORBA::tk_alias, // typecode kind for typedefs
- 552, // encapsulation length
+ 484, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x61724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParDescriptionSeq:1.0
- 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ParDescriptionSeq
+ 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ParDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 472, // encapsulation length
+ 404, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 456, // encapsulation length
+ 388, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ParameterDescription:1.0
- 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ParameterDescription
+ 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ParameterDescription
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -17865,63 +19485,45 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -17929,7 +19531,7 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -17945,63 +19547,45 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000), // name = attributes
CORBA::tk_alias, // typecode kind for typedefs
- 2424, // encapsulation length
+ 1788, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/AttrDescriptionSeq:1.0
- 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = IR_AttrDescriptionSeq
+ 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = AttrDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2344, // encapsulation length
+ 1708, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2328, // encapsulation length
+ 1692, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/AttributeDescription:1.0
- 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_AttributeDescription
+ 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = AttributeDescription
8, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -18009,7 +19593,7 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -18027,63 +19611,45 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -18091,7 +19657,7 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -18103,63 +19669,45 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -18167,7 +19715,7 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -18183,26 +19731,20 @@ static const CORBA::Long _oc_IR_InterfaceDescription[] =
16, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f696e74), ACE_NTOHL (0x65726661), ACE_NTOHL (0x63657300), // name = base_interfaces
CORBA::tk_alias, // typecode kind for typedefs
- 228, // encapsulation length
+ 156, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
- 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = IR_RepositoryIdSeq
+ 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = RepositoryIdSeq
CORBA::tk_sequence, // typecode kind
- 156, // encapsulation length
+ 84, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -18222,6 +19764,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDescription, &_tc_TAO_tc_IR_InterfaceDescription)
TAO_NAMESPACE_END
+
void IR_InterfaceDescription::_tao_any_destructor (void *x)
{
IR_InterfaceDescription *tmp = ACE_static_cast (IR_InterfaceDescription*,x);
@@ -18232,52 +19775,34 @@ static const CORBA::Long _oc_IR_ValueMember[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ValueMember:1.0
- 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200), // name = IR_ValueMember
+ 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200), // name = ValueMember
7, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -18285,7 +19810,7 @@ static const CORBA::Long _oc_IR_ValueMember[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -18313,6 +19838,7 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMember, &_tc_TAO_tc_IR_ValueMember)
TAO_NAMESPACE_END
+
void IR_ValueMember::_tao_any_destructor (void *x)
{
IR_ValueMember *tmp = ACE_static_cast (IR_ValueMember*,x);
@@ -18321,55 +19847,45 @@ void IR_ValueMember::_tao_any_destructor (void *x)
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ValueMember* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ValueMember *old = ACE_reinterpret_cast (IR_ValueMember *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_ValueMember *tmp = ACE_reinterpret_cast (IR_ValueMember *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_ValueMemberSeq::~_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_VALUEMEMBERSEQ_CS_)
-#define _IR_VALUEMEMBERSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ValueMemberSeq
@@ -18378,30 +19894,30 @@ void IR_ValueMember::_tao_any_destructor (void *x)
IR_ValueMemberSeq::IR_ValueMemberSeq (void)
{}
IR_ValueMemberSeq::IR_ValueMemberSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ValueMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ValueMemberSeq::IR_ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_ValueMember *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ValueMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ValueMemberSeq::IR_ValueMemberSeq (const IR_ValueMemberSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ValueMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ValueMemberSeq::~IR_ValueMemberSeq (void) // dtor
@@ -18412,67 +19928,46 @@ void IR_ValueMemberSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ValueMemberSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ValueMemberSeq:1.0
- 15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000), // name = IR_ValueMemberSeq
+ 15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000), // name = ValueMemberSeq
CORBA::tk_sequence, // typecode kind
- 804, // encapsulation length
+ 592, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 788, // encapsulation length
+ 576, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ValueMember:1.0
- 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200), // name = IR_ValueMember
+ 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200), // name = ValueMember
7, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -18480,7 +19975,7 @@ static const CORBA::Long _oc_IR_ValueMemberSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -18511,71 +20006,37 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberSeq, &_tc_TAO_tc_IR_ValueMemberSeq)
TAO_NAMESPACE_END
-void IR_ValueMemberDef::_tao_any_destructor (void *x)
-{
- IR_ValueMemberDef *tmp = ACE_static_cast (IR_ValueMemberDef*,x);
- CORBA::release (tmp);
-}
-IR_ValueMemberDef_ptr IR_ValueMemberDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ValueMemberDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueMemberDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ValueMemberDef::_nil ());
- if (is_a == 0)
- return IR_ValueMemberDef::_nil ();
- return IR_ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ValueMemberDef_ptr IR_ValueMemberDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ValueMemberDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ValueMemberDef_ptr default_proxy = IR_ValueMemberDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ValueMemberDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ValueMemberDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ValueMemberDef (stub), IR_ValueMemberDef::_nil ());
- return TAO_IR_ValueMemberDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
+{}
-IR_ValueMemberDef_ptr
-IR_ValueMemberDef::_duplicate (IR_ValueMemberDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_ValueMemberDef_Remote_Proxy_Impl::_TAO_ValueMemberDef_Remote_Proxy_Impl (void)
+{}
-CORBA::TypeCode_ptr IR_ValueMemberDef::type (
+// Remote Implementation of the IDL interface methods
+
+CORBA::TypeCode_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_type",
@@ -18583,57 +20044,68 @@ CORBA::TypeCode_ptr IR_ValueMemberDef::type (
0,
istub->orb_core ()
);
+
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
return _tao_safe_retval._retn ();
}
-IR_IDLType_ptr IR_ValueMemberDef::type_def (
+IR_IDLType_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_type_def",
@@ -18646,37 +20118,48 @@ IR_IDLType_ptr IR_ValueMemberDef::type_def (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ValueMemberDef::type_def (
+void _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -18684,15 +20167,11 @@ void IR_ValueMemberDef::type_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_type_def",
@@ -18701,56 +20180,64 @@ void IR_ValueMemberDef::type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << type_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Visibility IR_ValueMemberDef::access (
+CORBA::Visibility _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Visibility _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_access",
@@ -18759,42 +20246,52 @@ CORBA::Visibility IR_ValueMemberDef::access (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_retval)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_ValueMemberDef::access (
+void _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Visibility access,
CORBA::Environment &ACE_TRY_ENV
)
@@ -18802,15 +20299,11 @@ void IR_ValueMemberDef::access (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_access",
@@ -18823,180 +20316,283 @@ void IR_ValueMemberDef::access (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << access)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ValueMemberDef_Proxy_Broker::_TAO_ValueMemberDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueMemberDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ValueMemberDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ValueMemberDef:1.0";
+ static ::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ValueMemberDef_Default_Proxy_Factory::TAO_IR_ValueMemberDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_ValueMemberDef_Remote_Proxy_Broker::_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ValueMemberDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_ValueMemberDef_Default_Proxy_Factory::~TAO_IR_ValueMemberDef_Default_Proxy_Factory (void)
+_TAO_ValueMemberDef_Remote_Proxy_Broker::~_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
{
}
-IR_ValueMemberDef_ptr
-TAO_IR_ValueMemberDef_Default_Proxy_Factory::create_proxy (
- ::IR_ValueMemberDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ValueMemberDef_Proxy_Impl&
+_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ValueMemberDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ValueMemberDef_Proxy_Factory_Adapter::TAO_IR_ValueMemberDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ValueMemberDef::IR_ValueMemberDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_ValueMemberDef_Proxy_Factory_Adapter::~TAO_IR_ValueMemberDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_ValueMemberDef::~IR_ValueMemberDef (void)
+{}
+
+void
+IR_ValueMemberDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_ValueMemberDef_Proxy_Broker_ =
+ _TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ValueMemberDef_Proxy_Broker_ =
+ ::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_ValueMemberDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ValueMemberDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_ValueMemberDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_ValueMemberDef *tmp = ACE_static_cast (IR_ValueMemberDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_ValueMemberDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_ValueMemberDef_ptr IR_ValueMemberDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_ValueMemberDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueMemberDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ValueMemberDef::_nil ());
+ if (is_a == 0)
+ return IR_ValueMemberDef::_nil ();
}
-return 0;
+ return IR_ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ValueMemberDef_ptr
-TAO_IR_ValueMemberDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ValueMemberDef_ptr proxy,
+IR_ValueMemberDef_ptr IR_ValueMemberDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ValueMemberDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ValueMemberDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ValueMemberDef_ptr default_proxy = IR_ValueMemberDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ValueMemberDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ValueMemberDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ValueMemberDef (stub, 0, obj->_servant ()), IR_ValueMemberDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ValueMemberDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ValueMemberDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_ValueMemberDef_Smart_Proxy_Base::TAO_IR_ValueMemberDef_Smart_Proxy_Base (::IR_ValueMemberDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_ValueMemberDef_ptr
+IR_ValueMemberDef::_duplicate (IR_ValueMemberDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ValueMemberDef_Smart_Proxy_Base::~TAO_IR_ValueMemberDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueMemberDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_ValueMemberDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ValueMemberDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_ValueMemberDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ValueMemberDef:1.0";
}
-CORBA::TypeCode_ptr TAO_IR_ValueMemberDef_Smart_Proxy_Base::type (
+CORBA::TypeCode_ptr IR_ValueMemberDef::type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->type (
+
+ return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
+ this,
ACE_TRY_ENV
);
-
}
-IR_IDLType_ptr TAO_IR_ValueMemberDef_Smart_Proxy_Base::type_def (
+IR_IDLType_ptr IR_ValueMemberDef::type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->type_def (
+
+ return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueMemberDef_Smart_Proxy_Base::type_def (
+void IR_ValueMemberDef::type_def (
IR_IDLType_ptr type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19004,27 +20600,29 @@ void TAO_IR_ValueMemberDef_Smart_Proxy_Base::type_def (
CORBA::SystemException
))
{
- this->base_proxy_->type_def (
+
+ this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
+ this,
type_def,
ACE_TRY_ENV
);
-
}
-CORBA::Visibility TAO_IR_ValueMemberDef_Smart_Proxy_Base::access (
+CORBA::Visibility IR_ValueMemberDef::access (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->access (
+
+ return this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).access (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueMemberDef_Smart_Proxy_Base::access (
+void IR_ValueMemberDef::access (
CORBA::Visibility access,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19032,20 +20630,14 @@ void TAO_IR_ValueMemberDef_Smart_Proxy_Base::access (
CORBA::SystemException
))
{
- this->base_proxy_->access (
+
+ this->the_TAO_ValueMemberDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).access (
+ this,
access,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ValueMemberDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ValueMemberDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ValueMemberDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -19057,70 +20649,36 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberDef, &_tc_TAO_tc_IR_ValueMemberDef)
TAO_NAMESPACE_END
-void IR_ValueDef::_tao_any_destructor (void *x)
-{
- IR_ValueDef *tmp = ACE_static_cast (IR_ValueDef*,x);
- CORBA::release (tmp);
-}
-IR_ValueDef_ptr IR_ValueDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ValueDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ValueDef::_nil ());
- if (is_a == 0)
- return IR_ValueDef::_nil ();
- return IR_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ValueDef_ptr IR_ValueDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ValueDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ValueDef_ptr default_proxy = IR_ValueDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ValueDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ValueDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ValueDef (stub), IR_ValueDef::_nil ());
- return TAO_IR_ValueDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
+{}
-IR_ValueDef_ptr
-IR_ValueDef::_duplicate (IR_ValueDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
+{}
-IR_InterfaceDefSeq * IR_ValueDef::supported_interfaces (
+// Remote Implementation of the IDL interface methods
+
+IR_InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_InterfaceDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -19135,37 +20693,48 @@ IR_InterfaceDefSeq * IR_ValueDef::supported_interfaces (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ValueDef::supported_interfaces (
+void _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
const IR_InterfaceDefSeq & supported_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19173,15 +20742,11 @@ void IR_ValueDef::supported_interfaces (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_supported_interfaces",
@@ -19194,51 +20759,60 @@ void IR_ValueDef::supported_interfaces (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << supported_interfaces)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_InitializerSeq * IR_ValueDef::initializers (
+IR_InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_InitializerSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_InitializerSeq, _tao_retval);
IR_InitializerSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -19249,42 +20823,52 @@ IR_InitializerSeq * IR_ValueDef::initializers (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ValueDef::initializers (
+void _TAO_ValueDef_Remote_Proxy_Impl::initializers (
+ CORBA_Object *_collocated_tao_target_,
const IR_InitializerSeq & initializers,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19292,15 +20876,11 @@ void IR_ValueDef::initializers (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_initializers",
@@ -19309,57 +20889,65 @@ void IR_ValueDef::initializers (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << initializers)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_ValueDef_ptr IR_ValueDef::base_value (
+IR_ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
IR_ValueDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_base_value",
@@ -19372,37 +20960,48 @@ IR_ValueDef_ptr IR_ValueDef::base_value (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ValueDef::base_value (
+void _TAO_ValueDef_Remote_Proxy_Impl::base_value (
+ CORBA_Object *_collocated_tao_target_,
IR_ValueDef_ptr base_value,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19410,15 +21009,11 @@ void IR_ValueDef::base_value (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_base_value",
@@ -19427,56 +21022,64 @@ void IR_ValueDef::base_value (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << base_value)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_ValueDefSeq * IR_ValueDef::abstract_base_values (
+IR_ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ValueDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_ValueDefSeq, _tao_retval);
IR_ValueDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -19491,37 +21094,48 @@ IR_ValueDefSeq * IR_ValueDef::abstract_base_values (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ValueDef::abstract_base_values (
+void _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
const IR_ValueDefSeq & abstract_base_values,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19529,15 +21143,11 @@ void IR_ValueDef::abstract_base_values (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_abstract_base_values",
@@ -19550,51 +21160,60 @@ void IR_ValueDef::abstract_base_values (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << abstract_base_values)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Boolean IR_ValueDef::is_abstract (
+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_is_abstract",
@@ -19603,42 +21222,52 @@ CORBA::Boolean IR_ValueDef::is_abstract (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_ValueDef::is_abstract (
+void _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_abstract,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19646,15 +21275,11 @@ void IR_ValueDef::is_abstract (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_is_abstract",
@@ -19667,51 +21292,60 @@ void IR_ValueDef::is_abstract (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << CORBA::Any::from_boolean (is_abstract))
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Boolean IR_ValueDef::is_custom (
+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_is_custom",
@@ -19720,42 +21354,52 @@ CORBA::Boolean IR_ValueDef::is_custom (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_ValueDef::is_custom (
+void _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_custom,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19763,15 +21407,11 @@ void IR_ValueDef::is_custom (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_is_custom",
@@ -19784,51 +21424,60 @@ void IR_ValueDef::is_custom (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << CORBA::Any::from_boolean (is_custom))
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Boolean IR_ValueDef::is_truncatable (
+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_is_truncatable",
@@ -19837,42 +21486,52 @@ CORBA::Boolean IR_ValueDef::is_truncatable (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-void IR_ValueDef::is_truncatable (
+void _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_truncatable,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19880,15 +21539,11 @@ void IR_ValueDef::is_truncatable (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_is_truncatable",
@@ -19901,36 +21556,45 @@ void IR_ValueDef::is_truncatable (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << CORBA::Any::from_boolean (is_truncatable))
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-CORBA::Boolean IR_ValueDef::is_a (
+CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -19938,15 +21602,15 @@ CORBA::Boolean IR_ValueDef::is_a (
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"is_a",
@@ -19955,48 +21619,62 @@ CORBA::Boolean IR_ValueDef::is_a (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ _tao_retval
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-IR_ValueMemberDef_ptr IR_ValueDef::create_value_member (
+IR_ValueMemberDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -20008,16 +21686,16 @@ IR_ValueMemberDef_ptr IR_ValueDef::create_value_member (
CORBA::SystemException
))
{
-
+
IR_ValueMemberDef_ptr _tao_retval = IR_ValueMemberDef::_nil ();
IR_ValueMemberDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_value_member",
@@ -20026,18 +21704,19 @@ IR_ValueMemberDef_ptr IR_ValueDef::create_value_member (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -20046,37 +21725,50 @@ IR_ValueMemberDef_ptr IR_ValueDef::create_value_member (
(_tao_out << type) &&
(_tao_out << access)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_AttributeDef_ptr IR_ValueDef::create_attribute (
+IR_AttributeDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr type,
- IR::AttributeMode mode,
+ IR_AttributeMode mode,
const IR_ExceptionDefSeq & get_exceptions,
const IR_ExceptionDefSeq & put_exceptions,
CORBA::Environment &ACE_TRY_ENV
@@ -20085,16 +21777,16 @@ IR_AttributeDef_ptr IR_ValueDef::create_attribute (
CORBA::SystemException
))
{
-
+
IR_AttributeDef_ptr _tao_retval = IR_AttributeDef::_nil ();
IR_AttributeDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_attribute",
@@ -20107,13 +21799,15 @@ IR_AttributeDef_ptr IR_ValueDef::create_attribute (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -20124,37 +21818,50 @@ IR_AttributeDef_ptr IR_ValueDef::create_attribute (
(_tao_out << get_exceptions) &&
(_tao_out << put_exceptions)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_OperationDef_ptr IR_ValueDef::create_operation (
+IR_OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr result,
- IR::OperationMode mode,
+ IR_OperationMode mode,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
const IR_ContextIdSeq & contexts,
@@ -20164,16 +21871,16 @@ IR_OperationDef_ptr IR_ValueDef::create_operation (
CORBA::SystemException
))
{
-
+
IR_OperationDef_ptr _tao_retval = IR_OperationDef::_nil ();
IR_OperationDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_operation",
@@ -20182,18 +21889,19 @@ IR_OperationDef_ptr IR_ValueDef::create_operation (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -20205,165 +21913,297 @@ IR_OperationDef_ptr IR_ValueDef::create_operation (
(_tao_out << exceptions) &&
(_tao_out << contexts)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ValueDef::_interface_repository_id (void) const
+_TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ValueDef:1.0";
}
-TAO_IR_ValueDef_Default_Proxy_Factory::TAO_IR_ValueDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ValueDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ValueDef_Default_Proxy_Factory::~TAO_IR_ValueDef_Default_Proxy_Factory (void)
+_TAO_ValueDef_Remote_Proxy_Broker::_TAO_ValueDef_Remote_Proxy_Broker (void)
{
}
-IR_ValueDef_ptr
-TAO_IR_ValueDef_Default_Proxy_Factory::create_proxy (
- ::IR_ValueDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ValueDef_Remote_Proxy_Broker::~_TAO_ValueDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_ValueDef_Proxy_Factory_Adapter::TAO_IR_ValueDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_ValueDef_Proxy_Impl&
+_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ValueDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ValueDef_Proxy_Factory_Adapter::~TAO_IR_ValueDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ValueDef::IR_ValueDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_ValueDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ValueDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_ValueDef::~IR_ValueDef (void)
+{}
+
+void
+IR_ValueDef::_tao_setup_collocation (int collocated)
+{
+ if (collocated)
+ this->the_TAO_ValueDef_Proxy_Broker_ =
+ _TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ValueDef_Proxy_Broker_ =
+ ::the_TAO_ValueDef_Remote_Proxy_Broker ();
+
+ IR_Container::_tao_setup_collocation (collocated);
+ IR_Contained::_tao_setup_collocation (collocated);
+ IR_IDLType::_tao_setup_collocation (collocated);
+
+}
+
+void IR_ValueDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_ValueDef *tmp = ACE_static_cast (IR_ValueDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_ValueDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_ValueDef_ptr IR_ValueDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_ValueDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ValueDef::_nil ());
+ if (is_a == 0)
+ return IR_ValueDef::_nil ();
}
-return 0;
+ return IR_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ValueDef_ptr
-TAO_IR_ValueDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ValueDef_ptr proxy,
+IR_ValueDef_ptr IR_ValueDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ValueDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ValueDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ValueDef_ptr default_proxy = IR_ValueDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ValueDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ValueDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ValueDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ValueDef (stub, 0, obj->_servant ()), IR_ValueDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ValueDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ValueDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_ValueDef_Smart_Proxy_Base::TAO_IR_ValueDef_Smart_Proxy_Base (::IR_ValueDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_ValueDef_ptr
+IR_ValueDef::_duplicate (IR_ValueDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ValueDef_Smart_Proxy_Base::~TAO_IR_ValueDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_ValueDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ValueDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_ValueDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_ValueDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ValueDef:1.0";
}
-IR_InterfaceDefSeq * TAO_IR_ValueDef_Smart_Proxy_Base::supported_interfaces (
+IR_InterfaceDefSeq * IR_ValueDef::supported_interfaces (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->supported_interfaces (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueDef_Smart_Proxy_Base::supported_interfaces (
+void IR_ValueDef::supported_interfaces (
const IR_InterfaceDefSeq & supported_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
@@ -20371,27 +22211,29 @@ void TAO_IR_ValueDef_Smart_Proxy_Base::supported_interfaces (
CORBA::SystemException
))
{
- this->base_proxy_->supported_interfaces (
+
+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
+ this,
supported_interfaces,
ACE_TRY_ENV
);
-
}
-IR_InitializerSeq * TAO_IR_ValueDef_Smart_Proxy_Base::initializers (
+IR_InitializerSeq * IR_ValueDef::initializers (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->initializers (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).initializers (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueDef_Smart_Proxy_Base::initializers (
+void IR_ValueDef::initializers (
const IR_InitializerSeq & initializers,
CORBA::Environment &ACE_TRY_ENV
)
@@ -20399,27 +22241,29 @@ void TAO_IR_ValueDef_Smart_Proxy_Base::initializers (
CORBA::SystemException
))
{
- this->base_proxy_->initializers (
+
+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).initializers (
+ this,
initializers,
ACE_TRY_ENV
);
-
}
-IR_ValueDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::base_value (
+IR_ValueDef_ptr IR_ValueDef::base_value (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->base_value (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_value (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueDef_Smart_Proxy_Base::base_value (
+void IR_ValueDef::base_value (
IR_ValueDef_ptr base_value,
CORBA::Environment &ACE_TRY_ENV
)
@@ -20427,27 +22271,29 @@ void TAO_IR_ValueDef_Smart_Proxy_Base::base_value (
CORBA::SystemException
))
{
- this->base_proxy_->base_value (
+
+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_value (
+ this,
base_value,
ACE_TRY_ENV
);
-
}
-IR_ValueDefSeq * TAO_IR_ValueDef_Smart_Proxy_Base::abstract_base_values (
+IR_ValueDefSeq * IR_ValueDef::abstract_base_values (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->abstract_base_values (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).abstract_base_values (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueDef_Smart_Proxy_Base::abstract_base_values (
+void IR_ValueDef::abstract_base_values (
const IR_ValueDefSeq & abstract_base_values,
CORBA::Environment &ACE_TRY_ENV
)
@@ -20455,27 +22301,29 @@ void TAO_IR_ValueDef_Smart_Proxy_Base::abstract_base_values (
CORBA::SystemException
))
{
- this->base_proxy_->abstract_base_values (
+
+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).abstract_base_values (
+ this,
abstract_base_values,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_ValueDef_Smart_Proxy_Base::is_abstract (
+CORBA::Boolean IR_ValueDef::is_abstract (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->is_abstract (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueDef_Smart_Proxy_Base::is_abstract (
+void IR_ValueDef::is_abstract (
CORBA::Boolean is_abstract,
CORBA::Environment &ACE_TRY_ENV
)
@@ -20483,27 +22331,29 @@ void TAO_IR_ValueDef_Smart_Proxy_Base::is_abstract (
CORBA::SystemException
))
{
- this->base_proxy_->is_abstract (
+
+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
+ this,
is_abstract,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_ValueDef_Smart_Proxy_Base::is_custom (
+CORBA::Boolean IR_ValueDef::is_custom (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->is_custom (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_custom (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueDef_Smart_Proxy_Base::is_custom (
+void IR_ValueDef::is_custom (
CORBA::Boolean is_custom,
CORBA::Environment &ACE_TRY_ENV
)
@@ -20511,27 +22361,29 @@ void TAO_IR_ValueDef_Smart_Proxy_Base::is_custom (
CORBA::SystemException
))
{
- this->base_proxy_->is_custom (
+
+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_custom (
+ this,
is_custom,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_ValueDef_Smart_Proxy_Base::is_truncatable (
+CORBA::Boolean IR_ValueDef::is_truncatable (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->is_truncatable (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueDef_Smart_Proxy_Base::is_truncatable (
+void IR_ValueDef::is_truncatable (
CORBA::Boolean is_truncatable,
CORBA::Environment &ACE_TRY_ENV
)
@@ -20539,14 +22391,15 @@ void TAO_IR_ValueDef_Smart_Proxy_Base::is_truncatable (
CORBA::SystemException
))
{
- this->base_proxy_->is_truncatable (
+
+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
+ this,
is_truncatable,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_ValueDef_Smart_Proxy_Base::is_a (
+CORBA::Boolean IR_ValueDef::is_a (
const char * id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -20554,14 +22407,15 @@ CORBA::Boolean TAO_IR_ValueDef_Smart_Proxy_Base::is_a (
CORBA::SystemException
))
{
- return this->base_proxy_->is_a (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
+ this,
id,
ACE_TRY_ENV
);
-
}
-IR_ValueMemberDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_value_member (
+IR_ValueMemberDef_ptr IR_ValueDef::create_value_member (
const char * id,
const char * name,
const char * version,
@@ -20573,7 +22427,9 @@ IR_ValueMemberDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_value_member (
CORBA::SystemException
))
{
- return this->base_proxy_->create_value_member (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_value_member (
+ this,
id,
name,
version,
@@ -20581,15 +22437,14 @@ IR_ValueMemberDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_value_member (
access,
ACE_TRY_ENV
);
-
}
-IR_AttributeDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_attribute (
+IR_AttributeDef_ptr IR_ValueDef::create_attribute (
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr type,
- IR::AttributeMode mode,
+ IR_AttributeMode mode,
const IR_ExceptionDefSeq & get_exceptions,
const IR_ExceptionDefSeq & put_exceptions,
CORBA::Environment &ACE_TRY_ENV
@@ -20598,7 +22453,9 @@ IR_AttributeDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_attribute (
CORBA::SystemException
))
{
- return this->base_proxy_->create_attribute (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_attribute (
+ this,
id,
name,
version,
@@ -20608,15 +22465,14 @@ IR_AttributeDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_attribute (
put_exceptions,
ACE_TRY_ENV
);
-
}
-IR_OperationDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_operation (
+IR_OperationDef_ptr IR_ValueDef::create_operation (
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr result,
- IR::OperationMode mode,
+ IR_OperationMode mode,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
const IR_ContextIdSeq & contexts,
@@ -20626,7 +22482,9 @@ IR_OperationDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_operation (
CORBA::SystemException
))
{
- return this->base_proxy_->create_operation (
+
+ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_operation (
+ this,
id,
name,
version,
@@ -20637,16 +22495,8 @@ IR_OperationDef_ptr TAO_IR_ValueDef_Smart_Proxy_Base::create_operation (
contexts,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ValueDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ValueDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ValueDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -20658,41 +22508,30 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDef, &_tc_TAO_tc_IR_ValueDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ValueDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ValueDescription:1.0
- 17, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ValueDescription
+ 17, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ValueDescription
15, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
12, ACE_NTOHL (0x69735f61), ACE_NTOHL (0x62737472), ACE_NTOHL (0x61637400), // name = is_abstract
CORBA::tk_boolean,
@@ -20702,18 +22541,12 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -20721,68 +22554,50 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000), // name = operations
CORBA::tk_alias, // typecode kind for typedefs
- 2532, // encapsulation length
+ 1972, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OpDescriptionSeq:1.0
- 17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0), // name = IR_OpDescriptionSeq
+ 17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0), // name = OpDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2456, // encapsulation length
+ 1896, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2440, // encapsulation length
+ 1880, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OperationDescription:1.0
- 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_OperationDescription
+ 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = OperationDescription
9, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -20790,7 +22605,7 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
@@ -20808,31 +22623,25 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
CORBA::tk_alias, // typecode kind for typedefs
- 296, // encapsulation length
+ 228, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ContextIdSeq:1.0
- 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = IR_ContextIdSeq
+ 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = ContextIdSeq
CORBA::tk_sequence, // typecode kind
- 228, // encapsulation length
+ 160, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 212, // encapsulation length
+ 144, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ContextIdentifier:1.0
18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000), // name = ContextIdentifier
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -20840,33 +22649,27 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
CORBA::tk_alias, // typecode kind for typedefs
- 552, // encapsulation length
+ 484, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x61724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParDescriptionSeq:1.0
- 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ParDescriptionSeq
+ 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ParDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 472, // encapsulation length
+ 404, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 456, // encapsulation length
+ 388, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ParameterDescription:1.0
- 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ParameterDescription
+ 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ParameterDescription
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -20895,63 +22698,45 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -20959,7 +22744,7 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -20975,63 +22760,45 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000), // name = attributes
CORBA::tk_alias, // typecode kind for typedefs
- 2424, // encapsulation length
+ 1788, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/AttrDescriptionSeq:1.0
- 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = IR_AttrDescriptionSeq
+ 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = AttrDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2344, // encapsulation length
+ 1708, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2328, // encapsulation length
+ 1692, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/AttributeDescription:1.0
- 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_AttributeDescription
+ 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = AttributeDescription
8, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -21039,7 +22806,7 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -21057,63 +22824,45 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -21121,7 +22870,7 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -21133,63 +22882,45 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -21197,7 +22928,7 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -21213,63 +22944,45 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
CORBA::tk_alias, // typecode kind for typedefs
- 876, // encapsulation length
+ 664, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ValueMemberSeq:1.0
- 15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000), // name = IR_ValueMemberSeq
+ 15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000), // name = ValueMemberSeq
CORBA::tk_sequence, // typecode kind
- 804, // encapsulation length
+ 592, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 788, // encapsulation length
+ 576, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ValueMember:1.0
- 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200), // name = IR_ValueMember
+ 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657200), // name = ValueMember
7, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -21277,7 +22990,7 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -21305,48 +23018,42 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
13, ACE_NTOHL (0x696e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657273), ACE_NTOHL (0x0), // name = initializers
CORBA::tk_alias, // typecode kind for typedefs
- 712, // encapsulation length
+ 576, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/InitializerSeq:1.0
15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000), // name = IR_InitializerSeq
CORBA::tk_sequence, // typecode kind
- 640, // encapsulation length
+ 504, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 624, // encapsulation length
+ 488, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/Initializer:1.0
12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200), // name = IR_Initializer
2, // member count
8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
CORBA::tk_alias, // typecode kind for typedefs
- 392, // encapsulation length
+ 324, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = IR_StructMemberSeq
CORBA::tk_sequence, // typecode kind
- 320, // encapsulation length
+ 252, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 304, // encapsulation length
+ 236, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
3, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -21364,18 +23071,12 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -21383,52 +23084,40 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
21, ACE_NTOHL (0x73757070), ACE_NTOHL (0x6f727465), ACE_NTOHL (0x645f696e), ACE_NTOHL (0x74657266), ACE_NTOHL (0x61636573), ACE_NTOHL (0x0), // name = supported_interfaces
CORBA::tk_alias, // typecode kind for typedefs
- 228, // encapsulation length
+ 156, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
- 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = IR_RepositoryIdSeq
+ 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = RepositoryIdSeq
CORBA::tk_sequence, // typecode kind
- 156, // encapsulation length
+ 84, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
0U,
21, ACE_NTOHL (0x61627374), ACE_NTOHL (0x72616374), ACE_NTOHL (0x5f626173), ACE_NTOHL (0x655f7661), ACE_NTOHL (0x6c756573), ACE_NTOHL (0x0), // name = abstract_base_values
CORBA::tk_alias, // typecode kind for typedefs
- 228, // encapsulation length
+ 156, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
- 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = IR_RepositoryIdSeq
+ 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = RepositoryIdSeq
CORBA::tk_sequence, // typecode kind
- 156, // encapsulation length
+ 84, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -21438,18 +23127,12 @@ static const CORBA::Long _oc_IR_ValueDescription[] =
11, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f76616c), ACE_NTOHL (0x75650000), // name = base_value
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -21460,77 +23143,44 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDescription, &_tc_TAO_tc_IR_ValueDescription)
TAO_NAMESPACE_END
+
void IR_ValueDescription::_tao_any_destructor (void *x)
{
IR_ValueDescription *tmp = ACE_static_cast (IR_ValueDescription*,x);
delete tmp;
}
-void IR_ValueBoxDef::_tao_any_destructor (void *x)
-{
- IR_ValueBoxDef *tmp = ACE_static_cast (IR_ValueBoxDef*,x);
- CORBA::release (tmp);
-}
-IR_ValueBoxDef_ptr IR_ValueBoxDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ValueBoxDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueBoxDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ValueBoxDef::_nil ());
- if (is_a == 0)
- return IR_ValueBoxDef::_nil ();
- return IR_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ValueBoxDef_ptr IR_ValueBoxDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ValueBoxDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ValueBoxDef_ptr default_proxy = IR_ValueBoxDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ValueBoxDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ValueBoxDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ValueBoxDef (stub), IR_ValueBoxDef::_nil ());
- return TAO_IR_ValueBoxDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
+{}
-IR_ValueBoxDef_ptr
-IR_ValueBoxDef::_duplicate (IR_ValueBoxDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (void)
+{}
-IR_IDLType_ptr IR_ValueBoxDef::original_type_def (
+// Remote Implementation of the IDL interface methods
+
+IR_IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
IR_IDLType_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_original_type_def",
@@ -21543,36 +23193,48 @@ IR_IDLType_ptr IR_ValueBoxDef::original_type_def (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ValueBoxDef::original_type_def (
+void _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr original_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -21580,15 +23242,11 @@ void IR_ValueBoxDef::original_type_def (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_original_type_def",
@@ -21597,174 +23255,299 @@ void IR_ValueBoxDef::original_type_def (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << original_type_def)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
+}
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ValueBoxDef_Proxy_Broker::_TAO_ValueBoxDef_Proxy_Broker (void)
+{
}
-CORBA::Boolean IR_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+_TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueBoxDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ValueBoxDef::_interface_repository_id (void) const
+// Factory function Implementation.
+_TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ValueBoxDef:1.0";
+ static ::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ValueBoxDef_Default_Proxy_Factory::TAO_IR_ValueBoxDef_Default_Proxy_Factory (int register_proxy_factory)
+_TAO_ValueBoxDef_Remote_Proxy_Broker::_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ValueBoxDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
}
-TAO_IR_ValueBoxDef_Default_Proxy_Factory::~TAO_IR_ValueBoxDef_Default_Proxy_Factory (void)
+_TAO_ValueBoxDef_Remote_Proxy_Broker::~_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
{
}
-IR_ValueBoxDef_ptr
-TAO_IR_ValueBoxDef_Default_Proxy_Factory::create_proxy (
- ::IR_ValueBoxDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ValueBoxDef_Proxy_Impl&
+_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ValueBoxDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- return proxy;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ValueBoxDef_Proxy_Factory_Adapter::TAO_IR_ValueBoxDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ValueBoxDef::IR_ValueBoxDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_ValueBoxDef_Proxy_Factory_Adapter::~TAO_IR_ValueBoxDef_Proxy_Factory_Adapter (void)
+// destructor
+IR_ValueBoxDef::~IR_ValueBoxDef (void)
+{}
+
+void
+IR_ValueBoxDef::_tao_setup_collocation (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ if (collocated)
+ this->the_TAO_ValueBoxDef_Proxy_Broker_ =
+ _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ValueBoxDef_Proxy_Broker_ =
+ ::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
+
+ IR_TypedefDef::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_ValueBoxDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ValueBoxDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+void IR_ValueBoxDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ IR_ValueBoxDef *tmp = ACE_static_cast (IR_ValueBoxDef*,x);
+ CORBA::release (tmp);
}
-int
-TAO_IR_ValueBoxDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+IR_ValueBoxDef_ptr IR_ValueBoxDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_ValueBoxDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueBoxDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ValueBoxDef::_nil ());
+ if (is_a == 0)
+ return IR_ValueBoxDef::_nil ();
}
-return 0;
+ return IR_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ValueBoxDef_ptr
-TAO_IR_ValueBoxDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ValueBoxDef_ptr proxy,
+IR_ValueBoxDef_ptr IR_ValueBoxDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ValueBoxDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ValueBoxDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ValueBoxDef_ptr default_proxy = IR_ValueBoxDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ValueBoxDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ValueBoxDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ValueBoxDef (stub, 0, obj->_servant ()), IR_ValueBoxDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ValueBoxDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ValueBoxDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_ValueBoxDef_Smart_Proxy_Base::TAO_IR_ValueBoxDef_Smart_Proxy_Base (::IR_ValueBoxDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_ValueBoxDef_ptr
+IR_ValueBoxDef::_duplicate (IR_ValueBoxDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ValueBoxDef_Smart_Proxy_Base::~TAO_IR_ValueBoxDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueBoxDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_ValueBoxDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ValueBoxDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_ValueBoxDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ValueBoxDef:1.0";
}
-IR_IDLType_ptr TAO_IR_ValueBoxDef_Smart_Proxy_Base::original_type_def (
+IR_IDLType_ptr IR_ValueBoxDef::original_type_def (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->original_type_def (
+
+ return this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ValueBoxDef_Smart_Proxy_Base::original_type_def (
+void IR_ValueBoxDef::original_type_def (
IR_IDLType_ptr original_type_def,
CORBA::Environment &ACE_TRY_ENV
)
@@ -21772,20 +23555,14 @@ void TAO_IR_ValueBoxDef_Smart_Proxy_Base::original_type_def (
CORBA::SystemException
))
{
- this->base_proxy_->original_type_def (
+
+ this->the_TAO_ValueBoxDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
+ this,
original_type_def,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ValueBoxDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ValueBoxDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ValueBoxDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -21797,71 +23574,37 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueBoxDef, &_tc_TAO_tc_IR_ValueBoxDef)
TAO_NAMESPACE_END
-void IR_ProvidesDef::_tao_any_destructor (void *x)
-{
- IR_ProvidesDef *tmp = ACE_static_cast (IR_ProvidesDef*,x);
- CORBA::release (tmp);
-}
-IR_ProvidesDef_ptr IR_ProvidesDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ProvidesDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ProvidesDef::_nil ());
- if (is_a == 0)
- return IR_ProvidesDef::_nil ();
- return IR_ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ProvidesDef_ptr IR_ProvidesDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ProvidesDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ProvidesDef_ptr default_proxy = IR_ProvidesDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ProvidesDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ProvidesDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ProvidesDef (stub), IR_ProvidesDef::_nil ());
- return TAO_IR_ProvidesDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
+{}
-IR_ProvidesDef_ptr
-IR_ProvidesDef::_duplicate (IR_ProvidesDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
+{}
-IR_InterfaceDef_ptr IR_ProvidesDef::interface_type (
- CORBA::Environment &ACE_TRY_ENV
+// Remote Implementation of the IDL interface methods
+
+IR_InterfaceDef_ptr _TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_interface_type",
@@ -21874,174 +23617,271 @@ IR_InterfaceDef_ptr IR_ProvidesDef::interface_type (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ProvidesDef::_interface_repository_id (void) const
+_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ProvidesDef:1.0";
}
-TAO_IR_ProvidesDef_Default_Proxy_Factory::TAO_IR_ProvidesDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ProvidesDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ProvidesDef_Default_Proxy_Factory::~TAO_IR_ProvidesDef_Default_Proxy_Factory (void)
+_TAO_ProvidesDef_Remote_Proxy_Broker::_TAO_ProvidesDef_Remote_Proxy_Broker (void)
{
}
-IR_ProvidesDef_ptr
-TAO_IR_ProvidesDef_Default_Proxy_Factory::create_proxy (
- ::IR_ProvidesDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_ProvidesDef_Proxy_Factory_Adapter::TAO_IR_ProvidesDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_ProvidesDef_Proxy_Impl&
+_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ProvidesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ProvidesDef_Proxy_Factory_Adapter::~TAO_IR_ProvidesDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ProvidesDef::IR_ProvidesDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_ProvidesDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ProvidesDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_ProvidesDef::~IR_ProvidesDef (void)
+{}
+
+void
+IR_ProvidesDef::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_ProvidesDef_Proxy_Broker_ =
+ _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ProvidesDef_Proxy_Broker_ =
+ ::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_ProvidesDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_ProvidesDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ IR_ProvidesDef *tmp = ACE_static_cast (IR_ProvidesDef*,x);
+ CORBA::release (tmp);
+}
+
+IR_ProvidesDef_ptr IR_ProvidesDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+{
+ if (CORBA::is_nil (obj))
+ return IR_ProvidesDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ProvidesDef::_nil ());
+ if (is_a == 0)
+ return IR_ProvidesDef::_nil ();
}
-return 0;
+ return IR_ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ProvidesDef_ptr
-TAO_IR_ProvidesDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ProvidesDef_ptr proxy,
+IR_ProvidesDef_ptr IR_ProvidesDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ProvidesDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ProvidesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ProvidesDef_ptr default_proxy = IR_ProvidesDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ProvidesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ProvidesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ProvidesDef (stub, 0, obj->_servant ()), IR_ProvidesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ProvidesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ProvidesDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_ProvidesDef_Smart_Proxy_Base::TAO_IR_ProvidesDef_Smart_Proxy_Base (::IR_ProvidesDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_ProvidesDef_ptr
+IR_ProvidesDef::_duplicate (IR_ProvidesDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ProvidesDef_Smart_Proxy_Base::~TAO_IR_ProvidesDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_ProvidesDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ProvidesDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_ProvidesDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ProvidesDef:1.0";
}
-IR_InterfaceDef_ptr TAO_IR_ProvidesDef_Smart_Proxy_Base::interface_type (
+IR_InterfaceDef_ptr IR_ProvidesDef::interface_type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->interface_type (
+
+ return this->the_TAO_ProvidesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).interface_type (
+ this,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ProvidesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ProvidesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ProvidesDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -22053,56 +23893,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDef, &_tc_TAO_tc_IR_ProvidesDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ProvidesDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ProvidesDescription:1.0
- 20, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = IR_ProvidesDescription
+ 20, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = ProvidesDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -22110,7 +23933,7 @@ static const CORBA::Long _oc_IR_ProvidesDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
@@ -22126,77 +23949,44 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescription, &_tc_TAO_tc_IR_ProvidesDescription)
TAO_NAMESPACE_END
+
void IR_ProvidesDescription::_tao_any_destructor (void *x)
{
IR_ProvidesDescription *tmp = ACE_static_cast (IR_ProvidesDescription*,x);
delete tmp;
}
-void IR_UsesDef::_tao_any_destructor (void *x)
-{
- IR_UsesDef *tmp = ACE_static_cast (IR_UsesDef*,x);
- CORBA::release (tmp);
-}
-IR_UsesDef_ptr IR_UsesDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_UsesDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_UsesDef::_nil ());
- if (is_a == 0)
- return IR_UsesDef::_nil ();
- return IR_UsesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_UsesDef_ptr IR_UsesDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_UsesDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_UsesDef_ptr default_proxy = IR_UsesDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_UsesDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_UsesDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_UsesDef (stub), IR_UsesDef::_nil ());
- return TAO_IR_UsesDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
+{}
-IR_UsesDef_ptr
-IR_UsesDef::_duplicate (IR_UsesDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
+{}
-IR_InterfaceDef_ptr IR_UsesDef::interface_type (
+// Remote Implementation of the IDL interface methods
+
+IR_InterfaceDef_ptr _TAO_UsesDef_Remote_Proxy_Impl::interface_type (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_interface_type",
@@ -22209,52 +23999,63 @@ IR_InterfaceDef_ptr IR_UsesDef::interface_type (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_UsesDef::is_multiple (
+CORBA::Boolean _TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_is_multiple",
@@ -22267,186 +24068,285 @@ CORBA::Boolean IR_UsesDef::is_multiple (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-CORBA::Boolean IR_UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_UsesDef::_interface_repository_id (void) const
+_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/UsesDef:1.0";
}
-TAO_IR_UsesDef_Default_Proxy_Factory::TAO_IR_UsesDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_UsesDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_UsesDef_Default_Proxy_Factory::~TAO_IR_UsesDef_Default_Proxy_Factory (void)
+_TAO_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_Remote_Proxy_Broker (void)
{
}
-IR_UsesDef_ptr
-TAO_IR_UsesDef_Default_Proxy_Factory::create_proxy (
- ::IR_UsesDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_UsesDef_Proxy_Factory_Adapter::TAO_IR_UsesDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_UsesDef_Proxy_Impl&
+_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_UsesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_UsesDef_Proxy_Factory_Adapter::~TAO_IR_UsesDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_UsesDef::IR_UsesDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_UsesDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_UsesDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_UsesDef::~IR_UsesDef (void)
+{}
+
+void
+IR_UsesDef::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_UsesDef_Proxy_Broker_ =
+ _TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_UsesDef_Proxy_Broker_ =
+ ::the_TAO_UsesDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_UsesDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_UsesDef::_tao_any_destructor (void *x)
+{
+ IR_UsesDef *tmp = ACE_static_cast (IR_UsesDef*,x);
+ CORBA::release (tmp);
+}
+
+IR_UsesDef_ptr IR_UsesDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_UsesDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_UsesDef::_nil ());
+ if (is_a == 0)
+ return IR_UsesDef::_nil ();
}
-return 0;
+ return IR_UsesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_UsesDef_ptr
-TAO_IR_UsesDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_UsesDef_ptr proxy,
+IR_UsesDef_ptr IR_UsesDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_UsesDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_UsesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_UsesDef_ptr default_proxy = IR_UsesDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_UsesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_UsesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_UsesDef (stub, 0, obj->_servant ()), IR_UsesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_UsesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_UsesDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_UsesDef_Smart_Proxy_Base::TAO_IR_UsesDef_Smart_Proxy_Base (::IR_UsesDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_UsesDef_ptr
+IR_UsesDef::_duplicate (IR_UsesDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_UsesDef_Smart_Proxy_Base::~TAO_IR_UsesDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_UsesDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_UsesDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_UsesDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_UsesDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/UsesDef:1.0";
}
-IR_InterfaceDef_ptr TAO_IR_UsesDef_Smart_Proxy_Base::interface_type (
+IR_InterfaceDef_ptr IR_UsesDef::interface_type (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->interface_type (
+
+ return this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).interface_type (
+ this,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_UsesDef_Smart_Proxy_Base::is_multiple (
+CORBA::Boolean IR_UsesDef::is_multiple (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->is_multiple (
+
+ return this->the_TAO_UsesDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_multiple (
+ this,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_UsesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_UsesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_UsesDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -22458,56 +24358,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDef, &_tc_TAO_tc_IR_UsesDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_UsesDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UsesDescription:1.0
- 16, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = IR_UsesDescription
+ 16, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = UsesDescription
6, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -22515,7 +24398,7 @@ static const CORBA::Long _oc_IR_UsesDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
@@ -22534,63 +24417,53 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescription, &_tc_TAO_tc_IR_UsesDescription)
TAO_NAMESPACE_END
+
void IR_UsesDescription::_tao_any_destructor (void *x)
{
IR_UsesDescription *tmp = ACE_static_cast (IR_UsesDescription*,x);
delete tmp;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_allocate_buffer (CORBA::ULong length)
{
IR_ProvidesDescription* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_ProvidesDescription *old = ACE_reinterpret_cast (IR_ProvidesDescription *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_ProvidesDescription *tmp = ACE_reinterpret_cast (IR_ProvidesDescription *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PROVIDESDESCSEQ_CS_)
-#define _IR_PROVIDESDESCSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ProvidesDescSeq
@@ -22599,30 +24472,30 @@ void IR_UsesDescription::_tao_any_destructor (void *x)
IR_ProvidesDescSeq::IR_ProvidesDescSeq (void)
{}
IR_ProvidesDescSeq::IR_ProvidesDescSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ProvidesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_ProvidesDescSeq::IR_ProvidesDescSeq (CORBA::ULong max, CORBA::ULong length, IR_ProvidesDescription *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ProvidesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_ProvidesDescSeq::IR_ProvidesDescSeq (const IR_ProvidesDescSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ProvidesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_ProvidesDescSeq::~IR_ProvidesDescSeq (void) // dtor
@@ -22633,67 +24506,46 @@ void IR_ProvidesDescSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65736353), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ProvidesDescSeq:1.0
- 16, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x53657100), // name = IR_ProvidesDescSeq
+ 16, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x53657100), // name = ProvidesDescSeq
CORBA::tk_sequence, // typecode kind
- 736, // encapsulation length
+ 524, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 720, // encapsulation length
+ 508, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ProvidesDescription:1.0
- 20, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = IR_ProvidesDescription
+ 20, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = ProvidesDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -22701,7 +24553,7 @@ static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
@@ -22722,55 +24574,45 @@ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescSeq, &_tc_TAO_tc_IR_P
TAO_NAMESPACE_END
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_
-
+
void
_TAO_Unbounded_Sequence_IR_UsesDescSeq::_allocate_buffer (CORBA::ULong length)
{
IR_UsesDescription* tmp = 0;
tmp = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (length);
-
+
if (this->buffer_ != 0)
{
IR_UsesDescription *old = ACE_reinterpret_cast (IR_UsesDescription *,this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp[i] = old[i];
-
+
if (this->release_)
_TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (old);
-
+
}
this->buffer_ = tmp;
}
-
+
void
_TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
{
if (this->buffer_ == 0 || this->release_ == 0)
return;
-
+
IR_UsesDescription *tmp = ACE_reinterpret_cast (IR_UsesDescription *,this->buffer_);
-
+
_TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
this->buffer_ = 0;
- }
-
+ }
+
_TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Dtor.
{
this->_deallocate_buffer ();
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_USESDESCSEQ_CS_)
-#define _IR_USESDESCSEQ_CS_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_UsesDescSeq
@@ -22779,30 +24621,30 @@ TAO_NAMESPACE_END
IR_UsesDescSeq::IR_UsesDescSeq (void)
{}
IR_UsesDescSeq::IR_UsesDescSeq (CORBA::ULong max) // uses max size
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_UsesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_UsesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max)
{}
IR_UsesDescSeq::IR_UsesDescSeq (CORBA::ULong max, CORBA::ULong length, IR_UsesDescription *buffer, CORBA::Boolean release)
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_UsesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_UsesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(max, length, buffer, release)
{}
IR_UsesDescSeq::IR_UsesDescSeq (const IR_UsesDescSeq &seq) // copy ctor
- :
+ :
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_UsesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_UsesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
(seq)
{}
IR_UsesDescSeq::~IR_UsesDescSeq (void) // dtor
@@ -22813,67 +24655,46 @@ void IR_UsesDescSeq::_tao_any_destructor (void *x)
delete tmp;
}
-
-#endif /* end #if !defined */
-
static const CORBA::Long _oc_IR_UsesDescSeq[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65736353), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UsesDescSeq:1.0
- 12, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x53657100), // name = IR_UsesDescSeq
+ 12, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x53657100), // name = UsesDescSeq
CORBA::tk_sequence, // typecode kind
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 732, // encapsulation length
+ 520, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UsesDescription:1.0
- 16, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = IR_UsesDescription
+ 16, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = UsesDescription
6, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -22881,7 +24702,7 @@ static const CORBA::Long _oc_IR_UsesDescSeq[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
15, ACE_NTOHL (0x696e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x655f7479), ACE_NTOHL (0x70650000), // name = interface_type
@@ -22903,55 +24724,21 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
TAO_NAMESPACE_END
-void IR_EventDef::_tao_any_destructor (void *x)
-{
- IR_EventDef *tmp = ACE_static_cast (IR_EventDef*,x);
- CORBA::release (tmp);
-}
-IR_EventDef_ptr IR_EventDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_EventDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_EventDef::_nil ());
- if (is_a == 0)
- return IR_EventDef::_nil ();
- return IR_EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_EventDef_ptr IR_EventDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_EventDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_EventDef_ptr default_proxy = IR_EventDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_EventDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_EventDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_EventDef (stub), IR_EventDef::_nil ());
- return TAO_IR_EventDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
+{}
-IR_EventDef_ptr
-IR_EventDef::_duplicate (IR_EventDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
+{}
-CORBA::Boolean IR_EventDef::is_a (
+// Remote Implementation of the IDL interface methods
+
+CORBA::Boolean _TAO_EventDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
const char * event_id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -22959,15 +24746,15 @@ CORBA::Boolean IR_EventDef::is_a (
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"is_a",
@@ -22975,63 +24762,79 @@ CORBA::Boolean IR_EventDef::is_a (
1,
istub->orb_core ()
);
+
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << event_id)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ _tao_retval
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-IR_ValueDef_ptr IR_EventDef::event (
+IR_ValueDef_ptr _TAO_EventDef_Remote_Proxy_Impl::event (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
IR_ValueDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_event",
@@ -23040,160 +24843,262 @@ IR_ValueDef_ptr IR_EventDef::event (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_EventDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_EventDef::_interface_repository_id (void) const
+_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/EventDef:1.0";
}
-TAO_IR_EventDef_Default_Proxy_Factory::TAO_IR_EventDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_EventDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_EventDef_Default_Proxy_Factory::~TAO_IR_EventDef_Default_Proxy_Factory (void)
+_TAO_EventDef_Remote_Proxy_Broker::_TAO_EventDef_Remote_Proxy_Broker (void)
{
}
-IR_EventDef_ptr
-TAO_IR_EventDef_Default_Proxy_Factory::create_proxy (
- ::IR_EventDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_EventDef_Proxy_Factory_Adapter::TAO_IR_EventDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_EventDef_Proxy_Impl&
+_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_EventDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_EventDef_Proxy_Factory_Adapter::~TAO_IR_EventDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_EventDef::IR_EventDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_EventDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_EventDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_EventDef::~IR_EventDef (void)
+{}
+
+void
+IR_EventDef::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_EventDef_Proxy_Broker_ =
+ _TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_EventDef_Proxy_Broker_ =
+ ::the_TAO_EventDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_EventDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_EventDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ IR_EventDef *tmp = ACE_static_cast (IR_EventDef*,x);
+ CORBA::release (tmp);
+}
+
+IR_EventDef_ptr IR_EventDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+{
+ if (CORBA::is_nil (obj))
+ return IR_EventDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_EventDef::_nil ());
+ if (is_a == 0)
+ return IR_EventDef::_nil ();
}
-return 0;
+ return IR_EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_EventDef_ptr
-TAO_IR_EventDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_EventDef_ptr proxy,
+IR_EventDef_ptr IR_EventDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_EventDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_EventDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_EventDef_ptr default_proxy = IR_EventDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_EventDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_EventDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_EventDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_EventDef (stub, 0, obj->_servant ()), IR_EventDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_EventDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_EventDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_EventDef_Smart_Proxy_Base::TAO_IR_EventDef_Smart_Proxy_Base (::IR_EventDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_EventDef_ptr
+IR_EventDef::_duplicate (IR_EventDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_EventDef_Smart_Proxy_Base::~TAO_IR_EventDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_EventDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_EventDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_EventDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_EventDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_EventDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/EventDef:1.0";
}
-CORBA::Boolean TAO_IR_EventDef_Smart_Proxy_Base::is_a (
+CORBA::Boolean IR_EventDef::is_a (
const char * event_id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -23201,33 +25106,28 @@ CORBA::Boolean TAO_IR_EventDef_Smart_Proxy_Base::is_a (
CORBA::SystemException
))
{
- return this->base_proxy_->is_a (
+
+ return this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
+ this,
event_id,
ACE_TRY_ENV
);
-
}
-IR_ValueDef_ptr TAO_IR_EventDef_Smart_Proxy_Base::event (
+IR_ValueDef_ptr IR_EventDef::event (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->event (
+
+ return this->the_TAO_EventDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).event (
+ this,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_EventDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_EventDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_EventDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -23239,56 +25139,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EventDef, &_tc_TAO_tc_IR_EventDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_EventDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x76656e74), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/EventDescription:1.0
- 17, ACE_NTOHL (0x4576656e), ACE_NTOHL (0x74446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_EventDescription
+ 17, ACE_NTOHL (0x4576656e), ACE_NTOHL (0x74446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = EventDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -23296,7 +25179,7 @@ static const CORBA::Long _oc_IR_EventDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
6, ACE_NTOHL (0x76616c75), ACE_NTOHL (0x65000000), // name = value
@@ -23312,12 +25195,100 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EventDescription, &_tc_TAO_tc_IR_EventDescription)
TAO_NAMESPACE_END
+
void IR_EventDescription::_tao_any_destructor (void *x)
{
IR_EventDescription *tmp = ACE_static_cast (IR_EventDescription*,x);
delete tmp;
}
+
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
+
+_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
+{}
+
+_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
+{
+}
+
+_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
+{
+}
+
+// Factory function Implementation.
+_TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void)
+{
+ static ::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+}
+
+_TAO_EmitsDef_Remote_Proxy_Broker::_TAO_EmitsDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_EmitsDef_Proxy_Impl&
+_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_EmitsDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
+{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
+}
+
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_EmitsDef::IR_EmitsDef (int collocated)
+{
+ this->_tao_setup_collocation (collocated);
+}
+
+// destructor
+IR_EmitsDef::~IR_EmitsDef (void)
+{}
+
+void
+IR_EmitsDef::_tao_setup_collocation (int collocated)
+{
+ if (collocated)
+ this->the_TAO_EmitsDef_Proxy_Broker_ =
+ _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_EmitsDef_Proxy_Broker_ =
+ ::the_TAO_EmitsDef_Remote_Proxy_Broker ();
+
+ IR_EventDef::_tao_setup_collocation (collocated);
+
+}
+
void IR_EmitsDef::_tao_any_destructor (void *x)
{
IR_EmitsDef *tmp = ACE_static_cast (IR_EmitsDef*,x);
@@ -23331,10 +25302,13 @@ IR_EmitsDef_ptr IR_EmitsDef::_narrow (
{
if (CORBA::is_nil (obj))
return IR_EmitsDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_EmitsDef::_nil ());
- if (is_a == 0)
- return IR_EmitsDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_EmitsDef::_nil ());
+ if (is_a == 0)
+ return IR_EmitsDef::_nil ();
+ }
return IR_EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
@@ -23345,17 +25319,46 @@ IR_EmitsDef_ptr IR_EmitsDef::_unchecked_narrow (
{
if (CORBA::is_nil (obj))
return IR_EmitsDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_EmitsDef_ptr default_proxy = IR_EmitsDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_EmitsDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_EmitsDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_EmitsDef (stub), IR_EmitsDef::_nil ());
- return TAO_IR_EmitsDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_EmitsDef_ptr default_proxy = IR_EmitsDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_EmitsDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_EmitsDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_EmitsDef (stub, 0, obj->_servant ()), IR_EmitsDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_EmitsDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_EmitsDef::_narrow
+ )
+ )
+ );
}
IR_EmitsDef_ptr
@@ -23379,130 +25382,161 @@ CORBA::Boolean IR_EmitsDef::_is_a (const CORBA::Char *value, CORBA::Environment
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
+void *IR_EmitsDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_EmitsDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_EventDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_EventDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
const char* IR_EmitsDef::_interface_repository_id (void) const
{
return "IDL:omg.org/IR/EmitsDef:1.0";
}
-TAO_IR_EmitsDef_Default_Proxy_Factory::TAO_IR_EmitsDef_Default_Proxy_Factory (int register_proxy_factory)
+static const CORBA::Long _oc_IR_EmitsDef[] =
{
- if (register_proxy_factory)
- {
- TAO_IR_EmitsDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/EmitsDef:1.0
+ 9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_EmitsDef
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDef (CORBA::tk_objref, sizeof (_oc_IR_EmitsDef), (char *) &_oc_IR_EmitsDef, 0, sizeof (IR_EmitsDef));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
+TAO_NAMESPACE_END
-TAO_IR_EmitsDef_Default_Proxy_Factory::~TAO_IR_EmitsDef_Default_Proxy_Factory (void)
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
+
+_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
+{}
+
+_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
{
}
-IR_EmitsDef_ptr
-TAO_IR_EmitsDef_Default_Proxy_Factory::create_proxy (
- ::IR_EmitsDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_EmitsDef_Proxy_Factory_Adapter::TAO_IR_EmitsDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+// Factory function Implementation.
+_TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void)
{
+ static ::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_EmitsDef_Proxy_Factory_Adapter::~TAO_IR_EmitsDef_Proxy_Factory_Adapter (void)
+_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
}
-int
-TAO_IR_EmitsDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_EmitsDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
}
-int
-TAO_IR_EmitsDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+_TAO_PublishesDef_Proxy_Impl&
+_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_PublishesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-IR_EmitsDef_ptr
-TAO_IR_EmitsDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_EmitsDef_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_EmitsDef_Default_Proxy_Factory (1),
- 0);
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
- return this->proxy_factory_->create_proxy (proxy);
-}
-TAO_IR_EmitsDef_Smart_Proxy_Base::TAO_IR_EmitsDef_Smart_Proxy_Base (::IR_EmitsDef_ptr proxy)
-: base_proxy_ (proxy)
+// default constructor
+IR_PublishesDef::IR_PublishesDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_EmitsDef_Smart_Proxy_Base::~TAO_IR_EmitsDef_Smart_Proxy_Base (void)
-{
-}
+// destructor
+IR_PublishesDef::~IR_PublishesDef (void)
+{}
-TAO_Stub *
-TAO_IR_EmitsDef_Smart_Proxy_Base::_stubobj (void) const
+void
+IR_PublishesDef::_tao_setup_collocation (int collocated)
{
- return this->base_proxy_->_stubobj ();
+ if (collocated)
+ this->the_TAO_PublishesDef_Proxy_Broker_ =
+ _TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_PublishesDef_Proxy_Broker_ =
+ ::the_TAO_PublishesDef_Remote_Proxy_Broker ();
+
+ IR_EventDef::_tao_setup_collocation (collocated);
+
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_EmitsDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_EmitsDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-static const CORBA::Long _oc_IR_EmitsDef[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/EmitsDef:1.0
- 9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_EmitsDef
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDef (CORBA::tk_objref, sizeof (_oc_IR_EmitsDef), (char *) &_oc_IR_EmitsDef, 0, sizeof (IR_EmitsDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
-TAO_NAMESPACE_END
void IR_PublishesDef::_tao_any_destructor (void *x)
{
IR_PublishesDef *tmp = ACE_static_cast (IR_PublishesDef*,x);
@@ -23516,10 +25550,13 @@ IR_PublishesDef_ptr IR_PublishesDef::_narrow (
{
if (CORBA::is_nil (obj))
return IR_PublishesDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_PublishesDef::_nil ());
- if (is_a == 0)
- return IR_PublishesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_PublishesDef::_nil ());
+ if (is_a == 0)
+ return IR_PublishesDef::_nil ();
+ }
return IR_PublishesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
@@ -23530,17 +25567,46 @@ IR_PublishesDef_ptr IR_PublishesDef::_unchecked_narrow (
{
if (CORBA::is_nil (obj))
return IR_PublishesDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_PublishesDef_ptr default_proxy = IR_PublishesDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_PublishesDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_PublishesDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_PublishesDef (stub), IR_PublishesDef::_nil ());
- return TAO_IR_PublishesDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_PublishesDef_ptr default_proxy = IR_PublishesDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_PublishesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_PublishesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_PublishesDef (stub, 0, obj->_servant ()), IR_PublishesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_PublishesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_PublishesDef::_narrow
+ )
+ )
+ );
}
IR_PublishesDef_ptr
@@ -23564,130 +25630,161 @@ CORBA::Boolean IR_PublishesDef::_is_a (const CORBA::Char *value, CORBA::Environm
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
+void *IR_PublishesDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_PublishesDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_EventDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_EventDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
const char* IR_PublishesDef::_interface_repository_id (void) const
{
return "IDL:omg.org/IR/PublishesDef:1.0";
}
-TAO_IR_PublishesDef_Default_Proxy_Factory::TAO_IR_PublishesDef_Default_Proxy_Factory (int register_proxy_factory)
+static const CORBA::Long _oc_IR_PublishesDef[] =
{
- if (register_proxy_factory)
- {
- TAO_IR_PublishesDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/PublishesDef:1.0
+ 13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_PublishesDef
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDef (CORBA::tk_objref, sizeof (_oc_IR_PublishesDef), (char *) &_oc_IR_PublishesDef, 0, sizeof (IR_PublishesDef));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
+TAO_NAMESPACE_END
-TAO_IR_PublishesDef_Default_Proxy_Factory::~TAO_IR_PublishesDef_Default_Proxy_Factory (void)
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
+
+_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
+{}
+
+_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
{
}
-IR_PublishesDef_ptr
-TAO_IR_PublishesDef_Default_Proxy_Factory::create_proxy (
- ::IR_PublishesDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_PublishesDef_Proxy_Factory_Adapter::TAO_IR_PublishesDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+// Factory function Implementation.
+_TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
{
+ static ::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_PublishesDef_Proxy_Factory_Adapter::~TAO_IR_PublishesDef_Proxy_Factory_Adapter (void)
+_TAO_ConsumesDef_Remote_Proxy_Broker::_TAO_ConsumesDef_Remote_Proxy_Broker (void)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
}
-int
-TAO_IR_PublishesDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_PublishesDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker (void)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
}
-int
-TAO_IR_PublishesDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+_TAO_ConsumesDef_Proxy_Impl&
+_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ConsumesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-IR_PublishesDef_ptr
-TAO_IR_PublishesDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_PublishesDef_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_PublishesDef_Default_Proxy_Factory (1),
- 0);
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
- return this->proxy_factory_->create_proxy (proxy);
-}
-TAO_IR_PublishesDef_Smart_Proxy_Base::TAO_IR_PublishesDef_Smart_Proxy_Base (::IR_PublishesDef_ptr proxy)
-: base_proxy_ (proxy)
+// default constructor
+IR_ConsumesDef::IR_ConsumesDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_PublishesDef_Smart_Proxy_Base::~TAO_IR_PublishesDef_Smart_Proxy_Base (void)
-{
-}
+// destructor
+IR_ConsumesDef::~IR_ConsumesDef (void)
+{}
-TAO_Stub *
-TAO_IR_PublishesDef_Smart_Proxy_Base::_stubobj (void) const
+void
+IR_ConsumesDef::_tao_setup_collocation (int collocated)
{
- return this->base_proxy_->_stubobj ();
+ if (collocated)
+ this->the_TAO_ConsumesDef_Proxy_Broker_ =
+ _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ConsumesDef_Proxy_Broker_ =
+ ::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
+
+ IR_EventDef::_tao_setup_collocation (collocated);
+
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_PublishesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_PublishesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-static const CORBA::Long _oc_IR_PublishesDef[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/PublishesDef:1.0
- 13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_PublishesDef
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDef (CORBA::tk_objref, sizeof (_oc_IR_PublishesDef), (char *) &_oc_IR_PublishesDef, 0, sizeof (IR_PublishesDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
-TAO_NAMESPACE_END
void IR_ConsumesDef::_tao_any_destructor (void *x)
{
IR_ConsumesDef *tmp = ACE_static_cast (IR_ConsumesDef*,x);
@@ -23701,10 +25798,13 @@ IR_ConsumesDef_ptr IR_ConsumesDef::_narrow (
{
if (CORBA::is_nil (obj))
return IR_ConsumesDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ConsumesDef::_nil ());
- if (is_a == 0)
- return IR_ConsumesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ConsumesDef::_nil ());
+ if (is_a == 0)
+ return IR_ConsumesDef::_nil ();
+ }
return IR_ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
@@ -23715,17 +25815,46 @@ IR_ConsumesDef_ptr IR_ConsumesDef::_unchecked_narrow (
{
if (CORBA::is_nil (obj))
return IR_ConsumesDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ConsumesDef_ptr default_proxy = IR_ConsumesDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ConsumesDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ConsumesDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ConsumesDef (stub), IR_ConsumesDef::_nil ());
- return TAO_IR_ConsumesDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ConsumesDef_ptr default_proxy = IR_ConsumesDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ConsumesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ConsumesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ConsumesDef (stub, 0, obj->_servant ()), IR_ConsumesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ConsumesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ConsumesDef::_narrow
+ )
+ )
+ );
}
IR_ConsumesDef_ptr
@@ -23749,119 +25878,63 @@ CORBA::Boolean IR_ConsumesDef::_is_a (const CORBA::Char *value, CORBA::Environme
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ConsumesDef::_interface_repository_id (void) const
-{
- return "IDL:omg.org/IR/ConsumesDef:1.0";
-}
-
-TAO_IR_ConsumesDef_Default_Proxy_Factory::TAO_IR_ConsumesDef_Default_Proxy_Factory (int register_proxy_factory)
-{
- if (register_proxy_factory)
- {
- TAO_IR_ConsumesDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
-
-TAO_IR_ConsumesDef_Default_Proxy_Factory::~TAO_IR_ConsumesDef_Default_Proxy_Factory (void)
-{
-}
-
-IR_ConsumesDef_ptr
-TAO_IR_ConsumesDef_Default_Proxy_Factory::create_proxy (
- ::IR_ConsumesDef_ptr proxy,
- CORBA::Environment &
- )
-{
- return proxy;
-}
-
-TAO_IR_ConsumesDef_Proxy_Factory_Adapter::TAO_IR_ConsumesDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
-{
-}
-
-TAO_IR_ConsumesDef_Proxy_Factory_Adapter::~TAO_IR_ConsumesDef_Proxy_Factory_Adapter (void)
-{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
-}
-
-int
-TAO_IR_ConsumesDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ConsumesDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
-}
-
-int
-TAO_IR_ConsumesDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
-}
-
-IR_ConsumesDef_ptr
-TAO_IR_ConsumesDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ConsumesDef_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ConsumesDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
-}
-
-TAO_IR_ConsumesDef_Smart_Proxy_Base::TAO_IR_ConsumesDef_Smart_Proxy_Base (::IR_ConsumesDef_ptr proxy)
-: base_proxy_ (proxy)
-{
-}
-
-TAO_IR_ConsumesDef_Smart_Proxy_Base::~TAO_IR_ConsumesDef_Smart_Proxy_Base (void)
-{
+void *IR_ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ConsumesDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_EventDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_EventDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_ConsumesDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_ConsumesDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ConsumesDef:1.0";
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ConsumesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ConsumesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ConsumesDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -23873,70 +25946,36 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDef, &_tc_TAO_tc_IR_ConsumesDef)
TAO_NAMESPACE_END
-void IR_ComponentDef::_tao_any_destructor (void *x)
-{
- IR_ComponentDef *tmp = ACE_static_cast (IR_ComponentDef*,x);
- CORBA::release (tmp);
-}
-IR_ComponentDef_ptr IR_ComponentDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ComponentDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_ComponentDef::_nil ());
- if (is_a == 0)
- return IR_ComponentDef::_nil ();
- return IR_ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_ComponentDef_ptr IR_ComponentDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_ComponentDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_ComponentDef_ptr default_proxy = IR_ComponentDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_ComponentDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_ComponentDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_ComponentDef (stub), IR_ComponentDef::_nil ());
- return TAO_IR_ComponentDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
+{}
-IR_ComponentDef_ptr
-IR_ComponentDef::_duplicate (IR_ComponentDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (void)
+{}
-IR_InterfaceDefSeq * IR_ComponentDef::supported_interfaces (
+// Remote Implementation of the IDL interface methods
+
+IR_InterfaceDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_InterfaceDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -23951,37 +25990,48 @@ IR_InterfaceDefSeq * IR_ComponentDef::supported_interfaces (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-void IR_ComponentDef::supported_interfaces (
+void _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
const IR_InterfaceDefSeq & supported_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
@@ -23989,15 +26039,11 @@ void IR_ComponentDef::supported_interfaces (
CORBA::SystemException
))
{
-
-
-
-
- TAO_Stub *istub = this->_stubobj ();
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW (CORBA::INTERNAL ());
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_set_supported_interfaces",
@@ -24006,57 +26052,65 @@ void IR_ComponentDef::supported_interfaces (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK;
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK;
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << supported_interfaces)
))
- ACE_THROW (CORBA::MARSHAL ());
+ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK;
-
+ ACE_CHECK;
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES));
+ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
}
-
+
break;
-
}
-
}
-IR_ComponentDef_ptr IR_ComponentDef::base_component (
+IR_ComponentDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::base_component (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
IR_ComponentDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_base_component",
@@ -24065,57 +26119,67 @@ IR_ComponentDef_ptr IR_ComponentDef::base_component (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ProvidesDefSeq * IR_ComponentDef::provides_interfaces (
+IR_ProvidesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ProvidesDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_ProvidesDefSeq, _tao_retval);
IR_ProvidesDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -24130,52 +26194,63 @@ IR_ProvidesDefSeq * IR_ComponentDef::provides_interfaces (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_UsesDefSeq * IR_ComponentDef::uses_interfaces (
+IR_UsesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_UsesDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_UsesDefSeq, _tao_retval);
IR_UsesDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -24186,57 +26261,67 @@ IR_UsesDefSeq * IR_ComponentDef::uses_interfaces (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_EmitsDefSeq * IR_ComponentDef::emits_events (
+IR_EmitsDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_EmitsDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_EmitsDefSeq, _tao_retval);
IR_EmitsDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -24251,52 +26336,63 @@ IR_EmitsDefSeq * IR_ComponentDef::emits_events (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_PublishesDefSeq * IR_ComponentDef::publishes_events (
+IR_PublishesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_PublishesDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_PublishesDefSeq, _tao_retval);
IR_PublishesDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -24307,57 +26403,67 @@ IR_PublishesDefSeq * IR_ComponentDef::publishes_events (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ConsumesDefSeq * IR_ComponentDef::consumes_events (
+IR_ConsumesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ConsumesDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_ConsumesDefSeq, _tao_retval);
IR_ConsumesDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -24372,52 +26478,63 @@ IR_ConsumesDefSeq * IR_ComponentDef::consumes_events (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_ComponentDef::is_basic (
+CORBA::Boolean _TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_is_basic",
@@ -24430,37 +26547,48 @@ CORBA::Boolean IR_ComponentDef::is_basic (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
+IR_ProvidesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -24471,16 +26599,16 @@ IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
CORBA::SystemException
))
{
-
+
IR_ProvidesDef_ptr _tao_retval = IR_ProvidesDef::_nil ();
IR_ProvidesDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_provides",
@@ -24489,18 +26617,19 @@ IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -24508,32 +26637,45 @@ IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
(_tao_out << version) &&
(_tao_out << interface_type)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_UsesDef_ptr IR_ComponentDef::create_uses (
+IR_UsesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -24545,16 +26687,16 @@ IR_UsesDef_ptr IR_ComponentDef::create_uses (
CORBA::SystemException
))
{
-
+
IR_UsesDef_ptr _tao_retval = IR_UsesDef::_nil ();
IR_UsesDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_uses",
@@ -24567,13 +26709,15 @@ IR_UsesDef_ptr IR_ComponentDef::create_uses (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -24582,32 +26726,45 @@ IR_UsesDef_ptr IR_ComponentDef::create_uses (
(_tao_out << interface_type) &&
(_tao_out << CORBA::Any::from_boolean (is_multiple))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_EmitsDef_ptr IR_ComponentDef::create_emits (
+IR_EmitsDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -24618,16 +26775,16 @@ IR_EmitsDef_ptr IR_ComponentDef::create_emits (
CORBA::SystemException
))
{
-
+
IR_EmitsDef_ptr _tao_retval = IR_EmitsDef::_nil ();
IR_EmitsDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_emits",
@@ -24640,13 +26797,15 @@ IR_EmitsDef_ptr IR_ComponentDef::create_emits (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -24654,32 +26813,45 @@ IR_EmitsDef_ptr IR_ComponentDef::create_emits (
(_tao_out << version) &&
(_tao_out << value)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_PublishesDef_ptr IR_ComponentDef::create_publishes (
+IR_PublishesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -24690,16 +26862,16 @@ IR_PublishesDef_ptr IR_ComponentDef::create_publishes (
CORBA::SystemException
))
{
-
+
IR_PublishesDef_ptr _tao_retval = IR_PublishesDef::_nil ();
IR_PublishesDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_publishes",
@@ -24712,13 +26884,15 @@ IR_PublishesDef_ptr IR_ComponentDef::create_publishes (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -24726,31 +26900,45 @@ IR_PublishesDef_ptr IR_ComponentDef::create_publishes (
(_tao_out << version) &&
(_tao_out << value)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
+IR_ConsumesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -24761,16 +26949,16 @@ IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
CORBA::SystemException
))
{
-
+
IR_ConsumesDef_ptr _tao_retval = IR_ConsumesDef::_nil ();
IR_ConsumesDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_consumes",
@@ -24783,13 +26971,15 @@ IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -24797,166 +26987,308 @@ IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
(_tao_out << version) &&
(_tao_out << value)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/InterfaceDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_ComponentDef::_interface_repository_id (void) const
+_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/ComponentDef:1.0";
}
-TAO_IR_ComponentDef_Default_Proxy_Factory::TAO_IR_ComponentDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_ComponentDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_ComponentDef_Default_Proxy_Factory::~TAO_IR_ComponentDef_Default_Proxy_Factory (void)
+_TAO_ComponentDef_Remote_Proxy_Broker::_TAO_ComponentDef_Remote_Proxy_Broker (void)
{
}
-IR_ComponentDef_ptr
-TAO_IR_ComponentDef_Default_Proxy_Factory::create_proxy (
- ::IR_ComponentDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_ComponentDef_Proxy_Factory_Adapter::TAO_IR_ComponentDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_ComponentDef_Proxy_Impl&
+_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_ComponentDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_ComponentDef_Proxy_Factory_Adapter::~TAO_IR_ComponentDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_ComponentDef::IR_ComponentDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_ComponentDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_ComponentDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_ComponentDef::~IR_ComponentDef (void)
+{}
+
+void
+IR_ComponentDef::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_ComponentDef_Proxy_Broker_ =
+ _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ComponentDef_Proxy_Broker_ =
+ ::the_TAO_ComponentDef_Remote_Proxy_Broker ();
+
+ IR_InterfaceDef::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_ComponentDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_ComponentDef::_tao_any_destructor (void *x)
+{
+ IR_ComponentDef *tmp = ACE_static_cast (IR_ComponentDef*,x);
+ CORBA::release (tmp);
+}
+
+IR_ComponentDef_ptr IR_ComponentDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_ComponentDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_ComponentDef::_nil ());
+ if (is_a == 0)
+ return IR_ComponentDef::_nil ();
}
-return 0;
+ return IR_ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_ComponentDef_ptr
-TAO_IR_ComponentDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_ComponentDef_ptr proxy,
+IR_ComponentDef_ptr IR_ComponentDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_ComponentDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_ComponentDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_ComponentDef_ptr default_proxy = IR_ComponentDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_ComponentDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_ComponentDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_ComponentDef (stub, 0, obj->_servant ()), IR_ComponentDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_ComponentDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_ComponentDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_ComponentDef_Smart_Proxy_Base::TAO_IR_ComponentDef_Smart_Proxy_Base (::IR_ComponentDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_ComponentDef_ptr
+IR_ComponentDef::_duplicate (IR_ComponentDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_ComponentDef_Smart_Proxy_Base::~TAO_IR_ComponentDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/InterfaceDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_ComponentDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_ComponentDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_ComponentDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_InterfaceDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_InterfaceDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_ComponentDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/ComponentDef:1.0";
}
-IR_InterfaceDefSeq * TAO_IR_ComponentDef_Smart_Proxy_Base::supported_interfaces (
+IR_InterfaceDefSeq * IR_ComponentDef::supported_interfaces (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->supported_interfaces (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
+ this,
ACE_TRY_ENV
);
-
}
-void TAO_IR_ComponentDef_Smart_Proxy_Base::supported_interfaces (
+void IR_ComponentDef::supported_interfaces (
const IR_InterfaceDefSeq & supported_interfaces,
CORBA::Environment &ACE_TRY_ENV
)
@@ -24964,105 +27296,113 @@ void TAO_IR_ComponentDef_Smart_Proxy_Base::supported_interfaces (
CORBA::SystemException
))
{
- this->base_proxy_->supported_interfaces (
+
+ this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).supported_interfaces (
+ this,
supported_interfaces,
ACE_TRY_ENV
);
-
}
-IR_ComponentDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::base_component (
+IR_ComponentDef_ptr IR_ComponentDef::base_component (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->base_component (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_component (
+ this,
ACE_TRY_ENV
);
-
}
-IR_ProvidesDefSeq * TAO_IR_ComponentDef_Smart_Proxy_Base::provides_interfaces (
+IR_ProvidesDefSeq * IR_ComponentDef::provides_interfaces (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->provides_interfaces (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).provides_interfaces (
+ this,
ACE_TRY_ENV
);
-
}
-IR_UsesDefSeq * TAO_IR_ComponentDef_Smart_Proxy_Base::uses_interfaces (
+IR_UsesDefSeq * IR_ComponentDef::uses_interfaces (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->uses_interfaces (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).uses_interfaces (
+ this,
ACE_TRY_ENV
);
-
}
-IR_EmitsDefSeq * TAO_IR_ComponentDef_Smart_Proxy_Base::emits_events (
+IR_EmitsDefSeq * IR_ComponentDef::emits_events (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->emits_events (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).emits_events (
+ this,
ACE_TRY_ENV
);
-
}
-IR_PublishesDefSeq * TAO_IR_ComponentDef_Smart_Proxy_Base::publishes_events (
+IR_PublishesDefSeq * IR_ComponentDef::publishes_events (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->publishes_events (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).publishes_events (
+ this,
ACE_TRY_ENV
);
-
}
-IR_ConsumesDefSeq * TAO_IR_ComponentDef_Smart_Proxy_Base::consumes_events (
+IR_ConsumesDefSeq * IR_ComponentDef::consumes_events (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->consumes_events (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).consumes_events (
+ this,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_ComponentDef_Smart_Proxy_Base::is_basic (
+CORBA::Boolean IR_ComponentDef::is_basic (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->is_basic (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_basic (
+ this,
ACE_TRY_ENV
);
-
}
-IR_ProvidesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_provides (
+IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
const char * id,
const char * name,
const char * version,
@@ -25073,17 +27413,18 @@ IR_ProvidesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_provides (
CORBA::SystemException
))
{
- return this->base_proxy_->create_provides (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_provides (
+ this,
id,
name,
version,
interface_type,
ACE_TRY_ENV
);
-
}
-IR_UsesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_uses (
+IR_UsesDef_ptr IR_ComponentDef::create_uses (
const char * id,
const char * name,
const char * version,
@@ -25095,7 +27436,9 @@ IR_UsesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_uses (
CORBA::SystemException
))
{
- return this->base_proxy_->create_uses (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_uses (
+ this,
id,
name,
version,
@@ -25103,10 +27446,9 @@ IR_UsesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_uses (
is_multiple,
ACE_TRY_ENV
);
-
}
-IR_EmitsDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_emits (
+IR_EmitsDef_ptr IR_ComponentDef::create_emits (
const char * id,
const char * name,
const char * version,
@@ -25117,17 +27459,18 @@ IR_EmitsDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_emits (
CORBA::SystemException
))
{
- return this->base_proxy_->create_emits (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_emits (
+ this,
id,
name,
version,
value,
ACE_TRY_ENV
);
-
}
-IR_PublishesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_publishes (
+IR_PublishesDef_ptr IR_ComponentDef::create_publishes (
const char * id,
const char * name,
const char * version,
@@ -25138,17 +27481,18 @@ IR_PublishesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_publishes (
CORBA::SystemException
))
{
- return this->base_proxy_->create_publishes (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_publishes (
+ this,
id,
name,
version,
value,
ACE_TRY_ENV
);
-
}
-IR_ConsumesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_consumes (
+IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
const char * id,
const char * name,
const char * version,
@@ -25159,23 +27503,17 @@ IR_ConsumesDef_ptr TAO_IR_ComponentDef_Smart_Proxy_Base::create_consumes (
CORBA::SystemException
))
{
- return this->base_proxy_->create_consumes (
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_consumes (
+ this,
id,
name,
version,
value,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_ComponentDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_ComponentDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_ComponentDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -25187,56 +27525,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDef, &_tc_TAO_tc_IR_ComponentDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_ComponentDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ComponentDescription:1.0
- 21, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ComponentDescription
+ 21, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ComponentDescription
13, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -25244,46 +27565,34 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
15, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f636f6d), ACE_NTOHL (0x706f6e65), ACE_NTOHL (0x6e740000), // name = base_component
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
20, ACE_NTOHL (0x73757070), ACE_NTOHL (0x6f727473), ACE_NTOHL (0x5f696e74), ACE_NTOHL (0x65726661), ACE_NTOHL (0x63657300), // name = supports_interfaces
CORBA::tk_alias, // typecode kind for typedefs
- 228, // encapsulation length
+ 156, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x79496453), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/RepositoryIdSeq:1.0
- 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = IR_RepositoryIdSeq
+ 16, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x53657100), // name = RepositoryIdSeq
CORBA::tk_sequence, // typecode kind
- 156, // encapsulation length
+ 84, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -25326,63 +27635,45 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000), // name = attributes
CORBA::tk_alias, // typecode kind for typedefs
- 2424, // encapsulation length
+ 1788, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/AttrDescriptionSeq:1.0
- 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = IR_AttrDescriptionSeq
+ 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = AttrDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2344, // encapsulation length
+ 1708, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2328, // encapsulation length
+ 1692, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/AttributeDescription:1.0
- 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_AttributeDescription
+ 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = AttributeDescription
8, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -25390,7 +27681,7 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -25408,63 +27699,45 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -25472,7 +27745,7 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -25484,63 +27757,45 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -25548,7 +27803,7 @@ static const CORBA::Long _oc_IR_ComponentDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -25625,61 +27880,28 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDescription, &_tc_TAO_tc_IR_ComponentDescription)
TAO_NAMESPACE_END
+
void IR_ComponentDescription::_tao_any_destructor (void *x)
{
IR_ComponentDescription *tmp = ACE_static_cast (IR_ComponentDescription*,x);
delete tmp;
}
-void IR_PrimaryKeyDef::_tao_any_destructor (void *x)
-{
- IR_PrimaryKeyDef *tmp = ACE_static_cast (IR_PrimaryKeyDef*,x);
- CORBA::release (tmp);
-}
-IR_PrimaryKeyDef_ptr IR_PrimaryKeyDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_PrimaryKeyDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_PrimaryKeyDef::_nil ());
- if (is_a == 0)
- return IR_PrimaryKeyDef::_nil ();
- return IR_PrimaryKeyDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_PrimaryKeyDef_ptr IR_PrimaryKeyDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_PrimaryKeyDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_PrimaryKeyDef_ptr default_proxy = IR_PrimaryKeyDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_PrimaryKeyDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_PrimaryKeyDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_PrimaryKeyDef (stub), IR_PrimaryKeyDef::_nil ());
- return TAO_IR_PrimaryKeyDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_PrimaryKeyDef_Proxy_Impl::_TAO_PrimaryKeyDef_Proxy_Impl (void)
+{}
-IR_PrimaryKeyDef_ptr
-IR_PrimaryKeyDef::_duplicate (IR_PrimaryKeyDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void)
+{}
-CORBA::Boolean IR_PrimaryKeyDef::is_a (
+// Remote Implementation of the IDL interface methods
+
+CORBA::Boolean _TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
const char * primary_key_id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -25687,15 +27909,15 @@ CORBA::Boolean IR_PrimaryKeyDef::is_a (
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"is_a",
@@ -25708,58 +27930,74 @@ CORBA::Boolean IR_PrimaryKeyDef::is_a (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << primary_key_id)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ _tao_retval
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-IR_ValueDef_ptr IR_PrimaryKeyDef::primary_key (
+IR_ValueDef_ptr _TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
IR_ValueDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_primary_key",
@@ -25768,160 +28006,262 @@ IR_ValueDef_ptr IR_PrimaryKeyDef::primary_key (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_PrimaryKeyDef_Proxy_Broker::_TAO_PrimaryKeyDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_PrimaryKeyDef::_interface_repository_id (void) const
+_TAO_PrimaryKeyDef_Proxy_Broker::~_TAO_PrimaryKeyDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/PrimaryKeyDef:1.0";
}
-TAO_IR_PrimaryKeyDef_Default_Proxy_Factory::TAO_IR_PrimaryKeyDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_PrimaryKeyDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_PrimaryKeyDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_PrimaryKeyDef_Default_Proxy_Factory::~TAO_IR_PrimaryKeyDef_Default_Proxy_Factory (void)
+_TAO_PrimaryKeyDef_Remote_Proxy_Broker::_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
{
}
-IR_PrimaryKeyDef_ptr
-TAO_IR_PrimaryKeyDef_Default_Proxy_Factory::create_proxy (
- ::IR_PrimaryKeyDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter::TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_PrimaryKeyDef_Proxy_Impl&
+_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_PrimaryKeyDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter::~TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_PrimaryKeyDef::IR_PrimaryKeyDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_PrimaryKeyDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_PrimaryKeyDef::~IR_PrimaryKeyDef (void)
+{}
+
+void
+IR_PrimaryKeyDef::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
+ _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
+ ::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
+
+ IR_Contained::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_PrimaryKeyDef::_tao_any_destructor (void *x)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ IR_PrimaryKeyDef *tmp = ACE_static_cast (IR_PrimaryKeyDef*,x);
+ CORBA::release (tmp);
+}
+
+IR_PrimaryKeyDef_ptr IR_PrimaryKeyDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+{
+ if (CORBA::is_nil (obj))
+ return IR_PrimaryKeyDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_PrimaryKeyDef::_nil ());
+ if (is_a == 0)
+ return IR_PrimaryKeyDef::_nil ();
}
-return 0;
+ return IR_PrimaryKeyDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_PrimaryKeyDef_ptr
-TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_PrimaryKeyDef_ptr proxy,
+IR_PrimaryKeyDef_ptr IR_PrimaryKeyDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_PrimaryKeyDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_PrimaryKeyDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_PrimaryKeyDef_ptr default_proxy = IR_PrimaryKeyDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_PrimaryKeyDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_PrimaryKeyDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_PrimaryKeyDef (stub, 0, obj->_servant ()), IR_PrimaryKeyDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_PrimaryKeyDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_PrimaryKeyDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_PrimaryKeyDef_Smart_Proxy_Base::TAO_IR_PrimaryKeyDef_Smart_Proxy_Base (::IR_PrimaryKeyDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_PrimaryKeyDef_ptr
+IR_PrimaryKeyDef::_duplicate (IR_PrimaryKeyDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_PrimaryKeyDef_Smart_Proxy_Base::~TAO_IR_PrimaryKeyDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-TAO_Stub *
-TAO_IR_PrimaryKeyDef_Smart_Proxy_Base::_stubobj (void) const
+void *IR_PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_PrimaryKeyDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
+const char* IR_PrimaryKeyDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/PrimaryKeyDef:1.0";
}
-CORBA::Boolean TAO_IR_PrimaryKeyDef_Smart_Proxy_Base::is_a (
+CORBA::Boolean IR_PrimaryKeyDef::is_a (
const char * primary_key_id,
CORBA::Environment &ACE_TRY_ENV
)
@@ -25929,33 +28269,28 @@ CORBA::Boolean TAO_IR_PrimaryKeyDef_Smart_Proxy_Base::is_a (
CORBA::SystemException
))
{
- return this->base_proxy_->is_a (
+
+ return this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
+ this,
primary_key_id,
ACE_TRY_ENV
);
-
}
-IR_ValueDef_ptr TAO_IR_PrimaryKeyDef_Smart_Proxy_Base::primary_key (
+IR_ValueDef_ptr IR_PrimaryKeyDef::primary_key (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->primary_key (
+
+ return this->the_TAO_PrimaryKeyDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).primary_key (
+ this,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_PrimaryKeyDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -25967,56 +28302,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDef, &_tc_TAO_tc_IR_PrimaryKeyDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
41, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/PrimaryKeyDescription:1.0
- 22, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000), // name = IR_PrimaryKeyDescription
+ 22, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e000000), // name = PrimaryKeyDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -26024,7 +28342,7 @@ static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
12, ACE_NTOHL (0x7072696d), ACE_NTOHL (0x6172795f), ACE_NTOHL (0x6b657900), // name = primary_key
@@ -26040,12 +28358,100 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDescription, &_tc_TAO_tc_IR_PrimaryKeyDescription)
TAO_NAMESPACE_END
+
void IR_PrimaryKeyDescription::_tao_any_destructor (void *x)
{
IR_PrimaryKeyDescription *tmp = ACE_static_cast (IR_PrimaryKeyDescription*,x);
delete tmp;
}
+
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
+
+_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
+{}
+
+_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_FactoryDef_Proxy_Broker::_TAO_FactoryDef_Proxy_Broker (void)
+{
+}
+
+_TAO_FactoryDef_Proxy_Broker::~_TAO_FactoryDef_Proxy_Broker (void)
+{
+}
+
+// Factory function Implementation.
+_TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void)
+{
+ static ::_TAO_FactoryDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+}
+
+_TAO_FactoryDef_Remote_Proxy_Broker::_TAO_FactoryDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (void)
+{
+}
+
+_TAO_FactoryDef_Proxy_Impl&
+_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_FactoryDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
+{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
+}
+
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_FactoryDef::IR_FactoryDef (int collocated)
+{
+ this->_tao_setup_collocation (collocated);
+}
+
+// destructor
+IR_FactoryDef::~IR_FactoryDef (void)
+{}
+
+void
+IR_FactoryDef::_tao_setup_collocation (int collocated)
+{
+ if (collocated)
+ this->the_TAO_FactoryDef_Proxy_Broker_ =
+ _TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_FactoryDef_Proxy_Broker_ =
+ ::the_TAO_FactoryDef_Remote_Proxy_Broker ();
+
+ IR_OperationDef::_tao_setup_collocation (collocated);
+
+}
+
void IR_FactoryDef::_tao_any_destructor (void *x)
{
IR_FactoryDef *tmp = ACE_static_cast (IR_FactoryDef*,x);
@@ -26059,10 +28465,13 @@ IR_FactoryDef_ptr IR_FactoryDef::_narrow (
{
if (CORBA::is_nil (obj))
return IR_FactoryDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_FactoryDef::_nil ());
- if (is_a == 0)
- return IR_FactoryDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_FactoryDef::_nil ());
+ if (is_a == 0)
+ return IR_FactoryDef::_nil ();
+ }
return IR_FactoryDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
@@ -26073,17 +28482,46 @@ IR_FactoryDef_ptr IR_FactoryDef::_unchecked_narrow (
{
if (CORBA::is_nil (obj))
return IR_FactoryDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_FactoryDef_ptr default_proxy = IR_FactoryDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_FactoryDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_FactoryDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_FactoryDef (stub), IR_FactoryDef::_nil ());
- return TAO_IR_FactoryDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_FactoryDef_ptr default_proxy = IR_FactoryDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_FactoryDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_FactoryDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_FactoryDef (stub, 0, obj->_servant ()), IR_FactoryDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_FactoryDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_FactoryDef::_narrow
+ )
+ )
+ );
}
IR_FactoryDef_ptr
@@ -26107,130 +28545,161 @@ CORBA::Boolean IR_FactoryDef::_is_a (const CORBA::Char *value, CORBA::Environmen
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
+void *IR_FactoryDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_FactoryDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_OperationDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_OperationDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
+}
+
const char* IR_FactoryDef::_interface_repository_id (void) const
{
return "IDL:omg.org/IR/FactoryDef:1.0";
}
-TAO_IR_FactoryDef_Default_Proxy_Factory::TAO_IR_FactoryDef_Default_Proxy_Factory (int register_proxy_factory)
+static const CORBA::Long _oc_IR_FactoryDef[] =
{
- if (register_proxy_factory)
- {
- TAO_IR_FactoryDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/FactoryDef:1.0
+ 11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000), // name = IR_FactoryDef
+};
+static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDef (CORBA::tk_objref, sizeof (_oc_IR_FactoryDef), (char *) &_oc_IR_FactoryDef, 0, sizeof (IR_FactoryDef));
+TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+TAO_NAMESPACE_BEGIN (IR)
+TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
+TAO_NAMESPACE_END
+
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-TAO_IR_FactoryDef_Default_Proxy_Factory::~TAO_IR_FactoryDef_Default_Proxy_Factory (void)
+_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
+{}
+
+_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
+{}
+
+// Remote Implementation of the IDL interface methods
+
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_FinderDef_Proxy_Broker::_TAO_FinderDef_Proxy_Broker (void)
{
}
-IR_FactoryDef_ptr
-TAO_IR_FactoryDef_Default_Proxy_Factory::create_proxy (
- ::IR_FactoryDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_FinderDef_Proxy_Broker::~_TAO_FinderDef_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_FactoryDef_Proxy_Factory_Adapter::TAO_IR_FactoryDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+// Factory function Implementation.
+_TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void)
{
+ static ::_TAO_FinderDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_FactoryDef_Proxy_Factory_Adapter::~TAO_IR_FactoryDef_Proxy_Factory_Adapter (void)
+_TAO_FinderDef_Remote_Proxy_Broker::_TAO_FinderDef_Remote_Proxy_Broker (void)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
}
-int
-TAO_IR_FactoryDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_FactoryDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (void)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
}
-int
-TAO_IR_FactoryDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+_TAO_FinderDef_Proxy_Impl&
+_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_FinderDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-IR_FactoryDef_ptr
-TAO_IR_FactoryDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_FactoryDef_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_FactoryDef_Default_Proxy_Factory (1),
- 0);
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
- return this->proxy_factory_->create_proxy (proxy);
-}
-TAO_IR_FactoryDef_Smart_Proxy_Base::TAO_IR_FactoryDef_Smart_Proxy_Base (::IR_FactoryDef_ptr proxy)
-: base_proxy_ (proxy)
+// default constructor
+IR_FinderDef::IR_FinderDef (int collocated)
{
+ this->_tao_setup_collocation (collocated);
}
-TAO_IR_FactoryDef_Smart_Proxy_Base::~TAO_IR_FactoryDef_Smart_Proxy_Base (void)
-{
-}
+// destructor
+IR_FinderDef::~IR_FinderDef (void)
+{}
-TAO_Stub *
-TAO_IR_FactoryDef_Smart_Proxy_Base::_stubobj (void) const
+void
+IR_FinderDef::_tao_setup_collocation (int collocated)
{
- return this->base_proxy_->_stubobj ();
+ if (collocated)
+ this->the_TAO_FinderDef_Proxy_Broker_ =
+ _TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_FinderDef_Proxy_Broker_ =
+ ::the_TAO_FinderDef_Remote_Proxy_Broker ();
+
+ IR_OperationDef::_tao_setup_collocation (collocated);
+
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_FactoryDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_FactoryDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-static const CORBA::Long _oc_IR_FactoryDef[] =
-{
- TAO_ENCAP_BYTE_ORDER, // byte order
- 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/FactoryDef:1.0
- 11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000), // name = IR_FactoryDef
-};
-static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDef (CORBA::tk_objref, sizeof (_oc_IR_FactoryDef), (char *) &_oc_IR_FactoryDef, 0, sizeof (IR_FactoryDef));
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
-TAO_NAMESPACE_END
void IR_FinderDef::_tao_any_destructor (void *x)
{
IR_FinderDef *tmp = ACE_static_cast (IR_FinderDef*,x);
@@ -26244,10 +28713,13 @@ IR_FinderDef_ptr IR_FinderDef::_narrow (
{
if (CORBA::is_nil (obj))
return IR_FinderDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_FinderDef::_nil ());
- if (is_a == 0)
- return IR_FinderDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_FinderDef::_nil ());
+ if (is_a == 0)
+ return IR_FinderDef::_nil ();
+ }
return IR_FinderDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
@@ -26258,17 +28730,46 @@ IR_FinderDef_ptr IR_FinderDef::_unchecked_narrow (
{
if (CORBA::is_nil (obj))
return IR_FinderDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_FinderDef_ptr default_proxy = IR_FinderDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_FinderDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_FinderDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_FinderDef (stub), IR_FinderDef::_nil ());
- return TAO_IR_FinderDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_FinderDef_ptr default_proxy = IR_FinderDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_FinderDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_FinderDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_FinderDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_FinderDef (stub, 0, obj->_servant ()), IR_FinderDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_FinderDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_FinderDef::_narrow
+ )
+ )
+ );
}
IR_FinderDef_ptr
@@ -26292,119 +28793,63 @@ CORBA::Boolean IR_FinderDef::_is_a (const CORBA::Char *value, CORBA::Environment
return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_FinderDef::_interface_repository_id (void) const
-{
- return "IDL:omg.org/IR/FinderDef:1.0";
-}
-
-TAO_IR_FinderDef_Default_Proxy_Factory::TAO_IR_FinderDef_Default_Proxy_Factory (int register_proxy_factory)
-{
- if (register_proxy_factory)
- {
- TAO_IR_FinderDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
-
-TAO_IR_FinderDef_Default_Proxy_Factory::~TAO_IR_FinderDef_Default_Proxy_Factory (void)
-{
-}
-
-IR_FinderDef_ptr
-TAO_IR_FinderDef_Default_Proxy_Factory::create_proxy (
- ::IR_FinderDef_ptr proxy,
- CORBA::Environment &
- )
-{
- return proxy;
-}
-
-TAO_IR_FinderDef_Proxy_Factory_Adapter::TAO_IR_FinderDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
-{
-}
-
-TAO_IR_FinderDef_Proxy_Factory_Adapter::~TAO_IR_FinderDef_Proxy_Factory_Adapter (void)
-{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
-}
-
-int
-TAO_IR_FinderDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_FinderDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
-}
-
-int
-TAO_IR_FinderDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
-}
-
-IR_FinderDef_ptr
-TAO_IR_FinderDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_FinderDef_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_FinderDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
-}
-
-TAO_IR_FinderDef_Smart_Proxy_Base::TAO_IR_FinderDef_Smart_Proxy_Base (::IR_FinderDef_ptr proxy)
-: base_proxy_ (proxy)
-{
-}
-
-TAO_IR_FinderDef_Smart_Proxy_Base::~TAO_IR_FinderDef_Smart_Proxy_Base (void)
-{
+void *IR_FinderDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_FinderDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_OperationDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_OperationDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_FinderDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_FinderDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/FinderDef:1.0";
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_FinderDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_FinderDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_FinderDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -26416,71 +28861,37 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDef, &_tc_TAO_tc_IR_FinderDef)
TAO_NAMESPACE_END
-void IR_HomeDef::_tao_any_destructor (void *x)
-{
- IR_HomeDef *tmp = ACE_static_cast (IR_HomeDef*,x);
- CORBA::release (tmp);
-}
-IR_HomeDef_ptr IR_HomeDef::_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- if (CORBA::is_nil (obj))
- return IR_HomeDef::_nil ();
- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0", ACE_TRY_ENV);
- ACE_CHECK_RETURN (IR_HomeDef::_nil ());
- if (is_a == 0)
- return IR_HomeDef::_nil ();
- return IR_HomeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
-}
+///////////////////////////////////////////////////////////////////////
+// Base & Remote Proxy Implementation.
+//
-IR_HomeDef_ptr IR_HomeDef::_unchecked_narrow (
- CORBA::Object_ptr obj,
- CORBA::Environment &
- )
-{
- if (CORBA::is_nil (obj))
- return IR_HomeDef::_nil ();
- TAO_Stub* stub = obj->_stubobj ();
- if (stub)
- stub->_incr_refcnt ();
- IR_HomeDef_ptr default_proxy = IR_HomeDef::_nil ();
- if (obj->_is_collocated () && _TAO_collocation_IR_HomeDef_Stub_Factory_function_pointer != 0)
- {
- default_proxy = _TAO_collocation_IR_HomeDef_Stub_Factory_function_pointer (obj);
- }
- if (CORBA::is_nil (default_proxy))
- ACE_NEW_RETURN (default_proxy, IR_HomeDef (stub), IR_HomeDef::_nil ());
- return TAO_IR_HomeDef_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
-}
+_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
+{}
-IR_HomeDef_ptr
-IR_HomeDef::_duplicate (IR_HomeDef_ptr obj)
-{
- if (!CORBA::is_nil (obj))
- obj->_add_ref ();
- return obj;
-}
+_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
+{}
-IR_HomeDef_ptr IR_HomeDef::base_home (
+// Remote Implementation of the IDL interface methods
+
+IR_HomeDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::base_home (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_HomeDef_ptr _tao_retval = IR_HomeDef::_nil ();
IR_HomeDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_base_home",
@@ -26493,53 +28904,64 @@ IR_HomeDef_ptr IR_HomeDef::base_home (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_ComponentDef_ptr IR_HomeDef::managed_component (
+IR_ComponentDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::managed_component (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
IR_ComponentDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_managed_component",
@@ -26548,58 +28970,68 @@ IR_ComponentDef_ptr IR_HomeDef::managed_component (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_PrimaryKeyDef_ptr IR_HomeDef::primary_key (
+IR_PrimaryKeyDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::primary_key (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_PrimaryKeyDef_ptr _tao_retval = IR_PrimaryKeyDef::_nil ();
IR_PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_primary_key",
@@ -26608,57 +29040,67 @@ IR_PrimaryKeyDef_ptr IR_HomeDef::primary_key (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_FactoryDefSeq * IR_HomeDef::factories (
+IR_FactoryDefSeq * _TAO_HomeDef_Remote_Proxy_Impl::factories (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_FactoryDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_FactoryDefSeq, _tao_retval);
IR_FactoryDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -26673,52 +29115,63 @@ IR_FactoryDefSeq * IR_HomeDef::factories (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_FinderDefSeq * IR_HomeDef::finders (
+IR_FinderDefSeq * _TAO_HomeDef_Remote_Proxy_Impl::finders (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
IR_FinderDefSeq *_tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
ACE_NEW_RETURN (_tao_retval, IR_FinderDefSeq, _tao_retval);
IR_FinderDefSeq_var _tao_safe_retval (_tao_retval);
TAO_GIOP_Twoway_Invocation _tao_call (
@@ -26729,57 +29182,67 @@ IR_FinderDefSeq * IR_HomeDef::finders (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_HomeDef::is_basic (
+CORBA::Boolean _TAO_HomeDef_Remote_Proxy_Impl::is_basic (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
-
+
CORBA::Boolean _tao_retval = 0;
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"_get_is_basic",
@@ -26788,42 +29251,52 @@ CORBA::Boolean IR_HomeDef::is_basic (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (_tao_retval);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (_tao_retval);
-
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (_tao_retval);
-
+ ACE_CHECK_RETURN (_tao_retval);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> CORBA::Any::to_boolean (_tao_retval))
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), _tao_retval);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
break;
-
}
+
return _tao_retval;
}
-IR_PrimaryKeyDef_ptr IR_HomeDef::create_primary_key (
+IR_PrimaryKeyDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -26834,16 +29307,16 @@ IR_PrimaryKeyDef_ptr IR_HomeDef::create_primary_key (
CORBA::SystemException
))
{
-
+
IR_PrimaryKeyDef_ptr _tao_retval = IR_PrimaryKeyDef::_nil ();
IR_PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_primary_key",
@@ -26852,18 +29325,19 @@ IR_PrimaryKeyDef_ptr IR_HomeDef::create_primary_key (
istub->orb_core ()
);
-
for (;;)
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -26871,31 +29345,45 @@ IR_PrimaryKeyDef_ptr IR_HomeDef::create_primary_key (
(_tao_out << version) &&
(_tao_out << primary_key)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_FactoryDef_ptr IR_HomeDef::create_factory (
+IR_FactoryDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_factory (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -26907,16 +29395,16 @@ IR_FactoryDef_ptr IR_HomeDef::create_factory (
CORBA::SystemException
))
{
-
+
IR_FactoryDef_ptr _tao_retval = IR_FactoryDef::_nil ();
IR_FactoryDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_factory",
@@ -26929,13 +29417,15 @@ IR_FactoryDef_ptr IR_HomeDef::create_factory (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -26944,32 +29434,45 @@ IR_FactoryDef_ptr IR_HomeDef::create_factory (
(_tao_out << params) &&
(_tao_out << exceptions)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
+
return _tao_safe_retval._retn ();
}
-IR_FinderDef_ptr IR_HomeDef::create_finder (
+IR_FinderDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_finder (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -26981,16 +29484,16 @@ IR_FinderDef_ptr IR_HomeDef::create_finder (
CORBA::SystemException
))
{
-
+
IR_FinderDef_ptr _tao_retval = IR_FinderDef::_nil ();
IR_FinderDef_var _tao_safe_retval (_tao_retval);
-
-
- TAO_Stub *istub = this->_stubobj ();
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
if (istub == 0)
ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-
+
TAO_GIOP_Twoway_Invocation _tao_call (
istub,
"create_finder",
@@ -27003,13 +29506,15 @@ IR_FinderDef_ptr IR_HomeDef::create_finder (
{
_tao_call.start (ACE_TRY_ENV);
ACE_CHECK_RETURN (0);
-
- CORBA::Short flag = TAO_TWOWAY_RESPONSE_FLAG;
- // Tremporary hack until GIOP 1.2 is implemented.
-
- _tao_call.prepare_header (ACE_static_cast (CORBA::Octet, flag), ACE_TRY_ENV);
+
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
ACE_CHECK_RETURN (0);
-
+
TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
if (!(
(_tao_out << id) &&
@@ -27018,231 +29523,378 @@ IR_FinderDef_ptr IR_HomeDef::create_finder (
(_tao_out << params) &&
(_tao_out << exceptions)
))
- ACE_THROW_RETURN (CORBA::MARSHAL (), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
int _invoke_status =
_tao_call.invoke (0, 0, ACE_TRY_ENV);
- ACE_CHECK_RETURN (0);
-
+ ACE_CHECK_RETURN (0);
+
if (_invoke_status == TAO_INVOKE_RESTART)
- continue;
+ {
+ _tao_call.restart_flag (1);
+ continue;
+ }
if (_invoke_status != TAO_INVOKE_OK)
{
- ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
}
TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
if (!(
(_tao_in >> _tao_safe_retval.inout ())
))
- ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES), 0);
-
+ {
+ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
break;
-
}
- return _tao_safe_retval._retn ();
+
+ return _tao_safe_retval._retn ();
}
-CORBA::Boolean IR_HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+
+//
+// End Base & Remote Proxy Implemeentation.
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote & Base Proxy Broker Implementation
+//
+
+_TAO_HomeDef_Proxy_Broker::_TAO_HomeDef_Proxy_Broker (void)
{
- if (
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/InterfaceDef:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
- return 1; // success using local knowledge
- else
- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
}
-const char* IR_HomeDef::_interface_repository_id (void) const
+_TAO_HomeDef_Proxy_Broker::~_TAO_HomeDef_Proxy_Broker (void)
{
- return "IDL:omg.org/IR/HomeDef:1.0";
}
-TAO_IR_HomeDef_Default_Proxy_Factory::TAO_IR_HomeDef_Default_Proxy_Factory (int register_proxy_factory)
+// Factory function Implementation.
+_TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void)
{
- if (register_proxy_factory)
- {
- TAO_IR_HomeDef_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
+ static ::_TAO_HomeDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
}
-TAO_IR_HomeDef_Default_Proxy_Factory::~TAO_IR_HomeDef_Default_Proxy_Factory (void)
+_TAO_HomeDef_Remote_Proxy_Broker::_TAO_HomeDef_Remote_Proxy_Broker (void)
{
}
-IR_HomeDef_ptr
-TAO_IR_HomeDef_Default_Proxy_Factory::create_proxy (
- ::IR_HomeDef_ptr proxy,
- CORBA::Environment &
- )
+_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
{
- return proxy;
}
-TAO_IR_HomeDef_Proxy_Factory_Adapter::TAO_IR_HomeDef_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
+_TAO_HomeDef_Proxy_Impl&
+_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
+ ::IR_HomeDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+)
{
+ ACE_UNUSED_ARG (object);
+ ACE_UNUSED_ARG (ACE_TRY_ENV);
+ return remote_proxy_impl_;
}
-TAO_IR_HomeDef_Proxy_Factory_Adapter::~TAO_IR_HomeDef_Proxy_Factory_Adapter (void)
+
+//
+// End Remote & Base Proxy Broker Implementation
+///////////////////////////////////////////////////////////////////////
+
+
+// default constructor
+IR_HomeDef::IR_HomeDef (int collocated)
{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
+ this->_tao_setup_collocation (collocated);
}
-int
-TAO_IR_HomeDef_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_IR_HomeDef_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
+// destructor
+IR_HomeDef::~IR_HomeDef (void)
+{}
+
+void
+IR_HomeDef::_tao_setup_collocation (int collocated)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
+ if (collocated)
+ this->the_TAO_HomeDef_Proxy_Broker_ =
+ _TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_HomeDef_Proxy_Broker_ =
+ ::the_TAO_HomeDef_Remote_Proxy_Broker ();
+
+ IR_InterfaceDef::_tao_setup_collocation (collocated);
+
}
-int
-TAO_IR_HomeDef_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
+void IR_HomeDef::_tao_any_destructor (void *x)
+{
+ IR_HomeDef *tmp = ACE_static_cast (IR_HomeDef*,x);
+ CORBA::release (tmp);
+}
+
+IR_HomeDef_ptr IR_HomeDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
+ if (CORBA::is_nil (obj))
+ return IR_HomeDef::_nil ();
+ if (! obj->_is_local ())
{
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0", ACE_TRY_ENV);
+ ACE_CHECK_RETURN (IR_HomeDef::_nil ());
+ if (is_a == 0)
+ return IR_HomeDef::_nil ();
}
-return 0;
+ return IR_HomeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
}
-IR_HomeDef_ptr
-TAO_IR_HomeDef_Proxy_Factory_Adapter::create_proxy (
- ::IR_HomeDef_ptr proxy,
+IR_HomeDef_ptr IR_HomeDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
CORBA::Environment &
)
{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_IR_HomeDef_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
+ if (CORBA::is_nil (obj))
+ return IR_HomeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+ IR_HomeDef_ptr default_proxy = IR_HomeDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+ obj->_is_collocated () &&_TAO_HomeDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+ ::IR_HomeDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+ IR_HomeDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+ ACE_NEW_RETURN (default_proxy, ::IR_HomeDef (stub, 0, obj->_servant ()), IR_HomeDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+ IR_HomeDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+ &IR_HomeDef::_narrow
+ )
+ )
+ );
}
-TAO_IR_HomeDef_Smart_Proxy_Base::TAO_IR_HomeDef_Smart_Proxy_Base (::IR_HomeDef_ptr proxy)
-: base_proxy_ (proxy)
+IR_HomeDef_ptr
+IR_HomeDef::_duplicate (IR_HomeDef_ptr obj)
{
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
}
-TAO_IR_HomeDef_Smart_Proxy_Base::~TAO_IR_HomeDef_Smart_Proxy_Base (void)
+CORBA::Boolean IR_HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
{
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/InterfaceDef:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+ return 1; // success using local knowledge
+ else
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+}
+
+void *IR_HomeDef::_tao_QueryInterface (ptr_arith_t type)
+{
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_HomeDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_InterfaceDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_InterfaceDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+ CORBA_IRObject_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+ ACE_static_cast (CORBA::Object_ptr, this));
+
+ if (retv)
+ this->_add_ref ();
+ return retv;
}
-TAO_Stub *
-TAO_IR_HomeDef_Smart_Proxy_Base::_stubobj (void) const
+const char* IR_HomeDef::_interface_repository_id (void) const
{
- return this->base_proxy_->_stubobj ();
+ return "IDL:omg.org/IR/HomeDef:1.0";
}
-IR_HomeDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::base_home (
+IR_HomeDef_ptr IR_HomeDef::base_home (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->base_home (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).base_home (
+ this,
ACE_TRY_ENV
);
-
}
-IR_ComponentDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::managed_component (
+IR_ComponentDef_ptr IR_HomeDef::managed_component (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->managed_component (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).managed_component (
+ this,
ACE_TRY_ENV
);
-
}
-IR_PrimaryKeyDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::primary_key (
+IR_PrimaryKeyDef_ptr IR_HomeDef::primary_key (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->primary_key (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).primary_key (
+ this,
ACE_TRY_ENV
);
-
}
-IR_FactoryDefSeq * TAO_IR_HomeDef_Smart_Proxy_Base::factories (
+IR_FactoryDefSeq * IR_HomeDef::factories (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->factories (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).factories (
+ this,
ACE_TRY_ENV
);
-
}
-IR_FinderDefSeq * TAO_IR_HomeDef_Smart_Proxy_Base::finders (
+IR_FinderDefSeq * IR_HomeDef::finders (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->finders (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).finders (
+ this,
ACE_TRY_ENV
);
-
}
-CORBA::Boolean TAO_IR_HomeDef_Smart_Proxy_Base::is_basic (
+CORBA::Boolean IR_HomeDef::is_basic (
CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
))
{
- return this->base_proxy_->is_basic (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_basic (
+ this,
ACE_TRY_ENV
);
-
}
-IR_PrimaryKeyDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::create_primary_key (
+IR_PrimaryKeyDef_ptr IR_HomeDef::create_primary_key (
const char * id,
const char * name,
const char * version,
@@ -27253,17 +29905,18 @@ IR_PrimaryKeyDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::create_primary_key (
CORBA::SystemException
))
{
- return this->base_proxy_->create_primary_key (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_primary_key (
+ this,
id,
name,
version,
primary_key,
ACE_TRY_ENV
);
-
}
-IR_FactoryDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::create_factory (
+IR_FactoryDef_ptr IR_HomeDef::create_factory (
const char * id,
const char * name,
const char * version,
@@ -27275,7 +29928,9 @@ IR_FactoryDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::create_factory (
CORBA::SystemException
))
{
- return this->base_proxy_->create_factory (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_factory (
+ this,
id,
name,
version,
@@ -27283,10 +29938,9 @@ IR_FactoryDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::create_factory (
exceptions,
ACE_TRY_ENV
);
-
}
-IR_FinderDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::create_finder (
+IR_FinderDef_ptr IR_HomeDef::create_finder (
const char * id,
const char * name,
const char * version,
@@ -27298,7 +29952,9 @@ IR_FinderDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::create_finder (
CORBA::SystemException
))
{
- return this->base_proxy_->create_finder (
+
+ return this->the_TAO_HomeDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_finder (
+ this,
id,
name,
version,
@@ -27306,16 +29962,8 @@ IR_FinderDef_ptr TAO_IR_HomeDef_Smart_Proxy_Base::create_finder (
exceptions,
ACE_TRY_ENV
);
-
}
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
-template class TAO_Singleton<TAO_IR_HomeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Singleton<TAO_IR_HomeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
static const CORBA::Long _oc_IR_HomeDef[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
@@ -27327,56 +29975,39 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDef, &_tc_TAO_tc_IR_HomeDef)
TAO_NAMESPACE_END
+
static const CORBA::Long _oc_IR_HomeDescription[] =
{
TAO_ENCAP_BYTE_ORDER, // byte order
35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f48), ACE_NTOHL (0x6f6d6544), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e3a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/HomeDescription:1.0
- 16, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = IR_HomeDescription
+ 16, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e00), // name = HomeDescription
12, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -27384,38 +30015,26 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
10, ACE_NTOHL (0x62617365), ACE_NTOHL (0x5f686f6d), ACE_NTOHL (0x65000000), // name = base_home
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
18, ACE_NTOHL (0x6d616e61), ACE_NTOHL (0x6765645f), ACE_NTOHL (0x636f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74000000), // name = managed_component
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
16, ACE_NTOHL (0x7072696d), ACE_NTOHL (0x6172795f), ACE_NTOHL (0x6b65795f), ACE_NTOHL (0x64656600), // name = primary_key_def
CORBA::tk_objref, // typecode kind
@@ -27462,63 +30081,45 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
11, ACE_NTOHL (0x6f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e730000), // name = operations
CORBA::tk_alias, // typecode kind for typedefs
- 2532, // encapsulation length
+ 1972, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
36, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OpDescriptionSeq:1.0
- 17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0), // name = IR_OpDescriptionSeq
+ 17, ACE_NTOHL (0x4f704465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x0), // name = OpDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2456, // encapsulation length
+ 1896, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2440, // encapsulation length
+ 1880, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OperationDescription:1.0
- 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_OperationDescription
+ 21, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = OperationDescription
9, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -27526,7 +30127,7 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
7, ACE_NTOHL (0x72657375), ACE_NTOHL (0x6c740000), // name = result
@@ -27544,31 +30145,25 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
9, ACE_NTOHL (0x636f6e74), ACE_NTOHL (0x65787473), ACE_NTOHL (0x0), // name = contexts
CORBA::tk_alias, // typecode kind for typedefs
- 296, // encapsulation length
+ 228, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ContextIdSeq:1.0
- 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = IR_ContextIdSeq
+ 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = ContextIdSeq
CORBA::tk_sequence, // typecode kind
- 228, // encapsulation length
+ 160, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_alias, // typecode kind for typedefs
- 212, // encapsulation length
+ 144, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7465), ACE_NTOHL (0x78744964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ContextIdentifier:1.0
18, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x65787449), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x72000000), // name = ContextIdentifier
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
0U,
@@ -27576,33 +30171,27 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
11, ACE_NTOHL (0x70617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72730000), // name = parameters
CORBA::tk_alias, // typecode kind for typedefs
- 552, // encapsulation length
+ 484, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x61724465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ParDescriptionSeq:1.0
- 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ParDescriptionSeq
+ 18, ACE_NTOHL (0x50617244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ParDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 472, // encapsulation length
+ 404, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 456, // encapsulation length
+ 388, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x6172616d), ACE_NTOHL (0x65746572), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ParameterDescription:1.0
- 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ParameterDescription
+ 21, ACE_NTOHL (0x50617261), ACE_NTOHL (0x6d657465), ACE_NTOHL (0x72446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ParameterDescription
4, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
CORBA::tk_TypeCode,
@@ -27631,63 +30220,45 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
11, ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -27695,7 +30266,7 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -27711,63 +30282,45 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
11, ACE_NTOHL (0x61747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65730000), // name = attributes
CORBA::tk_alias, // typecode kind for typedefs
- 2424, // encapsulation length
+ 1788, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
38, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747244), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/AttrDescriptionSeq:1.0
- 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = IR_AttrDescriptionSeq
+ 19, ACE_NTOHL (0x41747472), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x65710000), // name = AttrDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 2344, // encapsulation length
+ 1708, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 2328, // encapsulation length
+ 1692, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/AttributeDescription:1.0
- 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_AttributeDescription
+ 21, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = AttributeDescription
8, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -27775,7 +30328,7 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -27793,63 +30346,45 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
15, ACE_NTOHL (0x6765745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = get_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -27857,7 +30392,7 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -27869,63 +30404,45 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
15, ACE_NTOHL (0x7075745f), ACE_NTOHL (0x65786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e730000), // name = put_exceptions
CORBA::tk_alias, // typecode kind for typedefs
- 748, // encapsulation length
+ 536, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
37, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78634465), ACE_NTOHL (0x73637269), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ExcDescriptionSeq:1.0
- 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = IR_ExcDescriptionSeq
+ 18, ACE_NTOHL (0x45786344), ACE_NTOHL (0x65736372), ACE_NTOHL (0x69707469), ACE_NTOHL (0x6f6e5365), ACE_NTOHL (0x71000000), // name = ExcDescriptionSeq
CORBA::tk_sequence, // typecode kind
- 668, // encapsulation length
+ 456, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
CORBA::tk_struct, // typecode kind
- 652, // encapsulation length
+ 440, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
40, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x44657363), ACE_NTOHL (0x72697074), ACE_NTOHL (0x696f6e3a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDescription:1.0
- 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = IR_ExceptionDescription
+ 21, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446573), ACE_NTOHL (0x63726970), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x0), // name = ExceptionDescription
5, // member count
5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
CORBA::tk_alias, // typecode kind for typedefs
- 132, // encapsulation length
+ 64, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_alias, // typecode kind for typedefs
- 68, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
- 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
- CORBA::tk_string,
- 0U, // string length
-
+ CORBA::tk_string,
+ 0U, // string length
3, ACE_NTOHL (0x69640000), // name = id
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
11, ACE_NTOHL (0x64656669), ACE_NTOHL (0x6e65645f), ACE_NTOHL (0x696e0000), // name = defined_in
CORBA::tk_alias, // typecode kind for typedefs
- 140, // encapsulation length
+ 68, // encapsulation length
TAO_ENCAP_BYTE_ORDER, // byte order
32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_alias, // typecode kind for typedefs
- 72, // encapsulation length
- TAO_ENCAP_BYTE_ORDER, // byte order
- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
- CORBA::tk_string,
- 0U, // string length
-
+ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+ CORBA::tk_string,
+ 0U, // string length
8, ACE_NTOHL (0x76657273), ACE_NTOHL (0x696f6e00), // name = version
CORBA::tk_alias, // typecode kind for typedefs
@@ -27933,7 +30450,7 @@ static const CORBA::Long _oc_IR_HomeDescription[] =
TAO_ENCAP_BYTE_ORDER, // byte order
31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x65727369), ACE_NTOHL (0x6f6e5370), ACE_NTOHL (0x65633a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/VersionSpec:1.0
12, ACE_NTOHL (0x56657273), ACE_NTOHL (0x696f6e53), ACE_NTOHL (0x70656300), // name = VersionSpec
- CORBA::tk_string,
+ CORBA::tk_string,
0U, // string length
5, ACE_NTOHL (0x74797065), ACE_NTOHL (0x0), // name = type
@@ -27956,13 +30473,14 @@ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
TAO_NAMESPACE_BEGIN (IR)
TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDescription, &_tc_TAO_tc_IR_HomeDescription)
TAO_NAMESPACE_END
+
void IR_HomeDescription::_tao_any_destructor (void *x)
{
IR_HomeDescription *tmp = ACE_static_cast (IR_HomeDescription*,x);
delete tmp;
}
-void operator<<= (CORBA::Any &_tao_any, IR::DefinitionKind _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, IR_DefinitionKind _tao_elem)
{
TAO_OutputCDR stream;
stream << _tao_elem;
@@ -27973,7 +30491,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::DefinitionKind _tao_elem)
);
}
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::DefinitionKind &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_DefinitionKind &_tao_elem)
{
ACE_TRY_NEW_ENV
{
@@ -28000,16 +30518,80 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::DefinitionKind &_tao
return 0;
}
-IR_Contained_ptr (*_TAO_collocation_IR_Contained_Stub_Factory_function_pointer) (
+_TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
+void operator<<= (CORBA::Any &_tao_any, CORBA_IRObject_ptr _tao_elem)
+{
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+ {
+ _tao_any._tao_replace (
+ CORBA::_tc_IRObject,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+ CORBA_IRObject::_duplicate (_tao_elem),
+ CORBA_IRObject::_tao_any_destructor
+ );
+ }
+}
+
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IRObject_ptr &_tao_elem)
+{
+ ACE_TRY_NEW_ENV
+ {
+ _tao_elem = CORBA_IRObject::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV)) // not equal
+ {
+ return 0;
+ }
+ ACE_TRY_CHECK;
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+ );
+ if (stream >> _tao_elem)
+ {
+ ((CORBA::Any *)&_tao_any)->_tao_replace (
+ CORBA::_tc_IRObject,
+ 1,
+ _tao_elem,
+ CORBA_IRObject::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+ _tao_elem = CORBA_IRObject::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+ _tao_elem = CORBA_IRObject::_nil ();
+ return 0;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+ template class TAO_Object_Manager<CORBA_IRObject,CORBA::IRObject_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<CORBA_IRObject,CORBA::IRObject_var>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+_TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_Contained_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_Contained,
+ IR::_tc_Contained,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -28057,9 +30639,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Contained_ptr &_tao_e
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_Contained,IR_Contained_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_Contained,IR_Contained_var>
+ template class TAO_Object_Manager<IR_Contained,IR_Contained_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_Contained,IR_Contained_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_Contained::Description &_tao_elem) // copying
@@ -29810,16 +32392,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EnumMemberSeq *
return 0;
}
-IR_Container_ptr (*_TAO_collocation_IR_Container_Stub_Factory_function_pointer) (
+_TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_Container_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_Container,
+ IR::_tc_Container,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -29867,9 +32450,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Container_ptr &_tao_e
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_Container,IR_Container_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_Container,IR_Container_var>
+ template class TAO_Object_Manager<IR_Container,IR_Container_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_Container,IR_Container_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_Container::Description &_tao_elem) // copying
@@ -30042,16 +32625,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Container::Desc
return 0;
}
-IR_IDLType_ptr (*_TAO_collocation_IR_IDLType_Stub_Factory_function_pointer) (
+_TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_IDLType_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_IDLType,
+ IR::_tc_IDLType,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30099,12 +32683,12 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_IDLType_ptr &_tao_ele
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_IDLType,IR_IDLType_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_IDLType,IR_IDLType_var>
+ template class TAO_Object_Manager<IR_IDLType,IR_IDLType_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_IDLType,IR_IDLType_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-void operator<<= (CORBA::Any &_tao_any, IR::PrimitiveKind _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, IR_PrimitiveKind _tao_elem)
{
TAO_OutputCDR stream;
stream << _tao_elem;
@@ -30115,7 +32699,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::PrimitiveKind _tao_elem)
);
}
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimitiveKind &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimitiveKind &_tao_elem)
{
ACE_TRY_NEW_ENV
{
@@ -30142,16 +32726,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimitiveKind &_tao_
return 0;
}
-IR_Repository_ptr (*_TAO_collocation_IR_Repository_Stub_Factory_function_pointer) (
+_TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_Repository_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_Repository,
+ IR::_tc_Repository,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30199,21 +32784,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Repository_ptr &_tao_
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_Repository,IR_Repository_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_Repository,IR_Repository_var>
+ template class TAO_Object_Manager<IR_Repository,IR_Repository_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_Repository,IR_Repository_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_ComponentRepository_ptr (*_TAO_collocation_IR_ComponentRepository_Stub_Factory_function_pointer) (
+_TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ComponentRepository_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ComponentRepository,
+ IR::_tc_ComponentRepository,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30261,21 +32847,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentRepository_p
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>
+ template class TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_ModuleDef_ptr (*_TAO_collocation_IR_ModuleDef_Stub_Factory_function_pointer) (
+_TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ModuleDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ModuleDef,
+ IR::_tc_ModuleDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30323,9 +32910,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ModuleDef_ptr &_tao_e
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ModuleDef,IR_ModuleDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ModuleDef,IR_ModuleDef_var>
+ template class TAO_Object_Manager<IR_ModuleDef,IR_ModuleDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ModuleDef,IR_ModuleDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_ModuleDescription &_tao_elem) // copying
@@ -30409,16 +32996,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ModuleDescripti
return 0;
}
-IR_ConstantDef_ptr (*_TAO_collocation_IR_ConstantDef_Stub_Factory_function_pointer) (
+_TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ConstantDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ConstantDef,
+ IR::_tc_ConstantDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30466,9 +33054,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConstantDef_ptr &_tao
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ConstantDef,IR_ConstantDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ConstantDef,IR_ConstantDef_var>
+ template class TAO_Object_Manager<IR_ConstantDef,IR_ConstantDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ConstantDef,IR_ConstantDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_ConstantDescription &_tao_elem) // copying
@@ -30552,16 +33140,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ConstantDescrip
return 0;
}
-IR_TypedefDef_ptr (*_TAO_collocation_IR_TypedefDef_Stub_Factory_function_pointer) (
+_TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_TypedefDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_TypedefDef,
+ IR::_tc_TypedefDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30609,9 +33198,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_TypedefDef_ptr &_tao_
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_TypedefDef,IR_TypedefDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_TypedefDef,IR_TypedefDef_var>
+ template class TAO_Object_Manager<IR_TypedefDef,IR_TypedefDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_TypedefDef,IR_TypedefDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_TypeDescription &_tao_elem) // copying
@@ -30695,16 +33284,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_TypeDescription
return 0;
}
-IR_StructDef_ptr (*_TAO_collocation_IR_StructDef_Stub_Factory_function_pointer) (
+_TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_StructDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_StructDef,
+ IR::_tc_StructDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30752,21 +33342,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StructDef_ptr &_tao_e
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_StructDef,IR_StructDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_StructDef,IR_StructDef_var>
+ template class TAO_Object_Manager<IR_StructDef,IR_StructDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_StructDef,IR_StructDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_UnionDef_ptr (*_TAO_collocation_IR_UnionDef_Stub_Factory_function_pointer) (
+_TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_UnionDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_UnionDef,
+ IR::_tc_UnionDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30814,21 +33405,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UnionDef_ptr &_tao_el
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>
+ template class TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_EnumDef_ptr (*_TAO_collocation_IR_EnumDef_Stub_Factory_function_pointer) (
+_TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_EnumDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_EnumDef,
+ IR::_tc_EnumDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30876,21 +33468,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EnumDef_ptr &_tao_ele
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>
+ template class TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_AliasDef_ptr (*_TAO_collocation_IR_AliasDef_Stub_Factory_function_pointer) (
+_TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_AliasDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_AliasDef,
+ IR::_tc_AliasDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -30938,21 +33531,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AliasDef_ptr &_tao_el
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>
+ template class TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_NativeDef_ptr (*_TAO_collocation_IR_NativeDef_Stub_Factory_function_pointer) (
+_TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_NativeDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_NativeDef,
+ IR::_tc_NativeDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31000,21 +33594,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_NativeDef_ptr &_tao_e
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>
+ template class TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_PrimitiveDef_ptr (*_TAO_collocation_IR_PrimitiveDef_Stub_Factory_function_pointer) (
+_TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_PrimitiveDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_PrimitiveDef,
+ IR::_tc_PrimitiveDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31062,21 +33657,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimitiveDef_ptr &_ta
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>
+ template class TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_StringDef_ptr (*_TAO_collocation_IR_StringDef_Stub_Factory_function_pointer) (
+_TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_StringDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_StringDef,
+ IR::_tc_StringDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31124,21 +33720,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StringDef_ptr &_tao_e
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_StringDef,IR_StringDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_StringDef,IR_StringDef_var>
+ template class TAO_Object_Manager<IR_StringDef,IR_StringDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_StringDef,IR_StringDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_WstringDef_ptr (*_TAO_collocation_IR_WstringDef_Stub_Factory_function_pointer) (
+_TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_WstringDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_WstringDef,
+ IR::_tc_WstringDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31186,21 +33783,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_WstringDef_ptr &_tao_
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>
+ template class TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_FixedDef_ptr (*_TAO_collocation_IR_FixedDef_Stub_Factory_function_pointer) (
+_TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_FixedDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_FixedDef,
+ IR::_tc_FixedDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31248,21 +33846,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FixedDef_ptr &_tao_el
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>
+ template class TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_SequenceDef_ptr (*_TAO_collocation_IR_SequenceDef_Stub_Factory_function_pointer) (
+_TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_SequenceDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_SequenceDef,
+ IR::_tc_SequenceDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31310,21 +33909,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_SequenceDef_ptr &_tao
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>
+ template class TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_ArrayDef_ptr (*_TAO_collocation_IR_ArrayDef_Stub_Factory_function_pointer) (
+_TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ArrayDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ArrayDef,
+ IR::_tc_ArrayDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31372,21 +33972,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ArrayDef_ptr &_tao_el
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>
+ template class TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_ExceptionDef_ptr (*_TAO_collocation_IR_ExceptionDef_Stub_Factory_function_pointer) (
+_TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ExceptionDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ExceptionDef,
+ IR::_tc_ExceptionDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31434,9 +34035,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExceptionDef_ptr &_ta
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>
+ template class TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_ExceptionDescription &_tao_elem) // copying
@@ -31698,7 +34299,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ExcDescriptionS
return 0;
}
-void operator<<= (CORBA::Any &_tao_any, IR::AttributeMode _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, IR_AttributeMode _tao_elem)
{
TAO_OutputCDR stream;
stream << _tao_elem;
@@ -31709,7 +34310,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::AttributeMode _tao_elem)
);
}
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttributeMode &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeMode &_tao_elem)
{
ACE_TRY_NEW_ENV
{
@@ -31736,16 +34337,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttributeMode &_tao_
return 0;
}
-IR_AttributeDef_ptr (*_TAO_collocation_IR_AttributeDef_Stub_Factory_function_pointer) (
+_TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_AttributeDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_AttributeDef,
+ IR::_tc_AttributeDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -31793,9 +34395,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeDef_ptr &_ta
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_AttributeDef,IR_AttributeDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_AttributeDef,IR_AttributeDef_var>
+ template class TAO_Object_Manager<IR_AttributeDef,IR_AttributeDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_AttributeDef,IR_AttributeDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_AttributeDescription &_tao_elem) // copying
@@ -31879,7 +34481,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_AttributeDescri
return 0;
}
-void operator<<= (CORBA::Any &_tao_any, IR::OperationMode _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, IR_OperationMode _tao_elem)
{
TAO_OutputCDR stream;
stream << _tao_elem;
@@ -31890,7 +34492,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::OperationMode _tao_elem)
);
}
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OperationMode &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OperationMode &_tao_elem)
{
ACE_TRY_NEW_ENV
{
@@ -31917,7 +34519,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OperationMode &_tao_
return 0;
}
-void operator<<= (CORBA::Any &_tao_any, IR::ParameterMode _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, IR_ParameterMode _tao_elem)
{
TAO_OutputCDR stream;
stream << _tao_elem;
@@ -31928,7 +34530,7 @@ void operator<<= (CORBA::Any &_tao_any, IR::ParameterMode _tao_elem)
);
}
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ParameterMode &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ParameterMode &_tao_elem)
{
ACE_TRY_NEW_ENV
{
@@ -32214,16 +34816,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ContextIdSeq *&
return 0;
}
-IR_OperationDef_ptr (*_TAO_collocation_IR_OperationDef_Stub_Factory_function_pointer) (
+_TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_OperationDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_OperationDef,
+ IR::_tc_OperationDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -32271,9 +34874,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OperationDef_ptr &_ta
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_OperationDef,IR_OperationDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_OperationDef,IR_OperationDef_var>
+ template class TAO_Object_Manager<IR_OperationDef,IR_OperationDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_OperationDef,IR_OperationDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_OperationDescription &_tao_elem) // copying
@@ -32624,16 +35227,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_AttrDescription
return 0;
}
-IR_InterfaceDef_ptr (*_TAO_collocation_IR_InterfaceDef_Stub_Factory_function_pointer) (
+_TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_InterfaceDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_InterfaceDef,
+ IR::_tc_InterfaceDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -32681,9 +35285,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InterfaceDef_ptr &_ta
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>
+ template class TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_InterfaceDescription &_tao_elem) // copying
@@ -32937,16 +35541,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueMemberSeq
return 0;
}
-IR_ValueMemberDef_ptr (*_TAO_collocation_IR_ValueMemberDef_Stub_Factory_function_pointer) (
+_TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ValueMemberDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ValueMemberDef,
+ IR::_tc_ValueMemberDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -32994,21 +35599,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueMemberDef_ptr &_
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>
+ template class TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_ValueDef_ptr (*_TAO_collocation_IR_ValueDef_Stub_Factory_function_pointer) (
+_TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ValueDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ValueDef,
+ IR::_tc_ValueDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -33056,9 +35662,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueDef_ptr &_tao_el
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>
+ template class TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_ValueDescription &_tao_elem) // copying
@@ -33142,16 +35748,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueDescriptio
return 0;
}
-IR_ValueBoxDef_ptr (*_TAO_collocation_IR_ValueBoxDef_Stub_Factory_function_pointer) (
+_TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ValueBoxDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ValueBoxDef,
+ IR::_tc_ValueBoxDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -33199,21 +35806,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueBoxDef_ptr &_tao
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>
+ template class TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_ProvidesDef_ptr (*_TAO_collocation_IR_ProvidesDef_Stub_Factory_function_pointer) (
+_TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ProvidesDef,
+ IR::_tc_ProvidesDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -33261,9 +35869,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDef_ptr &_tao
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>
+ template class TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_ProvidesDescription &_tao_elem) // copying
@@ -33347,16 +35955,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ProvidesDescrip
return 0;
}
-IR_UsesDef_ptr (*_TAO_collocation_IR_UsesDef_Stub_Factory_function_pointer) (
+_TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_UsesDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_UsesDef,
+ IR::_tc_UsesDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -33404,9 +36013,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDef_ptr &_tao_ele
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>
+ template class TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_UsesDescription &_tao_elem) // copying
@@ -33668,16 +36277,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UsesDescSeq *&_
return 0;
}
-IR_EventDef_ptr (*_TAO_collocation_IR_EventDef_Stub_Factory_function_pointer) (
+_TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_EventDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_EventDef,
+ IR::_tc_EventDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -33725,9 +36335,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EventDef_ptr &_tao_el
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_EventDef,IR_EventDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_EventDef,IR_EventDef_var>
+ template class TAO_Object_Manager<IR_EventDef,IR_EventDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_EventDef,IR_EventDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_EventDescription &_tao_elem) // copying
@@ -33811,16 +36421,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EventDescriptio
return 0;
}
-IR_EmitsDef_ptr (*_TAO_collocation_IR_EmitsDef_Stub_Factory_function_pointer) (
+_TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_EmitsDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_EmitsDef,
+ IR::_tc_EmitsDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -33868,21 +36479,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EmitsDef_ptr &_tao_el
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
+ template class TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_PublishesDef_ptr (*_TAO_collocation_IR_PublishesDef_Stub_Factory_function_pointer) (
+_TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_PublishesDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_PublishesDef,
+ IR::_tc_PublishesDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -33930,21 +36542,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PublishesDef_ptr &_ta
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
+ template class TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_ConsumesDef_ptr (*_TAO_collocation_IR_ConsumesDef_Stub_Factory_function_pointer) (
+_TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ConsumesDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ConsumesDef,
+ IR::_tc_ConsumesDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -33992,21 +36605,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConsumesDef_ptr &_tao
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
+ template class TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_ComponentDef_ptr (*_TAO_collocation_IR_ComponentDef_Stub_Factory_function_pointer) (
+_TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_ComponentDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_ComponentDef,
+ IR::_tc_ComponentDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -34054,9 +36668,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentDef_ptr &_ta
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>
+ template class TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_ComponentDescription &_tao_elem) // copying
@@ -34140,16 +36754,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ComponentDescri
return 0;
}
-IR_PrimaryKeyDef_ptr (*_TAO_collocation_IR_PrimaryKeyDef_Stub_Factory_function_pointer) (
+_TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_PrimaryKeyDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_PrimaryKeyDef,
+ IR::_tc_PrimaryKeyDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -34197,9 +36812,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimaryKeyDef_ptr &_t
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_PrimaryKeyDef,IR_PrimaryKeyDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_PrimaryKeyDef,IR_PrimaryKeyDef_var>
+ template class TAO_Object_Manager<IR_PrimaryKeyDef,IR_PrimaryKeyDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_PrimaryKeyDef,IR_PrimaryKeyDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_PrimaryKeyDescription &_tao_elem) // copying
@@ -34283,16 +36898,17 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_PrimaryKeyDescr
return 0;
}
-IR_FactoryDef_ptr (*_TAO_collocation_IR_FactoryDef_Stub_Factory_function_pointer) (
+_TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_FactoryDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_FactoryDef,
+ IR::_tc_FactoryDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -34340,21 +36956,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FactoryDef_ptr &_tao_
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
+ template class TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_FinderDef_ptr (*_TAO_collocation_IR_FinderDef_Stub_Factory_function_pointer) (
+_TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_FinderDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_FinderDef,
+ IR::_tc_FinderDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -34402,21 +37019,22 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FinderDef_ptr &_tao_e
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
+ template class TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-IR_HomeDef_ptr (*_TAO_collocation_IR_HomeDef_Stub_Factory_function_pointer) (
+_TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
) = 0;
+
void operator<<= (CORBA::Any &_tao_any, IR_HomeDef_ptr _tao_elem)
{
TAO_OutputCDR stream;
if (stream << _tao_elem)
{
_tao_any._tao_replace (
- IR::_tc_HomeDef,
+ IR::_tc_HomeDef,
TAO_ENCAP_BYTE_ORDER,
stream.begin (),
1,
@@ -34464,9 +37082,9 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_HomeDef_ptr &_tao_ele
#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>
+ template class TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ # pragma instantiate TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>
#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
void operator<<= (CORBA::Any &_tao_any, const IR_HomeDescription &_tao_elem) // copying
@@ -34550,68 +37168,6 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_HomeDescription
return 0;
}
-CORBA::IRObject_ptr (*_TAO_collocation_CORBA_IRObject_Stub_Factory_function_pointer) (
- CORBA::Object_ptr obj
- ) = 0;
-void operator<<= (CORBA::Any &_tao_any, CORBA::IRObject_ptr _tao_elem)
-{
- TAO_OutputCDR stream;
- if (stream << _tao_elem)
- {
- _tao_any._tao_replace (
- CORBA::_tc_IRObject,
- TAO_ENCAP_BYTE_ORDER,
- stream.begin (),
- 1,
- CORBA::IRObject::_duplicate (_tao_elem),
- CORBA::IRObject::_tao_any_destructor
- );
- }
-}
-
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IRObject_ptr &_tao_elem)
-{
- ACE_TRY_NEW_ENV
- {
- _tao_elem = CORBA::IRObject::_nil ();
- CORBA::TypeCode_var type = _tao_any.type ();
- if (!type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV)) // not equal
- {
- return 0;
- }
- ACE_TRY_CHECK;
- TAO_InputCDR stream (
- _tao_any._tao_get_cdr (),
- _tao_any._tao_byte_order ()
- );
- if (stream >> _tao_elem)
- {
- ((CORBA::Any *)&_tao_any)->_tao_replace (
- CORBA::_tc_IRObject,
- 1,
- _tao_elem,
- CORBA::IRObject::_tao_any_destructor
- );
- return 1;
- }
- }
- ACE_CATCHANY
- {
- _tao_elem = CORBA::IRObject::_nil ();
- return 0;
- }
- ACE_ENDTRY;
- _tao_elem = CORBA::IRObject::_nil ();
- return 0;
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
- template class TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
CORBA::Boolean operator<< (
TAO_OutputCDR &strm,
const IR_InterfaceDefSeq &_tao_sequence
@@ -34641,7 +37197,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -34683,7 +37239,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -34725,7 +37281,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -34767,7 +37323,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -34809,7 +37365,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -34851,7 +37407,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -34893,7 +37449,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -34935,7 +37491,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -34977,7 +37533,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35019,7 +37575,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35061,7 +37617,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35103,7 +37659,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35145,7 +37701,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35187,7 +37743,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35229,7 +37785,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35271,7 +37827,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35313,7 +37869,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35355,7 +37911,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35397,7 +37953,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35439,7 +37995,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35481,7 +38037,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35523,7 +38079,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35565,7 +38121,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35607,7 +38163,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35649,7 +38205,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35691,7 +38247,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35733,7 +38289,7 @@ CORBA::Boolean operator>> (
// set the length of the sequence
_tao_sequence.length (_tao_seq_len);
// If length is 0 we return true.
- if (0 >= _tao_seq_len)
+ if (0 >= _tao_seq_len)
return 1;
// retrieve all the elements
CORBA::Boolean _tao_marshal_flag = 1;
@@ -35746,4 +38302,4 @@ CORBA::Boolean operator>> (
return 0; // error
}
-#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
+#endif /* TAO_HAS_INTERFACE_REPOSITORY */
diff --git a/TAO/tao/InterfaceC.h b/TAO/tao/InterfaceC.h
index 2d9d3f51fe1..a72d527b64d 100644
--- a/TAO/tao/InterfaceC.h
+++ b/TAO/tao/InterfaceC.h
@@ -1,12 +1,23 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
//$Id$
-// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+// Center for Distributed Object Computing
+// Washington University
+// St. Louis, MO
+// USA
+// http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+// Distributed Object Computing Laboratory
+// University of California at Irvine
+// Irvine, CA
+// USA
+// http://doc.ece.uci.edu/
//
// Information about TAO is available at:
-// http://www.cs.wustl.edu/~schmidt/TAO.html
+// http://www.cs.wustl.edu/~schmidt/TAO.html
#ifndef TAO_IDL_INTERFACEC_H
#define TAO_IDL_INTERFACEC_H
@@ -20,6 +31,7 @@
#include "tao/Managed_Types.h"
#include "tao/Sequence.h"
#include "tao/Typecode.h"
+#include "tao/Remote_Object_Proxy_Impl.h"
#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
@@ -27,6 +39,7 @@
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
+
#if defined (TAO_EXPORT_MACRO)
#undef TAO_EXPORT_MACRO
#endif
@@ -46,21 +59,59 @@
#pragma warning(disable:4250)
#endif /* _MSC_VER */
+enum IR_DefinitionKind
+ {
+ dk_none,
+ dk_all,
+ dk_Attribute,
+ dk_Constant,
+ dk_Exception,
+ dk_Interface,
+ dk_Module,
+ dk_Operation,
+ dk_Typedef,
+ dk_Alias,
+ dk_Struct,
+ dk_Union,
+ dk_Enum,
+ dk_Primitive,
+ dk_String,
+ dk_Sequence,
+ dk_Array,
+ dk_Repository,
+ dk_Wstring,
+ dk_Fixed,
+ dk_Value,
+ dk_ValueBox,
+ dk_ValueMember,
+ dk_Native,
+ dk_Component,
+ dk_Home,
+ dk_Factory,
+ dk_Finder,
+ dk_PrimaryKey,
+ dk_Emits,
+ dk_Publishes,
+ dk_Consumes,
+ dk_Provides,
+ dk_Uses
+ };
+
class TAO_Export CORBA_IRObject_var : public TAO_Base_var
{
public:
CORBA_IRObject_var (void); // default constructor
- CORBA_IRObject_var (CORBA_IRObject_ptr);
+ CORBA_IRObject_var (CORBA_IRObject_ptr p) : ptr_ (p) {}
CORBA_IRObject_var (const CORBA_IRObject_var &); // copy constructor
~CORBA_IRObject_var (void); // destructor
-
+
CORBA_IRObject_var &operator= (CORBA_IRObject_ptr);
CORBA_IRObject_var &operator= (const CORBA_IRObject_var &);
CORBA_IRObject_ptr operator-> (void) const;
-
+
operator const CORBA_IRObject_ptr &() const;
operator CORBA_IRObject_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
CORBA_IRObject_ptr in (void) const;
CORBA_IRObject_ptr &inout (void);
CORBA_IRObject_ptr &out (void);
@@ -86,39 +137,45 @@
operator CORBA_IRObject_ptr &();
CORBA_IRObject_ptr &ptr (void);
CORBA_IRObject_ptr operator-> (void);
-
+
private:
CORBA_IRObject_ptr &ptr_;
};
-class TAO_Export CORBA_IRObject : public virtual ACE_CORBA_1 (Object)
+ class _TAO_IRObject_Proxy_Impl;
+ class _TAO_IRObject_Remote_Proxy_Impl;
+ class _TAO_IRObject_Proxy_Broker;
+ class _TAO_IRObject_Remote_Proxy_Broker;
+
+ class TAO_Export CORBA_IRObject : public virtual CORBA_Object
{
public:
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
typedef CORBA_IRObject_ptr _ptr_type;
typedef CORBA_IRObject_var _var_type;
- #endif /* __GNUC__ */
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
// the static operations
static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
static CORBA_IRObject_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static CORBA_IRObject_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static CORBA_IRObject_ptr _nil (void)
{
- return (CORBA::IRObject_ptr)0;
+ return (CORBA_IRObject_ptr)0;
}
+
static void _tao_any_destructor (void*);
- virtual IR::DefinitionKind def_kind (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -126,123 +183,204 @@ class TAO_Export CORBA_IRObject : public virtual ACE_CORBA_1 (Object)
));
virtual void destroy (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+ private:
+ _TAO_IRObject_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
+
protected:
- CORBA_IRObject (void);
- CORBA_IRObject (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
+ CORBA_IRObject (int collocated = 0);
+
+ protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ CORBA_IRObject (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
);
+
+ friend class _TAO_IRObject_Remote_Proxy_Impl;
+ friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
+ friend class _TAO_IRObject_Direct_Proxy_Impl;
+
virtual ~CORBA_IRObject (void);
private:
CORBA_IRObject (const CORBA_IRObject &);
- void operator= (const CORBA_IRObject &);
+ void operator= (const CORBA_IRObject &);
};
-class TAO_CORBA_IRObject_Default_Proxy_Factory
-{
-public:
-
- TAO_CORBA_IRObject_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_CORBA_IRObject_Default_Proxy_Factory (void);
- virtual CORBA_IRObject_ptr create_proxy (
- CORBA_IRObject_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_CORBA_IRObject_Proxy_Factory_Adapter
+class TAO_Export _TAO_IRObject_Proxy_Impl : public virtual TAO_Object_Proxy_Impl
{
public:
+ virtual ~_TAO_IRObject_Proxy_Impl (void) { }
+
+ virtual IR_DefinitionKind def_kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_CORBA_IRObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void destroy (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_CORBA_IRObject_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_IRObject_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- CORBA_IRObject_ptr create_proxy (
- CORBA_IRObject_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_CORBA_IRObject_Proxy_Factory_Adapter (void);
- ~TAO_CORBA_IRObject_Proxy_Factory_Adapter (void);
- TAO_CORBA_IRObject_Proxy_Factory_Adapter &operator= (
- const TAO_CORBA_IRObject_Proxy_Factory_Adapter &
- );
- TAO_CORBA_IRObject_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_CORBA_IRObject_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_CORBA_IRObject_PROXY_FACTORY_ADAPTER;
- class TAO_CORBA_IRObject_Smart_Proxy_Base : public virtual CORBA_IRObject
- {
- public:
- TAO_CORBA_IRObject_Smart_Proxy_Base (CORBA_IRObject_ptr proxy);
- ~TAO_CORBA_IRObject_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR::DefinitionKind def_kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_IRObject_Remote_Proxy_Impl :
+ public virtual _TAO_IRObject_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl
+{
+public:
+ _TAO_IRObject_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_IRObject_Remote_Proxy_Impl (void) { }
+
+ virtual IR_DefinitionKind def_kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void destroy (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_IRObject_Proxy_Broker
+{
+public:
+ virtual ~_TAO_IRObject_Proxy_Broker (void);
+
+ virtual _TAO_IRObject_Proxy_Impl &select_proxy (
+ CORBA_IRObject *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_IRObject_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_IRObject_Remote_Proxy_Broker : public virtual _TAO_IRObject_Proxy_Broker
+{
+public:
+ _TAO_IRObject_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_IRObject_Remote_Proxy_Broker (void);
+
+ virtual _TAO_IRObject_Proxy_Impl &select_proxy (
+ CORBA_IRObject *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::CORBA::IRObject_var base_proxy_;
+ _TAO_IRObject_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
class TAO_Export IR_Contained_var : public TAO_Base_var
{
public:
IR_Contained_var (void); // default constructor
- IR_Contained_var (IR_Contained_ptr);
+ IR_Contained_var (IR_Contained_ptr p) : ptr_ (p) {}
IR_Contained_var (const IR_Contained_var &); // copy constructor
~IR_Contained_var (void); // destructor
-
+
IR_Contained_var &operator= (IR_Contained_ptr);
IR_Contained_var &operator= (const IR_Contained_var &);
IR_Contained_ptr operator-> (void) const;
-
+
operator const IR_Contained_ptr &() const;
operator IR_Contained_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_Contained_ptr in (void) const;
IR_Contained_ptr &inout (void);
IR_Contained_ptr &out (void);
@@ -268,7 +406,7 @@ private:
operator IR_Contained_ptr &();
IR_Contained_ptr &ptr (void);
IR_Contained_ptr operator-> (void);
-
+
private:
IR_Contained_ptr &ptr_;
};
@@ -277,17 +415,17 @@ private:
{
public:
IR_Repository_var (void); // default constructor
- IR_Repository_var (IR_Repository_ptr);
+ IR_Repository_var (IR_Repository_ptr p) : ptr_ (p) {}
IR_Repository_var (const IR_Repository_var &); // copy constructor
~IR_Repository_var (void); // destructor
-
+
IR_Repository_var &operator= (IR_Repository_ptr);
IR_Repository_var &operator= (const IR_Repository_var &);
IR_Repository_ptr operator-> (void) const;
-
+
operator const IR_Repository_ptr &() const;
operator IR_Repository_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_Repository_ptr in (void) const;
IR_Repository_ptr &inout (void);
IR_Repository_ptr &out (void);
@@ -313,7 +451,7 @@ private:
operator IR_Repository_ptr &();
IR_Repository_ptr &ptr (void);
IR_Repository_ptr operator-> (void);
-
+
private:
IR_Repository_ptr &ptr_;
};
@@ -322,17 +460,17 @@ private:
{
public:
IR_Container_var (void); // default constructor
- IR_Container_var (IR_Container_ptr);
+ IR_Container_var (IR_Container_ptr p) : ptr_ (p) {}
IR_Container_var (const IR_Container_var &); // copy constructor
~IR_Container_var (void); // destructor
-
+
IR_Container_var &operator= (IR_Container_ptr);
IR_Container_var &operator= (const IR_Container_var &);
IR_Container_ptr operator-> (void) const;
-
+
operator const IR_Container_ptr &() const;
operator IR_Container_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_Container_ptr in (void) const;
IR_Container_ptr &inout (void);
IR_Container_ptr &out (void);
@@ -358,12 +496,18 @@ private:
operator IR_Container_ptr &();
IR_Container_ptr &ptr (void);
IR_Container_ptr operator-> (void);
-
+
private:
IR_Container_ptr &ptr_;
};
-class TAO_Export IR_Contained: public virtual CORBA_IRObject
+// Forward Classes Declaration
+ class _TAO_Contained_Proxy_Impl;
+ class _TAO_Contained_Remote_Proxy_Impl;
+ class _TAO_Contained_Proxy_Broker;
+ class _TAO_Contained_Remote_Proxy_Broker;
+
+ class TAO_Export IR_Contained: public virtual CORBA_IRObject
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -375,12 +519,12 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
static IR_Contained_ptr _duplicate (IR_Contained_ptr obj);
static IR_Contained_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_Contained_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_Contained_ptr _nil (void)
@@ -391,7 +535,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
static void _tao_any_destructor (void*);
virtual char * id (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -400,7 +544,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
virtual void id (
const char * id,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -408,7 +552,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
));
virtual char * name (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -417,7 +561,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
virtual void name (
const char * name,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -425,7 +569,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
));
virtual char * version (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -434,7 +578,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
virtual void version (
const char * version,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -442,7 +586,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
));
virtual IR_Container_ptr defined_in (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -450,7 +594,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
));
virtual char * absolute_name (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -458,7 +602,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
));
virtual IR_Repository_ptr containing_repository (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -467,7 +611,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
struct Description;
class Description_var;
-
+
struct TAO_Export Description
{
@@ -477,7 +621,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
static void _tao_any_destructor (void*);
- IR::DefinitionKind kind;
+ IR_DefinitionKind kind;
CORBA::Any value;
};
@@ -488,18 +632,18 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
Description_var (Description *);
Description_var (const Description_var &); // copy constructor
~Description_var (void); // destructor
-
+
Description_var &operator= (Description *);
Description_var &operator= (const Description_var &);
Description *operator-> (void);
const Description *operator-> (void) const;
-
+
operator const Description &() const;
operator Description &();
operator Description &() const;
operator Description *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const Description &in (void) const;
Description &inout (void);
Description *&out (void);
@@ -521,7 +665,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
operator Description *&();
Description *&ptr (void);
Description *operator-> (void);
-
+
private:
Description *&ptr_;
// assignment from T_var not allowed
@@ -530,8 +674,8 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
static CORBA::TypeCode_ptr _tc_Description;
- virtual IR_Contained::Description * describe (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_Contained::Description * describe (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -542,7 +686,7 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
IR_Container_ptr new_container,
const char * new_name,
const char * new_version,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -550,192 +694,353 @@ class TAO_Export IR_Contained: public virtual CORBA_IRObject
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+ private:
+ _TAO_Contained_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
+
+ protected:
+ IR_Contained (int collocated = 0);
+
protected:
- IR_Contained (void);
- IR_Contained (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_Contained (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
);
- virtual ~IR_Contained (void);
+
+ friend class _TAO_Contained_Remote_Proxy_Impl;
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+ friend class _TAO_Contained_Direct_Proxy_Impl;
+
+ virtual ~IR_Contained (void);
private:
IR_Contained (const IR_Contained &);
- void operator= (const IR_Contained &);
-};
+ void operator= (const IR_Contained &);
-class TAO_IR_Contained_Default_Proxy_Factory
-{
-public:
+ };
- TAO_IR_Contained_Default_Proxy_Factory (int register_proxy_factory = 1);
- virtual ~TAO_IR_Contained_Default_Proxy_Factory (void);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual IR_Contained_ptr create_proxy (
- IR_Contained_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
-class TAO_IR_Contained_Proxy_Factory_Adapter
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
+
+class TAO_Export _TAO_Contained_Proxy_Impl :
+ public virtual _TAO_IRObject_Proxy_Impl
{
public:
+ virtual ~_TAO_Contained_Proxy_Impl (void) { }
+
+ virtual char * id (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_Contained_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void id (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_Contained_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual char * name (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void name (
+ CORBA_Object *_collocated_tao_target_,
+ const char * name,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_Contained_ptr create_proxy (
- IR_Contained_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual char * version (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void version (
+ CORBA_Object *_collocated_tao_target_,
+ const char * version,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_Container_ptr defined_in (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual char * absolute_name (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_Repository_ptr containing_repository (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_Contained::Description * describe (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void move (
+ CORBA_Object *_collocated_tao_target_,
+ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_Contained_Proxy_Factory_Adapter (void);
- ~TAO_IR_Contained_Proxy_Factory_Adapter (void);
- TAO_IR_Contained_Proxy_Factory_Adapter &operator= (
- const TAO_IR_Contained_Proxy_Factory_Adapter &
- );
- TAO_IR_Contained_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_Contained_Proxy_Impl (void);
+};
- typedef TAO_Singleton<TAO_IR_Contained_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_Contained_PROXY_FACTORY_ADAPTER;
- class TAO_IR_Contained_Smart_Proxy_Base : public virtual IR_Contained
- {
- public:
- TAO_IR_Contained_Smart_Proxy_Base (IR_Contained_ptr proxy);
- ~TAO_IR_Contained_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual char * id (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_Contained_Remote_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IRObject_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_Contained_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_Contained_Remote_Proxy_Impl (void) { }
+
+ virtual char * id (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void id (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual char * name (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void name (
+ CORBA_Object *_collocated_tao_target_,
const char * name,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual char * version (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void version (
+ CORBA_Object *_collocated_tao_target_,
const char * version,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_Container_ptr defined_in (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual char * absolute_name (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_Repository_ptr containing_repository (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_Contained::Description * describe (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void move (
+ CORBA_Object *_collocated_tao_target_,
IR_Container_ptr new_container,
const char * new_name,
const char * new_version,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_Contained_Proxy_Broker
+{
+public:
+ virtual ~_TAO_Contained_Proxy_Broker (void);
+
+ virtual _TAO_Contained_Proxy_Impl &select_proxy (
+ IR_Contained *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_Contained_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_Contained_Remote_Proxy_Broker : public virtual _TAO_Contained_Proxy_Broker
+{
+public:
+ _TAO_Contained_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_Contained_Remote_Proxy_Broker (void);
+
+ virtual _TAO_Contained_Proxy_Impl &select_proxy (
+ IR_Contained *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
private:
- IR_Contained_var base_proxy_;
+ _TAO_Contained_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
class TAO_Export IR_ModuleDef_var : public TAO_Base_var
{
public:
IR_ModuleDef_var (void); // default constructor
- IR_ModuleDef_var (IR_ModuleDef_ptr);
+ IR_ModuleDef_var (IR_ModuleDef_ptr p) : ptr_ (p) {}
IR_ModuleDef_var (const IR_ModuleDef_var &); // copy constructor
~IR_ModuleDef_var (void); // destructor
-
+
IR_ModuleDef_var &operator= (IR_ModuleDef_ptr);
IR_ModuleDef_var &operator= (const IR_ModuleDef_var &);
IR_ModuleDef_ptr operator-> (void) const;
-
+
operator const IR_ModuleDef_ptr &() const;
operator IR_ModuleDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ModuleDef_ptr in (void) const;
IR_ModuleDef_ptr &inout (void);
IR_ModuleDef_ptr &out (void);
@@ -761,7 +1066,7 @@ public:
operator IR_ModuleDef_ptr &();
IR_ModuleDef_ptr &ptr (void);
IR_ModuleDef_ptr operator-> (void);
-
+
private:
IR_ModuleDef_ptr &ptr_;
};
@@ -770,17 +1075,17 @@ class TAO_Export IR_ConstantDef_var : public TAO_Base_var
{
public:
IR_ConstantDef_var (void); // default constructor
- IR_ConstantDef_var (IR_ConstantDef_ptr);
+ IR_ConstantDef_var (IR_ConstantDef_ptr p) : ptr_ (p) {}
IR_ConstantDef_var (const IR_ConstantDef_var &); // copy constructor
~IR_ConstantDef_var (void); // destructor
-
+
IR_ConstantDef_var &operator= (IR_ConstantDef_ptr);
IR_ConstantDef_var &operator= (const IR_ConstantDef_var &);
IR_ConstantDef_ptr operator-> (void) const;
-
+
operator const IR_ConstantDef_ptr &() const;
operator IR_ConstantDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ConstantDef_ptr in (void) const;
IR_ConstantDef_ptr &inout (void);
IR_ConstantDef_ptr &out (void);
@@ -806,7 +1111,7 @@ public:
operator IR_ConstantDef_ptr &();
IR_ConstantDef_ptr &ptr (void);
IR_ConstantDef_ptr operator-> (void);
-
+
private:
IR_ConstantDef_ptr &ptr_;
};
@@ -815,17 +1120,17 @@ class TAO_Export IR_IDLType_var : public TAO_Base_var
{
public:
IR_IDLType_var (void); // default constructor
- IR_IDLType_var (IR_IDLType_ptr);
+ IR_IDLType_var (IR_IDLType_ptr p) : ptr_ (p) {}
IR_IDLType_var (const IR_IDLType_var &); // copy constructor
~IR_IDLType_var (void); // destructor
-
+
IR_IDLType_var &operator= (IR_IDLType_ptr);
IR_IDLType_var &operator= (const IR_IDLType_var &);
IR_IDLType_ptr operator-> (void) const;
-
+
operator const IR_IDLType_ptr &() const;
operator IR_IDLType_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_IDLType_ptr in (void) const;
IR_IDLType_ptr &inout (void);
IR_IDLType_ptr &out (void);
@@ -851,7 +1156,7 @@ public:
operator IR_IDLType_ptr &();
IR_IDLType_ptr &ptr (void);
IR_IDLType_ptr operator-> (void);
-
+
private:
IR_IDLType_ptr &ptr_;
};
@@ -860,17 +1165,17 @@ class TAO_Export IR_StructDef_var : public TAO_Base_var
{
public:
IR_StructDef_var (void); // default constructor
- IR_StructDef_var (IR_StructDef_ptr);
+ IR_StructDef_var (IR_StructDef_ptr p) : ptr_ (p) {}
IR_StructDef_var (const IR_StructDef_var &); // copy constructor
~IR_StructDef_var (void); // destructor
-
+
IR_StructDef_var &operator= (IR_StructDef_ptr);
IR_StructDef_var &operator= (const IR_StructDef_var &);
IR_StructDef_ptr operator-> (void) const;
-
+
operator const IR_StructDef_ptr &() const;
operator IR_StructDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_StructDef_ptr in (void) const;
IR_StructDef_ptr &inout (void);
IR_StructDef_ptr &out (void);
@@ -896,7 +1201,7 @@ public:
operator IR_StructDef_ptr &();
IR_StructDef_ptr &ptr (void);
IR_StructDef_ptr operator-> (void);
-
+
private:
IR_StructDef_ptr &ptr_;
};
@@ -905,17 +1210,17 @@ class TAO_Export IR_UnionDef_var : public TAO_Base_var
{
public:
IR_UnionDef_var (void); // default constructor
- IR_UnionDef_var (IR_UnionDef_ptr);
+ IR_UnionDef_var (IR_UnionDef_ptr p) : ptr_ (p) {}
IR_UnionDef_var (const IR_UnionDef_var &); // copy constructor
~IR_UnionDef_var (void); // destructor
-
+
IR_UnionDef_var &operator= (IR_UnionDef_ptr);
IR_UnionDef_var &operator= (const IR_UnionDef_var &);
IR_UnionDef_ptr operator-> (void) const;
-
+
operator const IR_UnionDef_ptr &() const;
operator IR_UnionDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_UnionDef_ptr in (void) const;
IR_UnionDef_ptr &inout (void);
IR_UnionDef_ptr &out (void);
@@ -941,7 +1246,7 @@ public:
operator IR_UnionDef_ptr &();
IR_UnionDef_ptr &ptr (void);
IR_UnionDef_ptr operator-> (void);
-
+
private:
IR_UnionDef_ptr &ptr_;
};
@@ -950,17 +1255,17 @@ class TAO_Export IR_EnumDef_var : public TAO_Base_var
{
public:
IR_EnumDef_var (void); // default constructor
- IR_EnumDef_var (IR_EnumDef_ptr);
+ IR_EnumDef_var (IR_EnumDef_ptr p) : ptr_ (p) {}
IR_EnumDef_var (const IR_EnumDef_var &); // copy constructor
~IR_EnumDef_var (void); // destructor
-
+
IR_EnumDef_var &operator= (IR_EnumDef_ptr);
IR_EnumDef_var &operator= (const IR_EnumDef_var &);
IR_EnumDef_ptr operator-> (void) const;
-
+
operator const IR_EnumDef_ptr &() const;
operator IR_EnumDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_EnumDef_ptr in (void) const;
IR_EnumDef_ptr &inout (void);
IR_EnumDef_ptr &out (void);
@@ -986,7 +1291,7 @@ public:
operator IR_EnumDef_ptr &();
IR_EnumDef_ptr &ptr (void);
IR_EnumDef_ptr operator-> (void);
-
+
private:
IR_EnumDef_ptr &ptr_;
};
@@ -995,17 +1300,17 @@ class TAO_Export IR_AliasDef_var : public TAO_Base_var
{
public:
IR_AliasDef_var (void); // default constructor
- IR_AliasDef_var (IR_AliasDef_ptr);
+ IR_AliasDef_var (IR_AliasDef_ptr p) : ptr_ (p) {}
IR_AliasDef_var (const IR_AliasDef_var &); // copy constructor
~IR_AliasDef_var (void); // destructor
-
+
IR_AliasDef_var &operator= (IR_AliasDef_ptr);
IR_AliasDef_var &operator= (const IR_AliasDef_var &);
IR_AliasDef_ptr operator-> (void) const;
-
+
operator const IR_AliasDef_ptr &() const;
operator IR_AliasDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_AliasDef_ptr in (void) const;
IR_AliasDef_ptr &inout (void);
IR_AliasDef_ptr &out (void);
@@ -1031,7 +1336,7 @@ public:
operator IR_AliasDef_ptr &();
IR_AliasDef_ptr &ptr (void);
IR_AliasDef_ptr operator-> (void);
-
+
private:
IR_AliasDef_ptr &ptr_;
};
@@ -1040,17 +1345,17 @@ class TAO_Export IR_InterfaceDef_var : public TAO_Base_var
{
public:
IR_InterfaceDef_var (void); // default constructor
- IR_InterfaceDef_var (IR_InterfaceDef_ptr);
+ IR_InterfaceDef_var (IR_InterfaceDef_ptr p) : ptr_ (p) {}
IR_InterfaceDef_var (const IR_InterfaceDef_var &); // copy constructor
~IR_InterfaceDef_var (void); // destructor
-
+
IR_InterfaceDef_var &operator= (IR_InterfaceDef_ptr);
IR_InterfaceDef_var &operator= (const IR_InterfaceDef_var &);
IR_InterfaceDef_ptr operator-> (void) const;
-
+
operator const IR_InterfaceDef_ptr &() const;
operator IR_InterfaceDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_InterfaceDef_ptr in (void) const;
IR_InterfaceDef_ptr &inout (void);
IR_InterfaceDef_ptr &out (void);
@@ -1076,7 +1381,7 @@ public:
operator IR_InterfaceDef_ptr &();
IR_InterfaceDef_ptr &ptr (void);
IR_InterfaceDef_ptr operator-> (void);
-
+
private:
IR_InterfaceDef_ptr &ptr_;
};
@@ -1085,17 +1390,17 @@ class TAO_Export IR_ExceptionDef_var : public TAO_Base_var
{
public:
IR_ExceptionDef_var (void); // default constructor
- IR_ExceptionDef_var (IR_ExceptionDef_ptr);
+ IR_ExceptionDef_var (IR_ExceptionDef_ptr p) : ptr_ (p) {}
IR_ExceptionDef_var (const IR_ExceptionDef_var &); // copy constructor
~IR_ExceptionDef_var (void); // destructor
-
+
IR_ExceptionDef_var &operator= (IR_ExceptionDef_ptr);
IR_ExceptionDef_var &operator= (const IR_ExceptionDef_var &);
IR_ExceptionDef_ptr operator-> (void) const;
-
+
operator const IR_ExceptionDef_ptr &() const;
operator IR_ExceptionDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ExceptionDef_ptr in (void) const;
IR_ExceptionDef_ptr &inout (void);
IR_ExceptionDef_ptr &out (void);
@@ -1121,7 +1426,7 @@ public:
operator IR_ExceptionDef_ptr &();
IR_ExceptionDef_ptr &ptr (void);
IR_ExceptionDef_ptr operator-> (void);
-
+
private:
IR_ExceptionDef_ptr &ptr_;
};
@@ -1130,17 +1435,17 @@ class TAO_Export IR_NativeDef_var : public TAO_Base_var
{
public:
IR_NativeDef_var (void); // default constructor
- IR_NativeDef_var (IR_NativeDef_ptr);
+ IR_NativeDef_var (IR_NativeDef_ptr p) : ptr_ (p) {}
IR_NativeDef_var (const IR_NativeDef_var &); // copy constructor
~IR_NativeDef_var (void); // destructor
-
+
IR_NativeDef_var &operator= (IR_NativeDef_ptr);
IR_NativeDef_var &operator= (const IR_NativeDef_var &);
IR_NativeDef_ptr operator-> (void) const;
-
+
operator const IR_NativeDef_ptr &() const;
operator IR_NativeDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_NativeDef_ptr in (void) const;
IR_NativeDef_ptr &inout (void);
IR_NativeDef_ptr &out (void);
@@ -1166,18 +1471,18 @@ public:
operator IR_NativeDef_ptr &();
IR_NativeDef_ptr &ptr (void);
IR_NativeDef_ptr operator-> (void);
-
+
private:
IR_NativeDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
@@ -1199,34 +1504,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_InterfaceDefSeq
// *************************************************************
-class TAO_Export IR_InterfaceDefSeq : public
+class TAO_Export IR_InterfaceDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_InterfaceDefSeq (void); // default ctor
IR_InterfaceDefSeq (CORBA::ULong max); // uses max size
IR_InterfaceDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_InterfaceDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_InterfaceDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_InterfaceDefSeq (const IR_InterfaceDefSeq &); // copy ctor
~IR_InterfaceDefSeq (void);
@@ -1249,19 +1554,20 @@ public:
IR_InterfaceDefSeq_var (IR_InterfaceDefSeq *);
IR_InterfaceDefSeq_var (const IR_InterfaceDefSeq_var &); // copy constructor
~IR_InterfaceDefSeq_var (void); // destructor
-
+
IR_InterfaceDefSeq_var &operator= (IR_InterfaceDefSeq *);
IR_InterfaceDefSeq_var &operator= (const IR_InterfaceDefSeq_var &);
IR_InterfaceDefSeq *operator-> (void);
const IR_InterfaceDefSeq *operator-> (void) const;
-
+
operator const IR_InterfaceDefSeq &() const;
operator IR_InterfaceDefSeq &();
operator IR_InterfaceDefSeq &() const;
operator IR_InterfaceDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_InterfaceDefSeq &in (void) const;
IR_InterfaceDefSeq &inout (void);
IR_InterfaceDefSeq *&out (void);
@@ -1272,7 +1578,6 @@ private:
IR_InterfaceDefSeq *ptr_;
};
-
class TAO_Export IR_InterfaceDefSeq_out
{
public:
@@ -1285,7 +1590,7 @@ public:
IR_InterfaceDefSeq *&ptr (void);
IR_InterfaceDefSeq *operator-> (void);
TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_InterfaceDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -1296,17 +1601,17 @@ class TAO_Export IR_ValueDef_var : public TAO_Base_var
{
public:
IR_ValueDef_var (void); // default constructor
- IR_ValueDef_var (IR_ValueDef_ptr);
+ IR_ValueDef_var (IR_ValueDef_ptr p) : ptr_ (p) {}
IR_ValueDef_var (const IR_ValueDef_var &); // copy constructor
~IR_ValueDef_var (void); // destructor
-
+
IR_ValueDef_var &operator= (IR_ValueDef_ptr);
IR_ValueDef_var &operator= (const IR_ValueDef_var &);
IR_ValueDef_ptr operator-> (void) const;
-
+
operator const IR_ValueDef_ptr &() const;
operator IR_ValueDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ValueDef_ptr in (void) const;
IR_ValueDef_ptr &inout (void);
IR_ValueDef_ptr &out (void);
@@ -1332,18 +1637,18 @@ public:
operator IR_ValueDef_ptr &();
IR_ValueDef_ptr &ptr (void);
IR_ValueDef_ptr operator-> (void);
-
+
private:
IR_ValueDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
@@ -1365,34 +1670,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ValueDefSeq
// *************************************************************
-class TAO_Export IR_ValueDefSeq : public
+class TAO_Export IR_ValueDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ValueDefSeq (void); // default ctor
IR_ValueDefSeq (CORBA::ULong max); // uses max size
IR_ValueDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ValueDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ValueDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_ValueDefSeq (const IR_ValueDefSeq &); // copy ctor
~IR_ValueDefSeq (void);
@@ -1415,19 +1720,20 @@ public:
IR_ValueDefSeq_var (IR_ValueDefSeq *);
IR_ValueDefSeq_var (const IR_ValueDefSeq_var &); // copy constructor
~IR_ValueDefSeq_var (void); // destructor
-
+
IR_ValueDefSeq_var &operator= (IR_ValueDefSeq *);
IR_ValueDefSeq_var &operator= (const IR_ValueDefSeq_var &);
IR_ValueDefSeq *operator-> (void);
const IR_ValueDefSeq *operator-> (void) const;
-
+
operator const IR_ValueDefSeq &() const;
operator IR_ValueDefSeq &();
operator IR_ValueDefSeq &() const;
operator IR_ValueDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ValueDefSeq &in (void) const;
IR_ValueDefSeq &inout (void);
IR_ValueDefSeq *&out (void);
@@ -1450,7 +1756,7 @@ public:
IR_ValueDefSeq *&ptr (void);
IR_ValueDefSeq *operator-> (void);
TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_ValueDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -1461,17 +1767,17 @@ class TAO_Export IR_ValueBoxDef_var : public TAO_Base_var
{
public:
IR_ValueBoxDef_var (void); // default constructor
- IR_ValueBoxDef_var (IR_ValueBoxDef_ptr);
+ IR_ValueBoxDef_var (IR_ValueBoxDef_ptr p) : ptr_ (p) {}
IR_ValueBoxDef_var (const IR_ValueBoxDef_var &); // copy constructor
~IR_ValueBoxDef_var (void); // destructor
-
+
IR_ValueBoxDef_var &operator= (IR_ValueBoxDef_ptr);
IR_ValueBoxDef_var &operator= (const IR_ValueBoxDef_var &);
IR_ValueBoxDef_ptr operator-> (void) const;
-
+
operator const IR_ValueBoxDef_ptr &() const;
operator IR_ValueBoxDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ValueBoxDef_ptr in (void) const;
IR_ValueBoxDef_ptr &inout (void);
IR_ValueBoxDef_ptr &out (void);
@@ -1497,7 +1803,7 @@ public:
operator IR_ValueBoxDef_ptr &();
IR_ValueBoxDef_ptr &ptr (void);
IR_ValueBoxDef_ptr operator-> (void);
-
+
private:
IR_ValueBoxDef_ptr &ptr_;
};
@@ -1506,17 +1812,17 @@ class TAO_Export IR_ComponentDef_var : public TAO_Base_var
{
public:
IR_ComponentDef_var (void); // default constructor
- IR_ComponentDef_var (IR_ComponentDef_ptr);
+ IR_ComponentDef_var (IR_ComponentDef_ptr p) : ptr_ (p) {}
IR_ComponentDef_var (const IR_ComponentDef_var &); // copy constructor
~IR_ComponentDef_var (void); // destructor
-
+
IR_ComponentDef_var &operator= (IR_ComponentDef_ptr);
IR_ComponentDef_var &operator= (const IR_ComponentDef_var &);
IR_ComponentDef_ptr operator-> (void) const;
-
+
operator const IR_ComponentDef_ptr &() const;
operator IR_ComponentDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ComponentDef_ptr in (void) const;
IR_ComponentDef_ptr &inout (void);
IR_ComponentDef_ptr &out (void);
@@ -1542,18 +1848,18 @@ public:
operator IR_ComponentDef_ptr &();
IR_ComponentDef_ptr &ptr (void);
IR_ComponentDef_ptr operator-> (void);
-
+
private:
IR_ComponentDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
@@ -1575,34 +1881,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ComponentDefSeq
// *************************************************************
-class TAO_Export IR_ComponentDefSeq : public
+class TAO_Export IR_ComponentDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ComponentDefSeq (void); // default ctor
IR_ComponentDefSeq (CORBA::ULong max); // uses max size
IR_ComponentDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ComponentDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ComponentDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_ComponentDefSeq (const IR_ComponentDefSeq &); // copy ctor
~IR_ComponentDefSeq (void);
@@ -1625,19 +1931,20 @@ public:
IR_ComponentDefSeq_var (IR_ComponentDefSeq *);
IR_ComponentDefSeq_var (const IR_ComponentDefSeq_var &); // copy constructor
~IR_ComponentDefSeq_var (void); // destructor
-
+
IR_ComponentDefSeq_var &operator= (IR_ComponentDefSeq *);
IR_ComponentDefSeq_var &operator= (const IR_ComponentDefSeq_var &);
IR_ComponentDefSeq *operator-> (void);
const IR_ComponentDefSeq *operator-> (void) const;
-
+
operator const IR_ComponentDefSeq &() const;
operator IR_ComponentDefSeq &();
operator IR_ComponentDefSeq &() const;
operator IR_ComponentDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ComponentDefSeq &in (void) const;
IR_ComponentDefSeq &inout (void);
IR_ComponentDefSeq *&out (void);
@@ -1660,7 +1967,7 @@ public:
IR_ComponentDefSeq *&ptr (void);
IR_ComponentDefSeq *operator-> (void);
TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_ComponentDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -1671,17 +1978,17 @@ class TAO_Export IR_ProvidesDef_var : public TAO_Base_var
{
public:
IR_ProvidesDef_var (void); // default constructor
- IR_ProvidesDef_var (IR_ProvidesDef_ptr);
+ IR_ProvidesDef_var (IR_ProvidesDef_ptr p) : ptr_ (p) {}
IR_ProvidesDef_var (const IR_ProvidesDef_var &); // copy constructor
~IR_ProvidesDef_var (void); // destructor
-
+
IR_ProvidesDef_var &operator= (IR_ProvidesDef_ptr);
IR_ProvidesDef_var &operator= (const IR_ProvidesDef_var &);
IR_ProvidesDef_ptr operator-> (void) const;
-
+
operator const IR_ProvidesDef_ptr &() const;
operator IR_ProvidesDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ProvidesDef_ptr in (void) const;
IR_ProvidesDef_ptr &inout (void);
IR_ProvidesDef_ptr &out (void);
@@ -1707,18 +2014,18 @@ public:
operator IR_ProvidesDef_ptr &();
IR_ProvidesDef_ptr &ptr (void);
IR_ProvidesDef_ptr operator-> (void);
-
+
private:
IR_ProvidesDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
@@ -1740,34 +2047,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ProvidesDefSeq
// *************************************************************
-class TAO_Export IR_ProvidesDefSeq : public
+class TAO_Export IR_ProvidesDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ProvidesDefSeq (void); // default ctor
IR_ProvidesDefSeq (CORBA::ULong max); // uses max size
IR_ProvidesDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ProvidesDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ProvidesDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_ProvidesDefSeq (const IR_ProvidesDefSeq &); // copy ctor
~IR_ProvidesDefSeq (void);
@@ -1790,19 +2097,20 @@ public:
IR_ProvidesDefSeq_var (IR_ProvidesDefSeq *);
IR_ProvidesDefSeq_var (const IR_ProvidesDefSeq_var &); // copy constructor
~IR_ProvidesDefSeq_var (void); // destructor
-
+
IR_ProvidesDefSeq_var &operator= (IR_ProvidesDefSeq *);
IR_ProvidesDefSeq_var &operator= (const IR_ProvidesDefSeq_var &);
IR_ProvidesDefSeq *operator-> (void);
const IR_ProvidesDefSeq *operator-> (void) const;
-
+
operator const IR_ProvidesDefSeq &() const;
operator IR_ProvidesDefSeq &();
operator IR_ProvidesDefSeq &() const;
operator IR_ProvidesDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ProvidesDefSeq &in (void) const;
IR_ProvidesDefSeq &inout (void);
IR_ProvidesDefSeq *&out (void);
@@ -1825,7 +2133,7 @@ public:
IR_ProvidesDefSeq *&ptr (void);
IR_ProvidesDefSeq *operator-> (void);
TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_ProvidesDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -1836,17 +2144,17 @@ class TAO_Export IR_UsesDef_var : public TAO_Base_var
{
public:
IR_UsesDef_var (void); // default constructor
- IR_UsesDef_var (IR_UsesDef_ptr);
+ IR_UsesDef_var (IR_UsesDef_ptr p) : ptr_ (p) {}
IR_UsesDef_var (const IR_UsesDef_var &); // copy constructor
~IR_UsesDef_var (void); // destructor
-
+
IR_UsesDef_var &operator= (IR_UsesDef_ptr);
IR_UsesDef_var &operator= (const IR_UsesDef_var &);
IR_UsesDef_ptr operator-> (void) const;
-
+
operator const IR_UsesDef_ptr &() const;
operator IR_UsesDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_UsesDef_ptr in (void) const;
IR_UsesDef_ptr &inout (void);
IR_UsesDef_ptr &out (void);
@@ -1872,18 +2180,18 @@ public:
operator IR_UsesDef_ptr &();
IR_UsesDef_ptr &ptr (void);
IR_UsesDef_ptr operator-> (void);
-
+
private:
IR_UsesDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
@@ -1905,34 +2213,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_UsesDefSeq
// *************************************************************
-class TAO_Export IR_UsesDefSeq : public
+class TAO_Export IR_UsesDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_UsesDefSeq (void); // default ctor
IR_UsesDefSeq (CORBA::ULong max); // uses max size
IR_UsesDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_UsesDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_UsesDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_UsesDefSeq (const IR_UsesDefSeq &); // copy ctor
~IR_UsesDefSeq (void);
@@ -1955,19 +2263,20 @@ public:
IR_UsesDefSeq_var (IR_UsesDefSeq *);
IR_UsesDefSeq_var (const IR_UsesDefSeq_var &); // copy constructor
~IR_UsesDefSeq_var (void); // destructor
-
+
IR_UsesDefSeq_var &operator= (IR_UsesDefSeq *);
IR_UsesDefSeq_var &operator= (const IR_UsesDefSeq_var &);
IR_UsesDefSeq *operator-> (void);
const IR_UsesDefSeq *operator-> (void) const;
-
+
operator const IR_UsesDefSeq &() const;
operator IR_UsesDefSeq &();
operator IR_UsesDefSeq &() const;
operator IR_UsesDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_UsesDefSeq &in (void) const;
IR_UsesDefSeq &inout (void);
IR_UsesDefSeq *&out (void);
@@ -1990,7 +2299,7 @@ public:
IR_UsesDefSeq *&ptr (void);
IR_UsesDefSeq *operator-> (void);
TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_UsesDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -2001,17 +2310,17 @@ class TAO_Export IR_HomeDef_var : public TAO_Base_var
{
public:
IR_HomeDef_var (void); // default constructor
- IR_HomeDef_var (IR_HomeDef_ptr);
+ IR_HomeDef_var (IR_HomeDef_ptr p) : ptr_ (p) {}
IR_HomeDef_var (const IR_HomeDef_var &); // copy constructor
~IR_HomeDef_var (void); // destructor
-
+
IR_HomeDef_var &operator= (IR_HomeDef_ptr);
IR_HomeDef_var &operator= (const IR_HomeDef_var &);
IR_HomeDef_ptr operator-> (void) const;
-
+
operator const IR_HomeDef_ptr &() const;
operator IR_HomeDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_HomeDef_ptr in (void) const;
IR_HomeDef_ptr &inout (void);
IR_HomeDef_ptr &out (void);
@@ -2037,18 +2346,19 @@ public:
operator IR_HomeDef_ptr &();
IR_HomeDef_ptr &ptr (void);
IR_HomeDef_ptr operator-> (void);
-
+
private:
IR_HomeDef_ptr &ptr_;
};
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
class _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
@@ -2070,34 +2380,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_HomeDefSeq
// *************************************************************
-class TAO_Export IR_HomeDefSeq : public
+class TAO_Export IR_HomeDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_HomeDefSeq (void); // default ctor
IR_HomeDefSeq (CORBA::ULong max); // uses max size
IR_HomeDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_HomeDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_HomeDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_HomeDefSeq (const IR_HomeDefSeq &); // copy ctor
~IR_HomeDefSeq (void);
@@ -2120,19 +2430,20 @@ public:
IR_HomeDefSeq_var (IR_HomeDefSeq *);
IR_HomeDefSeq_var (const IR_HomeDefSeq_var &); // copy constructor
~IR_HomeDefSeq_var (void); // destructor
-
+
IR_HomeDefSeq_var &operator= (IR_HomeDefSeq *);
IR_HomeDefSeq_var &operator= (const IR_HomeDefSeq_var &);
IR_HomeDefSeq *operator-> (void);
const IR_HomeDefSeq *operator-> (void) const;
-
+
operator const IR_HomeDefSeq &() const;
operator IR_HomeDefSeq &();
operator IR_HomeDefSeq &() const;
operator IR_HomeDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_HomeDefSeq &in (void) const;
IR_HomeDefSeq &inout (void);
IR_HomeDefSeq *&out (void);
@@ -2155,7 +2466,7 @@ public:
IR_HomeDefSeq *&ptr (void);
IR_HomeDefSeq *operator-> (void);
TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_HomeDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -2166,17 +2477,17 @@ class TAO_Export IR_EventDef_var : public TAO_Base_var
{
public:
IR_EventDef_var (void); // default constructor
- IR_EventDef_var (IR_EventDef_ptr);
+ IR_EventDef_var (IR_EventDef_ptr p) : ptr_ (p) {}
IR_EventDef_var (const IR_EventDef_var &); // copy constructor
~IR_EventDef_var (void); // destructor
-
+
IR_EventDef_var &operator= (IR_EventDef_ptr);
IR_EventDef_var &operator= (const IR_EventDef_var &);
IR_EventDef_ptr operator-> (void) const;
-
+
operator const IR_EventDef_ptr &() const;
operator IR_EventDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_EventDef_ptr in (void) const;
IR_EventDef_ptr &inout (void);
IR_EventDef_ptr &out (void);
@@ -2202,7 +2513,7 @@ public:
operator IR_EventDef_ptr &();
IR_EventDef_ptr &ptr (void);
IR_EventDef_ptr operator-> (void);
-
+
private:
IR_EventDef_ptr &ptr_;
};
@@ -2211,17 +2522,17 @@ class TAO_Export IR_EmitsDef_var : public TAO_Base_var
{
public:
IR_EmitsDef_var (void); // default constructor
- IR_EmitsDef_var (IR_EmitsDef_ptr);
+ IR_EmitsDef_var (IR_EmitsDef_ptr p) : ptr_ (p) {}
IR_EmitsDef_var (const IR_EmitsDef_var &); // copy constructor
~IR_EmitsDef_var (void); // destructor
-
+
IR_EmitsDef_var &operator= (IR_EmitsDef_ptr);
IR_EmitsDef_var &operator= (const IR_EmitsDef_var &);
IR_EmitsDef_ptr operator-> (void) const;
-
+
operator const IR_EmitsDef_ptr &() const;
operator IR_EmitsDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_EmitsDef_ptr in (void) const;
IR_EmitsDef_ptr &inout (void);
IR_EmitsDef_ptr &out (void);
@@ -2247,18 +2558,18 @@ public:
operator IR_EmitsDef_ptr &();
IR_EmitsDef_ptr &ptr (void);
IR_EmitsDef_ptr operator-> (void);
-
+
private:
IR_EmitsDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
@@ -2280,34 +2591,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_EmitsDefSeq
// *************************************************************
-class TAO_Export IR_EmitsDefSeq : public
+class TAO_Export IR_EmitsDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_EmitsDefSeq (void); // default ctor
IR_EmitsDefSeq (CORBA::ULong max); // uses max size
IR_EmitsDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_EmitsDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_EmitsDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_EmitsDefSeq (const IR_EmitsDefSeq &); // copy ctor
~IR_EmitsDefSeq (void);
@@ -2330,19 +2641,20 @@ public:
IR_EmitsDefSeq_var (IR_EmitsDefSeq *);
IR_EmitsDefSeq_var (const IR_EmitsDefSeq_var &); // copy constructor
~IR_EmitsDefSeq_var (void); // destructor
-
+
IR_EmitsDefSeq_var &operator= (IR_EmitsDefSeq *);
IR_EmitsDefSeq_var &operator= (const IR_EmitsDefSeq_var &);
IR_EmitsDefSeq *operator-> (void);
const IR_EmitsDefSeq *operator-> (void) const;
-
+
operator const IR_EmitsDefSeq &() const;
operator IR_EmitsDefSeq &();
operator IR_EmitsDefSeq &() const;
operator IR_EmitsDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_EmitsDefSeq &in (void) const;
IR_EmitsDefSeq &inout (void);
IR_EmitsDefSeq *&out (void);
@@ -2365,7 +2677,7 @@ public:
IR_EmitsDefSeq *&ptr (void);
IR_EmitsDefSeq *operator-> (void);
TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_EmitsDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -2376,17 +2688,17 @@ class TAO_Export IR_PublishesDef_var : public TAO_Base_var
{
public:
IR_PublishesDef_var (void); // default constructor
- IR_PublishesDef_var (IR_PublishesDef_ptr);
+ IR_PublishesDef_var (IR_PublishesDef_ptr p) : ptr_ (p) {}
IR_PublishesDef_var (const IR_PublishesDef_var &); // copy constructor
~IR_PublishesDef_var (void); // destructor
-
+
IR_PublishesDef_var &operator= (IR_PublishesDef_ptr);
IR_PublishesDef_var &operator= (const IR_PublishesDef_var &);
IR_PublishesDef_ptr operator-> (void) const;
-
+
operator const IR_PublishesDef_ptr &() const;
operator IR_PublishesDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_PublishesDef_ptr in (void) const;
IR_PublishesDef_ptr &inout (void);
IR_PublishesDef_ptr &out (void);
@@ -2412,18 +2724,18 @@ public:
operator IR_PublishesDef_ptr &();
IR_PublishesDef_ptr &ptr (void);
IR_PublishesDef_ptr operator-> (void);
-
+
private:
IR_PublishesDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
@@ -2445,34 +2757,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_PublishesDefSeq
// *************************************************************
-class TAO_Export IR_PublishesDefSeq : public
+class TAO_Export IR_PublishesDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_PublishesDefSeq (void); // default ctor
IR_PublishesDefSeq (CORBA::ULong max); // uses max size
IR_PublishesDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_PublishesDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_PublishesDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_PublishesDefSeq (const IR_PublishesDefSeq &); // copy ctor
~IR_PublishesDefSeq (void);
@@ -2495,19 +2807,20 @@ public:
IR_PublishesDefSeq_var (IR_PublishesDefSeq *);
IR_PublishesDefSeq_var (const IR_PublishesDefSeq_var &); // copy constructor
~IR_PublishesDefSeq_var (void); // destructor
-
+
IR_PublishesDefSeq_var &operator= (IR_PublishesDefSeq *);
IR_PublishesDefSeq_var &operator= (const IR_PublishesDefSeq_var &);
IR_PublishesDefSeq *operator-> (void);
const IR_PublishesDefSeq *operator-> (void) const;
-
+
operator const IR_PublishesDefSeq &() const;
operator IR_PublishesDefSeq &();
operator IR_PublishesDefSeq &() const;
operator IR_PublishesDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_PublishesDefSeq &in (void) const;
IR_PublishesDefSeq &inout (void);
IR_PublishesDefSeq *&out (void);
@@ -2530,7 +2843,7 @@ public:
IR_PublishesDefSeq *&ptr (void);
IR_PublishesDefSeq *operator-> (void);
TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_PublishesDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -2541,17 +2854,17 @@ class TAO_Export IR_ConsumesDef_var : public TAO_Base_var
{
public:
IR_ConsumesDef_var (void); // default constructor
- IR_ConsumesDef_var (IR_ConsumesDef_ptr);
+ IR_ConsumesDef_var (IR_ConsumesDef_ptr p) : ptr_ (p) {}
IR_ConsumesDef_var (const IR_ConsumesDef_var &); // copy constructor
~IR_ConsumesDef_var (void); // destructor
-
+
IR_ConsumesDef_var &operator= (IR_ConsumesDef_ptr);
IR_ConsumesDef_var &operator= (const IR_ConsumesDef_var &);
IR_ConsumesDef_ptr operator-> (void) const;
-
+
operator const IR_ConsumesDef_ptr &() const;
operator IR_ConsumesDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ConsumesDef_ptr in (void) const;
IR_ConsumesDef_ptr &inout (void);
IR_ConsumesDef_ptr &out (void);
@@ -2577,18 +2890,18 @@ public:
operator IR_ConsumesDef_ptr &();
IR_ConsumesDef_ptr &ptr (void);
IR_ConsumesDef_ptr operator-> (void);
-
+
private:
IR_ConsumesDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
@@ -2610,34 +2923,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ConsumesDefSeq
// *************************************************************
-class TAO_Export IR_ConsumesDefSeq : public
+class TAO_Export IR_ConsumesDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ConsumesDefSeq (void); // default ctor
IR_ConsumesDefSeq (CORBA::ULong max); // uses max size
IR_ConsumesDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ConsumesDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ConsumesDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_ConsumesDefSeq (const IR_ConsumesDefSeq &); // copy ctor
~IR_ConsumesDefSeq (void);
@@ -2660,19 +2973,20 @@ public:
IR_ConsumesDefSeq_var (IR_ConsumesDefSeq *);
IR_ConsumesDefSeq_var (const IR_ConsumesDefSeq_var &); // copy constructor
~IR_ConsumesDefSeq_var (void); // destructor
-
+
IR_ConsumesDefSeq_var &operator= (IR_ConsumesDefSeq *);
IR_ConsumesDefSeq_var &operator= (const IR_ConsumesDefSeq_var &);
IR_ConsumesDefSeq *operator-> (void);
const IR_ConsumesDefSeq *operator-> (void) const;
-
+
operator const IR_ConsumesDefSeq &() const;
operator IR_ConsumesDefSeq &();
operator IR_ConsumesDefSeq &() const;
operator IR_ConsumesDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ConsumesDefSeq &in (void) const;
IR_ConsumesDefSeq &inout (void);
IR_ConsumesDefSeq *&out (void);
@@ -2695,7 +3009,7 @@ public:
IR_ConsumesDefSeq *&ptr (void);
IR_ConsumesDefSeq *operator-> (void);
TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_ConsumesDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -2706,17 +3020,17 @@ class TAO_Export IR_FactoryDef_var : public TAO_Base_var
{
public:
IR_FactoryDef_var (void); // default constructor
- IR_FactoryDef_var (IR_FactoryDef_ptr);
+ IR_FactoryDef_var (IR_FactoryDef_ptr p) : ptr_ (p) {}
IR_FactoryDef_var (const IR_FactoryDef_var &); // copy constructor
~IR_FactoryDef_var (void); // destructor
-
+
IR_FactoryDef_var &operator= (IR_FactoryDef_ptr);
IR_FactoryDef_var &operator= (const IR_FactoryDef_var &);
IR_FactoryDef_ptr operator-> (void) const;
-
+
operator const IR_FactoryDef_ptr &() const;
operator IR_FactoryDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_FactoryDef_ptr in (void) const;
IR_FactoryDef_ptr &inout (void);
IR_FactoryDef_ptr &out (void);
@@ -2742,18 +3056,18 @@ public:
operator IR_FactoryDef_ptr &();
IR_FactoryDef_ptr &ptr (void);
IR_FactoryDef_ptr operator-> (void);
-
+
private:
IR_FactoryDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
@@ -2775,34 +3089,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_FactoryDefSeq
// *************************************************************
-class TAO_Export IR_FactoryDefSeq : public
+class TAO_Export IR_FactoryDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_FactoryDefSeq (void); // default ctor
IR_FactoryDefSeq (CORBA::ULong max); // uses max size
IR_FactoryDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_FactoryDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_FactoryDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_FactoryDefSeq (const IR_FactoryDefSeq &); // copy ctor
~IR_FactoryDefSeq (void);
@@ -2825,19 +3139,20 @@ public:
IR_FactoryDefSeq_var (IR_FactoryDefSeq *);
IR_FactoryDefSeq_var (const IR_FactoryDefSeq_var &); // copy constructor
~IR_FactoryDefSeq_var (void); // destructor
-
+
IR_FactoryDefSeq_var &operator= (IR_FactoryDefSeq *);
IR_FactoryDefSeq_var &operator= (const IR_FactoryDefSeq_var &);
IR_FactoryDefSeq *operator-> (void);
const IR_FactoryDefSeq *operator-> (void) const;
-
+
operator const IR_FactoryDefSeq &() const;
operator IR_FactoryDefSeq &();
operator IR_FactoryDefSeq &() const;
operator IR_FactoryDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_FactoryDefSeq &in (void) const;
IR_FactoryDefSeq &inout (void);
IR_FactoryDefSeq *&out (void);
@@ -2860,7 +3175,7 @@ public:
IR_FactoryDefSeq *&ptr (void);
IR_FactoryDefSeq *operator-> (void);
TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_FactoryDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -2871,17 +3186,17 @@ class TAO_Export IR_FinderDef_var : public TAO_Base_var
{
public:
IR_FinderDef_var (void); // default constructor
- IR_FinderDef_var (IR_FinderDef_ptr);
+ IR_FinderDef_var (IR_FinderDef_ptr p) : ptr_ (p) {}
IR_FinderDef_var (const IR_FinderDef_var &); // copy constructor
~IR_FinderDef_var (void); // destructor
-
+
IR_FinderDef_var &operator= (IR_FinderDef_ptr);
IR_FinderDef_var &operator= (const IR_FinderDef_var &);
IR_FinderDef_ptr operator-> (void) const;
-
+
operator const IR_FinderDef_ptr &() const;
operator IR_FinderDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_FinderDef_ptr in (void) const;
IR_FinderDef_ptr &inout (void);
IR_FinderDef_ptr &out (void);
@@ -2907,18 +3222,18 @@ public:
operator IR_FinderDef_ptr &();
IR_FinderDef_ptr &ptr (void);
IR_FinderDef_ptr operator-> (void);
-
+
private:
IR_FinderDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
@@ -2940,34 +3255,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_FinderDefSeq
// *************************************************************
-class TAO_Export IR_FinderDefSeq : public
+class TAO_Export IR_FinderDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_FinderDefSeq (void); // default ctor
IR_FinderDefSeq (CORBA::ULong max); // uses max size
IR_FinderDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_FinderDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_FinderDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_FinderDefSeq (const IR_FinderDefSeq &); // copy ctor
~IR_FinderDefSeq (void);
@@ -2990,19 +3305,20 @@ public:
IR_FinderDefSeq_var (IR_FinderDefSeq *);
IR_FinderDefSeq_var (const IR_FinderDefSeq_var &); // copy constructor
~IR_FinderDefSeq_var (void); // destructor
-
+
IR_FinderDefSeq_var &operator= (IR_FinderDefSeq *);
IR_FinderDefSeq_var &operator= (const IR_FinderDefSeq_var &);
IR_FinderDefSeq *operator-> (void);
const IR_FinderDefSeq *operator-> (void) const;
-
+
operator const IR_FinderDefSeq &() const;
operator IR_FinderDefSeq &();
operator IR_FinderDefSeq &() const;
operator IR_FinderDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_FinderDefSeq &in (void) const;
IR_FinderDefSeq &inout (void);
IR_FinderDefSeq *&out (void);
@@ -3025,7 +3341,7 @@ public:
IR_FinderDefSeq *&ptr (void);
IR_FinderDefSeq *operator-> (void);
TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_FinderDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -3036,17 +3352,17 @@ class TAO_Export IR_PrimaryKeyDef_var : public TAO_Base_var
{
public:
IR_PrimaryKeyDef_var (void); // default constructor
- IR_PrimaryKeyDef_var (IR_PrimaryKeyDef_ptr);
+ IR_PrimaryKeyDef_var (IR_PrimaryKeyDef_ptr p) : ptr_ (p) {}
IR_PrimaryKeyDef_var (const IR_PrimaryKeyDef_var &); // copy constructor
~IR_PrimaryKeyDef_var (void); // destructor
-
+
IR_PrimaryKeyDef_var &operator= (IR_PrimaryKeyDef_ptr);
IR_PrimaryKeyDef_var &operator= (const IR_PrimaryKeyDef_var &);
IR_PrimaryKeyDef_ptr operator-> (void) const;
-
+
operator const IR_PrimaryKeyDef_ptr &() const;
operator IR_PrimaryKeyDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_PrimaryKeyDef_ptr in (void) const;
IR_PrimaryKeyDef_ptr &inout (void);
IR_PrimaryKeyDef_ptr &out (void);
@@ -3072,18 +3388,18 @@ public:
operator IR_PrimaryKeyDef_ptr &();
IR_PrimaryKeyDef_ptr &ptr (void);
IR_PrimaryKeyDef_ptr operator-> (void);
-
+
private:
IR_PrimaryKeyDef_ptr &ptr_;
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_ContainedSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void);
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
@@ -3105,34 +3421,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ContainedSeq
// *************************************************************
-class TAO_Export IR_ContainedSeq : public
+class TAO_Export IR_ContainedSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ContainedSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ContainedSeq (void); // default ctor
IR_ContainedSeq (CORBA::ULong max); // uses max size
IR_ContainedSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_Contained_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_Contained_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_ContainedSeq (const IR_ContainedSeq &); // copy ctor
~IR_ContainedSeq (void);
@@ -3145,7 +3461,7 @@ public:
};
// *************************************************************
-// class IR::IR_ContainedSeq_var
+// class IR_ContainedSeq_var
// *************************************************************
class TAO_Export IR_ContainedSeq_var
@@ -3155,19 +3471,20 @@ public:
IR_ContainedSeq_var (IR_ContainedSeq *);
IR_ContainedSeq_var (const IR_ContainedSeq_var &); // copy constructor
~IR_ContainedSeq_var (void); // destructor
-
+
IR_ContainedSeq_var &operator= (IR_ContainedSeq *);
IR_ContainedSeq_var &operator= (const IR_ContainedSeq_var &);
IR_ContainedSeq *operator-> (void);
const IR_ContainedSeq *operator-> (void) const;
-
+
operator const IR_ContainedSeq &() const;
operator IR_ContainedSeq &();
operator IR_ContainedSeq &() const;
operator IR_ContainedSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_Contained, IR_Contained_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ContainedSeq &in (void) const;
IR_ContainedSeq &inout (void);
IR_ContainedSeq *&out (void);
@@ -3178,6 +3495,7 @@ private:
IR_ContainedSeq *ptr_;
};
+
class TAO_Export IR_ContainedSeq_out
{
public:
@@ -3190,7 +3508,7 @@ public:
IR_ContainedSeq *&ptr (void);
IR_ContainedSeq *operator-> (void);
TAO_Object_Manager<IR_Contained, IR_Contained_var> operator[] (CORBA::ULong index);
-
+
private:
IR_ContainedSeq *&ptr_;
// assignment from T_var not allowed
@@ -3218,18 +3536,18 @@ public:
IR_StructMember_var (IR_StructMember *);
IR_StructMember_var (const IR_StructMember_var &); // copy constructor
~IR_StructMember_var (void); // destructor
-
+
IR_StructMember_var &operator= (IR_StructMember *);
IR_StructMember_var &operator= (const IR_StructMember_var &);
IR_StructMember *operator-> (void);
const IR_StructMember *operator-> (void) const;
-
+
operator const IR_StructMember &() const;
operator IR_StructMember &();
operator IR_StructMember &() const;
operator IR_StructMember *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_StructMember &in (void) const;
IR_StructMember &inout (void);
IR_StructMember *&out (void);
@@ -3251,7 +3569,7 @@ public:
operator IR_StructMember *&();
IR_StructMember *&ptr (void);
IR_StructMember *operator-> (void);
-
+
private:
IR_StructMember *&ptr_;
// assignment from T_var not allowed
@@ -3259,14 +3577,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_StructMemberSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_StructMemberSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_StructMember *data,
@@ -3283,7 +3601,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_StructMember *get_buffer (CORBA::Boolean orphan = 0);
const IR_StructMember *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -3292,27 +3610,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_StructMemberSeq
// *************************************************************
-class TAO_Export IR_StructMemberSeq : public
+class TAO_Export IR_StructMemberSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_StructMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_StructMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_StructMemberSeq (void); // default ctor
IR_StructMemberSeq (CORBA::ULong max); // uses max size
IR_StructMemberSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_StructMember *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_StructMember *buffer,
+ CORBA::Boolean release = 0
);
IR_StructMemberSeq (const IR_StructMemberSeq &); // copy ctor
~IR_StructMemberSeq (void);
@@ -3335,19 +3653,21 @@ public:
IR_StructMemberSeq_var (IR_StructMemberSeq *);
IR_StructMemberSeq_var (const IR_StructMemberSeq_var &); // copy constructor
~IR_StructMemberSeq_var (void); // destructor
-
+
IR_StructMemberSeq_var &operator= (IR_StructMemberSeq *);
IR_StructMemberSeq_var &operator= (const IR_StructMemberSeq_var &);
IR_StructMemberSeq *operator-> (void);
const IR_StructMemberSeq *operator-> (void) const;
-
+
operator const IR_StructMemberSeq &() const;
operator IR_StructMemberSeq &();
operator IR_StructMemberSeq &() const;
operator IR_StructMemberSeq *&(); // variable-size base types only
-
- IR_StructMember &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_StructMember & operator[] (CORBA::ULong index);
+ const IR_StructMember & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_StructMemberSeq &in (void) const;
IR_StructMemberSeq &inout (void);
IR_StructMemberSeq *&out (void);
@@ -3369,8 +3689,8 @@ public:
operator IR_StructMemberSeq *&();
IR_StructMemberSeq *&ptr (void);
IR_StructMemberSeq *operator-> (void);
- IR_StructMember &operator[] (CORBA::ULong index);
-
+ IR_StructMember & operator[] (CORBA::ULong index);
+
private:
IR_StructMemberSeq *&ptr_;
// assignment from T_var not allowed
@@ -3397,18 +3717,18 @@ public:
IR_Initializer_var (IR_Initializer *);
IR_Initializer_var (const IR_Initializer_var &); // copy constructor
~IR_Initializer_var (void); // destructor
-
+
IR_Initializer_var &operator= (IR_Initializer *);
IR_Initializer_var &operator= (const IR_Initializer_var &);
IR_Initializer *operator-> (void);
const IR_Initializer *operator-> (void) const;
-
+
operator const IR_Initializer &() const;
operator IR_Initializer &();
operator IR_Initializer &() const;
operator IR_Initializer *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_Initializer &in (void) const;
IR_Initializer &inout (void);
IR_Initializer *&out (void);
@@ -3430,7 +3750,7 @@ public:
operator IR_Initializer *&();
IR_Initializer *&ptr (void);
IR_Initializer *operator-> (void);
-
+
private:
IR_Initializer *&ptr_;
// assignment from T_var not allowed
@@ -3438,14 +3758,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_InitializerSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_InitializerSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_Initializer *data,
@@ -3462,7 +3782,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_Initializer *get_buffer (CORBA::Boolean orphan = 0);
const IR_Initializer *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -3471,27 +3791,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_InitializerSeq
// *************************************************************
-class TAO_Export IR_InitializerSeq : public
+class TAO_Export IR_InitializerSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_InitializerSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_Initializer>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_InitializerSeq (void); // default ctor
IR_InitializerSeq (CORBA::ULong max); // uses max size
IR_InitializerSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_Initializer *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_Initializer *buffer,
+ CORBA::Boolean release = 0
);
IR_InitializerSeq (const IR_InitializerSeq &); // copy ctor
~IR_InitializerSeq (void);
@@ -3514,19 +3834,21 @@ public:
IR_InitializerSeq_var (IR_InitializerSeq *);
IR_InitializerSeq_var (const IR_InitializerSeq_var &); // copy constructor
~IR_InitializerSeq_var (void); // destructor
-
+
IR_InitializerSeq_var &operator= (IR_InitializerSeq *);
IR_InitializerSeq_var &operator= (const IR_InitializerSeq_var &);
IR_InitializerSeq *operator-> (void);
const IR_InitializerSeq *operator-> (void) const;
-
+
operator const IR_InitializerSeq &() const;
operator IR_InitializerSeq &();
operator IR_InitializerSeq &() const;
operator IR_InitializerSeq *&(); // variable-size base types only
-
- IR_Initializer &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_Initializer & operator[] (CORBA::ULong index);
+ const IR_Initializer & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_InitializerSeq &in (void) const;
IR_InitializerSeq &inout (void);
IR_InitializerSeq *&out (void);
@@ -3548,8 +3870,8 @@ public:
operator IR_InitializerSeq *&();
IR_InitializerSeq *&ptr (void);
IR_InitializerSeq *operator-> (void);
- IR_Initializer &operator[] (CORBA::ULong index);
-
+ IR_Initializer & operator[] (CORBA::ULong index);
+
private:
IR_InitializerSeq *&ptr_;
// assignment from T_var not allowed
@@ -3578,18 +3900,18 @@ public:
IR_UnionMember_var (IR_UnionMember *);
IR_UnionMember_var (const IR_UnionMember_var &); // copy constructor
~IR_UnionMember_var (void); // destructor
-
+
IR_UnionMember_var &operator= (IR_UnionMember *);
IR_UnionMember_var &operator= (const IR_UnionMember_var &);
IR_UnionMember *operator-> (void);
const IR_UnionMember *operator-> (void) const;
-
+
operator const IR_UnionMember &() const;
operator IR_UnionMember &();
operator IR_UnionMember &() const;
operator IR_UnionMember *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_UnionMember &in (void) const;
IR_UnionMember &inout (void);
IR_UnionMember *&out (void);
@@ -3611,7 +3933,7 @@ public:
operator IR_UnionMember *&();
IR_UnionMember *&ptr (void);
IR_UnionMember *operator-> (void);
-
+
private:
IR_UnionMember *&ptr_;
// assignment from T_var not allowed
@@ -3619,14 +3941,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UnionMemberSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_UnionMember *data,
@@ -3643,7 +3965,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_UnionMember *get_buffer (CORBA::Boolean orphan = 0);
const IR_UnionMember *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -3652,27 +3974,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_UnionMemberSeq
// *************************************************************
-class TAO_Export IR_UnionMemberSeq : public
+class TAO_Export IR_UnionMemberSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_UnionMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_UnionMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_UnionMemberSeq (void); // default ctor
IR_UnionMemberSeq (CORBA::ULong max); // uses max size
IR_UnionMemberSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_UnionMember *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_UnionMember *buffer,
+ CORBA::Boolean release = 0
);
IR_UnionMemberSeq (const IR_UnionMemberSeq &); // copy ctor
~IR_UnionMemberSeq (void);
@@ -3695,19 +4017,21 @@ public:
IR_UnionMemberSeq_var (IR_UnionMemberSeq *);
IR_UnionMemberSeq_var (const IR_UnionMemberSeq_var &); // copy constructor
~IR_UnionMemberSeq_var (void); // destructor
-
+
IR_UnionMemberSeq_var &operator= (IR_UnionMemberSeq *);
IR_UnionMemberSeq_var &operator= (const IR_UnionMemberSeq_var &);
IR_UnionMemberSeq *operator-> (void);
const IR_UnionMemberSeq *operator-> (void) const;
-
+
operator const IR_UnionMemberSeq &() const;
operator IR_UnionMemberSeq &();
operator IR_UnionMemberSeq &() const;
operator IR_UnionMemberSeq *&(); // variable-size base types only
-
- IR_UnionMember &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_UnionMember & operator[] (CORBA::ULong index);
+ const IR_UnionMember & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_UnionMemberSeq &in (void) const;
IR_UnionMemberSeq &inout (void);
IR_UnionMemberSeq *&out (void);
@@ -3729,8 +4053,8 @@ public:
operator IR_UnionMemberSeq *&();
IR_UnionMemberSeq *&ptr (void);
IR_UnionMemberSeq *operator-> (void);
- IR_UnionMember &operator[] (CORBA::ULong index);
-
+ IR_UnionMember & operator[] (CORBA::ULong index);
+
private:
IR_UnionMemberSeq *&ptr_;
// assignment from T_var not allowed
@@ -3741,21 +4065,21 @@ private:
// IR_EnumMemberSeq
// *************************************************************
-class TAO_Export IR_EnumMemberSeq : public
+class TAO_Export IR_EnumMemberSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_EnumMemberSeq (void); // default ctor
IR_EnumMemberSeq (CORBA::ULong max); // uses max size
IR_EnumMemberSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- char * *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
+ CORBA::Boolean release = 0
);
IR_EnumMemberSeq (const IR_EnumMemberSeq &); // copy ctor
~IR_EnumMemberSeq (void);
@@ -3778,19 +4102,20 @@ public:
IR_EnumMemberSeq_var (IR_EnumMemberSeq *);
IR_EnumMemberSeq_var (const IR_EnumMemberSeq_var &); // copy constructor
~IR_EnumMemberSeq_var (void); // destructor
-
+
IR_EnumMemberSeq_var &operator= (IR_EnumMemberSeq *);
IR_EnumMemberSeq_var &operator= (const IR_EnumMemberSeq_var &);
IR_EnumMemberSeq *operator-> (void);
const IR_EnumMemberSeq *operator-> (void) const;
-
+
operator const IR_EnumMemberSeq &() const;
operator IR_EnumMemberSeq &();
operator IR_EnumMemberSeq &() const;
operator IR_EnumMemberSeq *&(); // variable-size base types only
-
+
TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_EnumMemberSeq &in (void) const;
IR_EnumMemberSeq &inout (void);
IR_EnumMemberSeq *&out (void);
@@ -3813,13 +4138,19 @@ public:
IR_EnumMemberSeq *&ptr (void);
IR_EnumMemberSeq *operator-> (void);
TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
+
private:
IR_EnumMemberSeq *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_EnumMemberSeq_var &);
};
+// Forward Classes Declaration
+class _TAO_Container_Proxy_Impl;
+class _TAO_Container_Remote_Proxy_Impl;
+class _TAO_Container_Proxy_Broker;
+class _TAO_Container_Remote_Proxy_Broker;
+
class TAO_Export IR_Container: public virtual CORBA_IRObject
{
public:
@@ -3832,12 +4163,12 @@ public:
static IR_Container_ptr _duplicate (IR_Container_ptr obj);
static IR_Container_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_Container_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_Container_ptr _nil (void)
@@ -3849,7 +4180,7 @@ public:
virtual IR_Contained_ptr lookup (
const char * search_name,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3857,9 +4188,9 @@ public:
));
virtual IR_ContainedSeq * contents (
- IR::DefinitionKind limit_type,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3869,9 +4200,9 @@ public:
virtual IR_ContainedSeq * lookup_name (
const char * search_name,
CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -3880,7 +4211,7 @@ public:
struct Description;
class Description_var;
-
+
struct TAO_Export Description
{
@@ -3891,7 +4222,7 @@ public:
static void _tao_any_destructor (void*);
IR_Contained_var contained_object;
- IR::DefinitionKind kind;
+ IR_DefinitionKind kind;
CORBA::Any value;
};
@@ -3902,18 +4233,18 @@ public:
Description_var (Description *);
Description_var (const Description_var &); // copy constructor
~Description_var (void); // destructor
-
+
Description_var &operator= (Description *);
Description_var &operator= (const Description_var &);
Description *operator-> (void);
const Description *operator-> (void) const;
-
+
operator const Description &() const;
operator Description &();
operator Description &() const;
operator Description *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const Description &in (void) const;
Description &inout (void);
Description *&out (void);
@@ -3935,7 +4266,7 @@ public:
operator Description *&();
Description *&ptr (void);
Description *operator-> (void);
-
+
private:
Description *&ptr_;
// assignment from T_var not allowed
@@ -3946,14 +4277,14 @@ public:
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
Description *data,
@@ -3970,7 +4301,7 @@ public:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
Description *get_buffer (CORBA::Boolean orphan = 0);
const Description *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -3979,29 +4310,29 @@ public:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
class DescriptionSeq_var;
-
+
// *************************************************************
// DescriptionSeq
// *************************************************************
-
- class TAO_Export DescriptionSeq : public
+
+ class TAO_Export DescriptionSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<Description>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
DescriptionSeq (void); // default ctor
DescriptionSeq (CORBA::ULong max); // uses max size
DescriptionSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- Description *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ Description *buffer,
+ CORBA::Boolean release = 0
);
DescriptionSeq (const DescriptionSeq &); // copy ctor
~DescriptionSeq (void);
@@ -4012,417 +4343,604 @@ public:
#endif /* ! __GNUC__ || g++ >= 2.8 */
};
+
+ // *************************************************************
+ // class IR_Container::DescriptionSeq_var
+ // *************************************************************
-// *************************************************************
-// class IR_Container::DescriptionSeq_var
-// *************************************************************
+ class TAO_Export DescriptionSeq_var
+ {
+ public:
+ DescriptionSeq_var (void); // default constructor
+ DescriptionSeq_var (DescriptionSeq *);
+ DescriptionSeq_var (const DescriptionSeq_var &); // copy constructor
+ ~DescriptionSeq_var (void); // destructor
+
+ DescriptionSeq_var &operator= (DescriptionSeq *);
+ DescriptionSeq_var &operator= (const DescriptionSeq_var &);
+ DescriptionSeq *operator-> (void);
+ const DescriptionSeq *operator-> (void) const;
+
+ operator const DescriptionSeq &() const;
+ operator DescriptionSeq &();
+ operator DescriptionSeq &() const;
+ operator DescriptionSeq *&(); // variable-size base types only
+
+ Description & operator[] (CORBA::ULong index);
+ const Description & operator[] (CORBA::ULong index) const;
+ // in, inout, out, _retn
+ const DescriptionSeq &in (void) const;
+ DescriptionSeq &inout (void);
+ DescriptionSeq *&out (void);
+ DescriptionSeq *_retn (void);
+ DescriptionSeq *ptr (void) const;
-class TAO_Export DescriptionSeq_var
-{
-public:
- DescriptionSeq_var (void); // default constructor
- DescriptionSeq_var (DescriptionSeq *);
- DescriptionSeq_var (const DescriptionSeq_var &); // copy constructor
- ~DescriptionSeq_var (void); // destructor
+ private:
+ DescriptionSeq *ptr_;
+ };
- DescriptionSeq_var &operator= (DescriptionSeq *);
- DescriptionSeq_var &operator= (const DescriptionSeq_var &);
- DescriptionSeq *operator-> (void);
- const DescriptionSeq *operator-> (void) const;
+ class TAO_Export DescriptionSeq_out
+ {
+ public:
+ DescriptionSeq_out (DescriptionSeq *&);
+ DescriptionSeq_out (DescriptionSeq_var &);
+ DescriptionSeq_out (const DescriptionSeq_out &);
+ DescriptionSeq_out &operator= (const DescriptionSeq_out &);
+ DescriptionSeq_out &operator= (DescriptionSeq *);
+ operator DescriptionSeq *&();
+ DescriptionSeq *&ptr (void);
+ DescriptionSeq *operator-> (void);
+ Description & operator[] (CORBA::ULong index);
+
+ private:
+ DescriptionSeq *&ptr_;
+ // assignment from T_var not allowed
+ void operator= (const DescriptionSeq_var &);
+ };
- operator const DescriptionSeq &() const;
- operator DescriptionSeq &();
- operator DescriptionSeq &() const;
- operator DescriptionSeq *&(); // variable-size base types only
+ static CORBA::TypeCode_ptr _tc_DescriptionSeq;
- Description &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
- const DescriptionSeq &in (void) const;
- DescriptionSeq &inout (void);
- DescriptionSeq *&out (void);
- DescriptionSeq *_retn (void);
- DescriptionSeq *ptr (void) const;
+ virtual IR_Container::DescriptionSeq * describe_contents (
+ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
-private:
- DescriptionSeq *ptr_;
-};
+ virtual IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
-class TAO_Export DescriptionSeq_out
-{
-public:
- DescriptionSeq_out (DescriptionSeq *&);
- DescriptionSeq_out (DescriptionSeq_var &);
- DescriptionSeq_out (const DescriptionSeq_out &);
- DescriptionSeq_out &operator= (const DescriptionSeq_out &);
- DescriptionSeq_out &operator= (DescriptionSeq *);
- operator DescriptionSeq *&();
- DescriptionSeq *&ptr (void);
- DescriptionSeq *operator-> (void);
- Description &operator[] (CORBA::ULong index);
+ virtual IR_ConstantDef_ptr create_constant (
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
-private:
- DescriptionSeq *&ptr_;
- // assignment from T_var not allowed
- void operator= (const DescriptionSeq_var &);
-};
-
-static CORBA::TypeCode_ptr _tc_DescriptionSeq;
-
-virtual IR_Container::DescriptionSeq * describe_contents (
- IR::DefinitionKind limit_type,
- CORBA::Boolean exclude_inherited,
- CORBA::Long max_returned_objs,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_ModuleDef_ptr create_module (
- const char * id,
- const char * name,
- const char * version,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_ConstantDef_ptr create_constant (
- const char * id,
- const char * name,
- const char * version,
- IR_IDLType_ptr type,
- const CORBA::Any & value,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_StructDef_ptr create_struct (
- const char * id,
- const char * name,
- const char * version,
- const IR_StructMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_UnionDef_ptr create_union (
- const char * id,
- const char * name,
- const char * version,
- IR_IDLType_ptr discriminator_type,
- const IR_UnionMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_EnumDef_ptr create_enum (
- const char * id,
- const char * name,
- const char * version,
- const IR_EnumMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_AliasDef_ptr create_alias (
- const char * id,
- const char * name,
- const char * version,
- IR_IDLType_ptr original_type,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_InterfaceDef_ptr create_interface (
- const char * id,
- const char * name,
- const char * version,
- const IR_InterfaceDefSeq & base_interfaces,
- CORBA::Boolean is_abstract,
- CORBA::Boolean is_local,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_ValueDef_ptr create_value (
- const char * id,
- const char * name,
- const char * version,
- CORBA::Boolean is_custom,
- CORBA::Boolean is_abstract,
- IR_ValueDef_ptr base_value,
- CORBA::Boolean is_truncatable,
- const IR_ValueDefSeq & abstract_base_values,
- const IR_InterfaceDefSeq & supported_interfaces,
- const IR_InitializerSeq & initializers,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_ValueBoxDef_ptr create_value_box (
- const char * id,
- const char * name,
- const char * version,
- IR_IDLType_ptr original_type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_ExceptionDef_ptr create_exception (
- const char * id,
- const char * name,
- const char * version,
- const IR_StructMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual IR_NativeDef_ptr create_native (
- const char * id,
- const char * name,
- const char * version,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
- ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
-
-virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-virtual const char* _interface_repository_id (void) const;
-
-protected:
- IR_Container (void);
- IR_Container (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
+ virtual IR_StructDef_ptr create_struct (
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual IR_UnionDef_ptr create_union (
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr discriminator_type,
+ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual IR_EnumDef_ptr create_enum (
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual IR_AliasDef_ptr create_alias (
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual IR_InterfaceDef_ptr create_interface (
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual IR_ValueDef_ptr create_value (
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Boolean is_custom,
+ CORBA::Boolean is_abstract,
+ IR_ValueDef_ptr base_value,
+ CORBA::Boolean is_truncatable,
+ const IR_ValueDefSeq & abstract_base_values,
+ const IR_InterfaceDefSeq & supported_interfaces,
+ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual IR_ValueBoxDef_ptr create_value_box (
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual IR_ExceptionDef_ptr create_exception (
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+ virtual CORBA::Boolean _is_a (
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+ virtual const char* _interface_repository_id (void) const;
+
+private:
+ _TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
+
+protected:
+ IR_Container (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_Container (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_Container_Remote_Proxy_Impl;
+ friend class _TAO_Container_ThruPOA_Proxy_Impl;
+ friend class _TAO_Container_Direct_Proxy_Impl;
+
virtual ~IR_Container (void);
private:
IR_Container (const IR_Container &);
- void operator= (const IR_Container &);
+ void operator= (const IR_Container &);
};
-class TAO_IR_Container_Default_Proxy_Factory
-{
-public:
- TAO_IR_Container_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_Container_Default_Proxy_Factory (void);
- virtual IR_Container_ptr create_proxy (
- IR_Container_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_Container_Proxy_Factory_Adapter
+class TAO_Export _TAO_Container_Proxy_Impl :
+ public virtual _TAO_IRObject_Proxy_Impl
{
public:
+ virtual ~_TAO_Container_Proxy_Impl (void) { }
+
+ virtual IR_Contained_ptr lookup (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ContainedSeq * contents (
+ CORBA_Object *_collocated_tao_target_,
+ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_Container_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_ContainedSeq * lookup_name (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Long levels_to_search,
+ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_Container_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_Container::DescriptionSeq * describe_contents (
+ CORBA_Object *_collocated_tao_target_,
+ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_ModuleDef_ptr create_module (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_Container_ptr create_proxy (
- IR_Container_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_ConstantDef_ptr create_constant (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_StructDef_ptr create_struct (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_UnionDef_ptr create_union (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr discriminator_type,
+ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_EnumDef_ptr create_enum (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_AliasDef_ptr create_alias (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_InterfaceDef_ptr create_interface (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ValueDef_ptr create_value (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Boolean is_custom,
+ CORBA::Boolean is_abstract,
+ IR_ValueDef_ptr base_value,
+ CORBA::Boolean is_truncatable,
+ const IR_ValueDefSeq & abstract_base_values,
+ const IR_InterfaceDefSeq & supported_interfaces,
+ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ValueBoxDef_ptr create_value_box (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ExceptionDef_ptr create_exception (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_NativeDef_ptr create_native (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_Container_Proxy_Factory_Adapter (void);
- ~TAO_IR_Container_Proxy_Factory_Adapter (void);
- TAO_IR_Container_Proxy_Factory_Adapter &operator= (
- const TAO_IR_Container_Proxy_Factory_Adapter &
- );
- TAO_IR_Container_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_Container_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_Container_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_Container_PROXY_FACTORY_ADAPTER;
- class TAO_IR_Container_Smart_Proxy_Base : public virtual IR_Container
- {
- public:
- TAO_IR_Container_Smart_Proxy_Base (::IR_Container_ptr proxy);
- ~TAO_IR_Container_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_Contained_ptr lookup (
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_Container_Remote_Proxy_Impl :
+ public virtual _TAO_Container_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IRObject_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_Container_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_Container_Remote_Proxy_Impl (void) { }
+
+ virtual IR_Contained_ptr lookup (
+ CORBA_Object *_collocated_tao_target_,
const char * search_name,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ContainedSeq * contents (
- IR::DefinitionKind limit_type,
+ CORBA_Object *_collocated_tao_target_,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ContainedSeq * lookup_name (
+ CORBA_Object *_collocated_tao_target_,
const char * search_name,
CORBA::Long levels_to_search,
- IR::DefinitionKind limit_type,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_Container::DescriptionSeq * describe_contents (
- IR::DefinitionKind limit_type,
+ CORBA_Object *_collocated_tao_target_,
+ IR_DefinitionKind limit_type,
CORBA::Boolean exclude_inherited,
CORBA::Long max_returned_objs,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ModuleDef_ptr create_module (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ConstantDef_ptr create_constant (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr type,
const CORBA::Any & value,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_StructDef_ptr create_struct (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
const IR_StructMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_UnionDef_ptr create_union (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr discriminator_type,
const IR_UnionMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_EnumDef_ptr create_enum (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
const IR_EnumMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_AliasDef_ptr create_alias (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr original_type,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_InterfaceDef_ptr create_interface (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
const IR_InterfaceDefSeq & base_interfaces,
CORBA::Boolean is_abstract,
CORBA::Boolean is_local,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ValueDef_ptr create_value (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
@@ -4433,52 +4951,121 @@ protected:
const IR_ValueDefSeq & abstract_base_values,
const IR_InterfaceDefSeq & supported_interfaces,
const IR_InitializerSeq & initializers,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ValueBoxDef_ptr create_value_box (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr original_type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ExceptionDef_ptr create_exception (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
const IR_StructMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_NativeDef_ptr create_native (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_Container_Proxy_Broker
+{
+public:
+ virtual ~_TAO_Container_Proxy_Broker (void);
+
+ virtual _TAO_Container_Proxy_Impl &select_proxy (
+ IR_Container *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_Container_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_Container_Remote_Proxy_Broker : public virtual _TAO_Container_Proxy_Broker
+{
+public:
+ _TAO_Container_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_Container_Remote_Proxy_Broker (void);
+
+ virtual _TAO_Container_Proxy_Impl &select_proxy (
+ IR_Container *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
private:
- ::IR_Container_var base_proxy_;
+ _TAO_Container_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_IDLType_Proxy_Impl;
+class _TAO_IDLType_Remote_Proxy_Impl;
+class _TAO_IDLType_Proxy_Broker;
+class _TAO_IDLType_Remote_Proxy_Broker;
+
class TAO_Export IR_IDLType: public virtual CORBA_IRObject
{
public:
@@ -4491,12 +5078,12 @@ public:
static IR_IDLType_ptr _duplicate (IR_IDLType_ptr obj);
static IR_IDLType_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_IDLType_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_IDLType_ptr _nil (void)
@@ -4506,8 +5093,8 @@ public:
static void _tao_any_destructor (void*);
- virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual CORBA::TypeCode_ptr type (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4515,106 +5102,182 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_IDLType_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
+
protected:
- IR_IDLType (void);
- IR_IDLType (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_IDLType (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_IDLType (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_IDLType_Remote_Proxy_Impl;
+ friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
+ friend class _TAO_IDLType_Direct_Proxy_Impl;
+
virtual ~IR_IDLType (void);
private:
IR_IDLType (const IR_IDLType &);
- void operator= (const IR_IDLType &);
+ void operator= (const IR_IDLType &);
};
-class TAO_IR_IDLType_Default_Proxy_Factory
-{
-public:
- TAO_IR_IDLType_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_IDLType_Default_Proxy_Factory (void);
- virtual IR_IDLType_ptr create_proxy (
- IR_IDLType_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_IDLType_Proxy_Factory_Adapter
+class TAO_Export _TAO_IDLType_Proxy_Impl :
+ public virtual _TAO_IRObject_Proxy_Impl
{
public:
+ virtual ~_TAO_IDLType_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_IDLType_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+protected:
+ _TAO_IDLType_Proxy_Impl (void);
- int register_proxy_factory (
- TAO_IR_IDLType_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- IR_IDLType_ptr create_proxy (
- IR_IDLType_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-protected:
- TAO_IR_IDLType_Proxy_Factory_Adapter (void);
- ~TAO_IR_IDLType_Proxy_Factory_Adapter (void);
- TAO_IR_IDLType_Proxy_Factory_Adapter &operator= (
- const TAO_IR_IDLType_Proxy_Factory_Adapter &
- );
- TAO_IR_IDLType_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
- typedef TAO_Singleton<TAO_IR_IDLType_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_IDLType_PROXY_FACTORY_ADAPTER;
- class TAO_IR_IDLType_Smart_Proxy_Base : public virtual IR_IDLType
- {
- public:
- TAO_IR_IDLType_Smart_Proxy_Base (::IR_IDLType_ptr proxy);
- ~TAO_IR_IDLType_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+class TAO_Export _TAO_IDLType_Remote_Proxy_Impl :
+ public virtual _TAO_IDLType_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IRObject_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_IDLType_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_IDLType_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_IDLType_Proxy_Broker
+{
+public:
+ virtual ~_TAO_IDLType_Proxy_Broker (void);
+
+ virtual _TAO_IDLType_Proxy_Impl &select_proxy (
+ IR_IDLType *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_IDLType_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_IDLType_Remote_Proxy_Broker : public virtual _TAO_IDLType_Proxy_Broker
+{
+public:
+ _TAO_IDLType_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_IDLType_Remote_Proxy_Broker (void);
+
+ virtual _TAO_IDLType_Proxy_Impl &select_proxy (
+ IR_IDLType *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_IDLType_var base_proxy_;
+ _TAO_IDLType_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
class TAO_Export IR_PrimitiveDef_var : public TAO_Base_var
{
public:
IR_PrimitiveDef_var (void); // default constructor
- IR_PrimitiveDef_var (IR_PrimitiveDef_ptr);
+ IR_PrimitiveDef_var (IR_PrimitiveDef_ptr p) : ptr_ (p) {}
IR_PrimitiveDef_var (const IR_PrimitiveDef_var &); // copy constructor
~IR_PrimitiveDef_var (void); // destructor
-
+
IR_PrimitiveDef_var &operator= (IR_PrimitiveDef_ptr);
IR_PrimitiveDef_var &operator= (const IR_PrimitiveDef_var &);
IR_PrimitiveDef_ptr operator-> (void) const;
-
+
operator const IR_PrimitiveDef_ptr &() const;
operator IR_PrimitiveDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_PrimitiveDef_ptr in (void) const;
IR_PrimitiveDef_ptr &inout (void);
IR_PrimitiveDef_ptr &out (void);
@@ -4628,6 +5291,7 @@ private:
IR_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
};
+
class TAO_Export IR_PrimitiveDef_out
{
public:
@@ -4640,7 +5304,7 @@ public:
operator IR_PrimitiveDef_ptr &();
IR_PrimitiveDef_ptr &ptr (void);
IR_PrimitiveDef_ptr operator-> (void);
-
+
private:
IR_PrimitiveDef_ptr &ptr_;
};
@@ -4649,17 +5313,17 @@ class TAO_Export IR_StringDef_var : public TAO_Base_var
{
public:
IR_StringDef_var (void); // default constructor
- IR_StringDef_var (IR_StringDef_ptr);
+ IR_StringDef_var (IR_StringDef_ptr p) : ptr_ (p) {}
IR_StringDef_var (const IR_StringDef_var &); // copy constructor
~IR_StringDef_var (void); // destructor
-
+
IR_StringDef_var &operator= (IR_StringDef_ptr);
IR_StringDef_var &operator= (const IR_StringDef_var &);
IR_StringDef_ptr operator-> (void) const;
-
+
operator const IR_StringDef_ptr &() const;
operator IR_StringDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_StringDef_ptr in (void) const;
IR_StringDef_ptr &inout (void);
IR_StringDef_ptr &out (void);
@@ -4685,7 +5349,7 @@ public:
operator IR_StringDef_ptr &();
IR_StringDef_ptr &ptr (void);
IR_StringDef_ptr operator-> (void);
-
+
private:
IR_StringDef_ptr &ptr_;
};
@@ -4694,17 +5358,17 @@ class TAO_Export IR_SequenceDef_var : public TAO_Base_var
{
public:
IR_SequenceDef_var (void); // default constructor
- IR_SequenceDef_var (IR_SequenceDef_ptr);
+ IR_SequenceDef_var (IR_SequenceDef_ptr p) : ptr_ (p) {}
IR_SequenceDef_var (const IR_SequenceDef_var &); // copy constructor
~IR_SequenceDef_var (void); // destructor
-
+
IR_SequenceDef_var &operator= (IR_SequenceDef_ptr);
IR_SequenceDef_var &operator= (const IR_SequenceDef_var &);
IR_SequenceDef_ptr operator-> (void) const;
-
+
operator const IR_SequenceDef_ptr &() const;
operator IR_SequenceDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_SequenceDef_ptr in (void) const;
IR_SequenceDef_ptr &inout (void);
IR_SequenceDef_ptr &out (void);
@@ -4730,7 +5394,7 @@ public:
operator IR_SequenceDef_ptr &();
IR_SequenceDef_ptr &ptr (void);
IR_SequenceDef_ptr operator-> (void);
-
+
private:
IR_SequenceDef_ptr &ptr_;
};
@@ -4739,17 +5403,17 @@ class TAO_Export IR_ArrayDef_var : public TAO_Base_var
{
public:
IR_ArrayDef_var (void); // default constructor
- IR_ArrayDef_var (IR_ArrayDef_ptr);
+ IR_ArrayDef_var (IR_ArrayDef_ptr p) : ptr_ (p) {}
IR_ArrayDef_var (const IR_ArrayDef_var &); // copy constructor
~IR_ArrayDef_var (void); // destructor
-
+
IR_ArrayDef_var &operator= (IR_ArrayDef_ptr);
IR_ArrayDef_var &operator= (const IR_ArrayDef_var &);
IR_ArrayDef_ptr operator-> (void) const;
-
+
operator const IR_ArrayDef_ptr &() const;
operator IR_ArrayDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ArrayDef_ptr in (void) const;
IR_ArrayDef_ptr &inout (void);
IR_ArrayDef_ptr &out (void);
@@ -4775,7 +5439,7 @@ public:
operator IR_ArrayDef_ptr &();
IR_ArrayDef_ptr &ptr (void);
IR_ArrayDef_ptr operator-> (void);
-
+
private:
IR_ArrayDef_ptr &ptr_;
};
@@ -4784,17 +5448,17 @@ class TAO_Export IR_WstringDef_var : public TAO_Base_var
{
public:
IR_WstringDef_var (void); // default constructor
- IR_WstringDef_var (IR_WstringDef_ptr);
+ IR_WstringDef_var (IR_WstringDef_ptr p) : ptr_ (p) {}
IR_WstringDef_var (const IR_WstringDef_var &); // copy constructor
~IR_WstringDef_var (void); // destructor
-
+
IR_WstringDef_var &operator= (IR_WstringDef_ptr);
IR_WstringDef_var &operator= (const IR_WstringDef_var &);
IR_WstringDef_ptr operator-> (void) const;
-
+
operator const IR_WstringDef_ptr &() const;
operator IR_WstringDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_WstringDef_ptr in (void) const;
IR_WstringDef_ptr &inout (void);
IR_WstringDef_ptr &out (void);
@@ -4820,7 +5484,7 @@ public:
operator IR_WstringDef_ptr &();
IR_WstringDef_ptr &ptr (void);
IR_WstringDef_ptr operator-> (void);
-
+
private:
IR_WstringDef_ptr &ptr_;
};
@@ -4829,17 +5493,17 @@ class TAO_Export IR_FixedDef_var : public TAO_Base_var
{
public:
IR_FixedDef_var (void); // default constructor
- IR_FixedDef_var (IR_FixedDef_ptr);
+ IR_FixedDef_var (IR_FixedDef_ptr p) : ptr_ (p) {}
IR_FixedDef_var (const IR_FixedDef_var &); // copy constructor
~IR_FixedDef_var (void); // destructor
-
+
IR_FixedDef_var &operator= (IR_FixedDef_ptr);
IR_FixedDef_var &operator= (const IR_FixedDef_var &);
IR_FixedDef_ptr operator-> (void) const;
-
+
operator const IR_FixedDef_ptr &() const;
operator IR_FixedDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_FixedDef_ptr in (void) const;
IR_FixedDef_ptr &inout (void);
IR_FixedDef_ptr &out (void);
@@ -4865,11 +5529,43 @@ public:
operator IR_FixedDef_ptr &();
IR_FixedDef_ptr &ptr (void);
IR_FixedDef_ptr operator-> (void);
-
+
private:
IR_FixedDef_ptr &ptr_;
};
+enum IR_PrimitiveKind
+ {
+ pk_null,
+ pk_void,
+ pk_short,
+ pk_long,
+ pk_ushort,
+ pk_ulong,
+ pk_float,
+ pk_double,
+ pk_boolean,
+ pk_char,
+ pk_octet,
+ pk_any,
+ pk_TypeCode,
+ pk_Principal,
+ pk_string,
+ pk_objref,
+ pk_longlong,
+ pk_ulonglong,
+ pk_longdouble,
+ pk_wchar,
+ pk_wstring,
+ pk_value_base
+ };
+
+// Forward Classes Declaration
+class _TAO_Repository_Proxy_Impl;
+class _TAO_Repository_Remote_Proxy_Impl;
+class _TAO_Repository_Proxy_Broker;
+class _TAO_Repository_Remote_Proxy_Broker;
+
class TAO_Export IR_Repository: public virtual IR_Container
{
public:
@@ -4882,12 +5578,12 @@ public:
static IR_Repository_ptr _duplicate (IR_Repository_ptr obj);
static IR_Repository_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_Repository_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_Repository_ptr _nil (void)
@@ -4899,7 +5595,7 @@ public:
virtual IR_Contained_ptr lookup_id (
const char * search_id,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4908,7 +5604,7 @@ public:
virtual CORBA::TypeCode_ptr get_canonical_typecode (
CORBA::TypeCode_ptr tc,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4916,8 +5612,8 @@ public:
));
virtual IR_PrimitiveDef_ptr get_primitive (
- IR::PrimitiveKind kind,
- CORBA::Environment &ACE_TRY_ENV =
+ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4926,7 +5622,7 @@ public:
virtual IR_StringDef_ptr create_string (
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4935,7 +5631,7 @@ public:
virtual IR_WstringDef_ptr create_wstring (
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4945,7 +5641,7 @@ public:
virtual IR_SequenceDef_ptr create_sequence (
CORBA::ULong bound,
IR_IDLType_ptr element_type,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4955,7 +5651,7 @@ public:
virtual IR_ArrayDef_ptr create_array (
CORBA::ULong length,
IR_IDLType_ptr element_type,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4965,7 +5661,7 @@ public:
virtual IR_FixedDef_ptr create_fixed (
CORBA::UShort digits,
CORBA::Short scale,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -4973,173 +5669,316 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_Repository_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
+
protected:
- IR_Repository (void);
- IR_Repository (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_Repository (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_Repository (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+ friend class _TAO_Repository_Direct_Proxy_Impl;
+
virtual ~IR_Repository (void);
private:
IR_Repository (const IR_Repository &);
- void operator= (const IR_Repository &);
+ void operator= (const IR_Repository &);
};
-class TAO_IR_Repository_Default_Proxy_Factory
-{
-public:
- TAO_IR_Repository_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_Repository_Default_Proxy_Factory (void);
- virtual IR_Repository_ptr create_proxy (
- IR_Repository_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_Repository_Proxy_Factory_Adapter
+class TAO_Export _TAO_Repository_Proxy_Impl :
+ public virtual _TAO_Container_Proxy_Impl
{
public:
+ virtual ~_TAO_Repository_Proxy_Impl (void) { }
+
+ virtual IR_Contained_ptr lookup_id (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_Repository_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual CORBA::TypeCode_ptr get_canonical_typecode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::TypeCode_ptr tc,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_Repository_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_PrimitiveDef_ptr get_primitive (
+ CORBA_Object *_collocated_tao_target_,
+ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_StringDef_ptr create_string (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_Repository_ptr create_proxy (
- IR_Repository_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_WstringDef_ptr create_wstring (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_SequenceDef_ptr create_sequence (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ArrayDef_ptr create_array (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong length,
+ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_FixedDef_ptr create_fixed (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::UShort digits,
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_Repository_Proxy_Factory_Adapter (void);
- ~TAO_IR_Repository_Proxy_Factory_Adapter (void);
- TAO_IR_Repository_Proxy_Factory_Adapter &operator= (
- const TAO_IR_Repository_Proxy_Factory_Adapter &
- );
- TAO_IR_Repository_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_Repository_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_Repository_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_Repository_PROXY_FACTORY_ADAPTER;
- class TAO_IR_Repository_Smart_Proxy_Base : public virtual IR_Repository
- {
- public:
- TAO_IR_Repository_Smart_Proxy_Base (::IR_Repository_ptr proxy);
- ~TAO_IR_Repository_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_Contained_ptr lookup_id (
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_Repository_Remote_Proxy_Impl :
+ public virtual _TAO_Repository_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Container_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_Repository_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_Repository_Remote_Proxy_Impl (void) { }
+
+ virtual IR_Contained_ptr lookup_id (
+ CORBA_Object *_collocated_tao_target_,
const char * search_id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::TypeCode_ptr get_canonical_typecode (
+ CORBA_Object *_collocated_tao_target_,
CORBA::TypeCode_ptr tc,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_PrimitiveDef_ptr get_primitive (
- IR::PrimitiveKind kind,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_StringDef_ptr create_string (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_WstringDef_ptr create_wstring (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_SequenceDef_ptr create_sequence (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
IR_IDLType_ptr element_type,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ArrayDef_ptr create_array (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong length,
IR_IDLType_ptr element_type,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_FixedDef_ptr create_fixed (
+ CORBA_Object *_collocated_tao_target_,
CORBA::UShort digits,
CORBA::Short scale,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_Repository_Proxy_Broker
+{
+public:
+ virtual ~_TAO_Repository_Proxy_Broker (void);
+
+ virtual _TAO_Repository_Proxy_Impl &select_proxy (
+ IR_Repository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_Repository_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_Repository_Remote_Proxy_Broker : public virtual _TAO_Repository_Proxy_Broker
+{
+public:
+ _TAO_Repository_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_Repository_Remote_Proxy_Broker (void);
+
+ virtual _TAO_Repository_Proxy_Impl &select_proxy (
+ IR_Repository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_Repository_var base_proxy_;
+ _TAO_Repository_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
class TAO_Export IR_ComponentRepository_var : public TAO_Base_var
{
public:
IR_ComponentRepository_var (void); // default constructor
- IR_ComponentRepository_var (IR_ComponentRepository_ptr);
+ IR_ComponentRepository_var (IR_ComponentRepository_ptr p) : ptr_ (p) {}
IR_ComponentRepository_var (const IR_ComponentRepository_var &); // copy constructor
~IR_ComponentRepository_var (void); // destructor
-
+
IR_ComponentRepository_var &operator= (IR_ComponentRepository_ptr);
IR_ComponentRepository_var &operator= (const IR_ComponentRepository_var &);
IR_ComponentRepository_ptr operator-> (void) const;
-
+
operator const IR_ComponentRepository_ptr &() const;
operator IR_ComponentRepository_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ComponentRepository_ptr in (void) const;
IR_ComponentRepository_ptr &inout (void);
IR_ComponentRepository_ptr &out (void);
@@ -5165,11 +6004,17 @@ public:
operator IR_ComponentRepository_ptr &();
IR_ComponentRepository_ptr &ptr (void);
IR_ComponentRepository_ptr operator-> (void);
-
+
private:
IR_ComponentRepository_ptr &ptr_;
};
+// Forward Classes Declaration
+class _TAO_ComponentRepository_Proxy_Impl;
+class _TAO_ComponentRepository_Remote_Proxy_Impl;
+class _TAO_ComponentRepository_Proxy_Broker;
+class _TAO_ComponentRepository_Remote_Proxy_Broker;
+
class TAO_Export IR_ComponentRepository: public virtual IR_Repository
{
public:
@@ -5182,12 +6027,12 @@ public:
static IR_ComponentRepository_ptr _duplicate (IR_ComponentRepository_ptr obj);
static IR_ComponentRepository_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ComponentRepository_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ComponentRepository_ptr _nil (void)
@@ -5203,7 +6048,7 @@ public:
const char * version,
IR_ComponentDef_ptr base_component,
const IR_InterfaceDefSeq & supports_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -5217,7 +6062,7 @@ public:
IR_HomeDef_ptr base_home,
IR_ComponentDef_ptr managed_component,
IR_ValueDef_ptr primary_key,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -5225,110 +6070,211 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ComponentRepository_Proxy_Broker *the_TAO_ComponentRepository_Proxy_Broker_;
+
protected:
- IR_ComponentRepository (void);
- IR_ComponentRepository (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ComponentRepository (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ComponentRepository (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
+ friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
+ friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
+
virtual ~IR_ComponentRepository (void);
private:
IR_ComponentRepository (const IR_ComponentRepository &);
- void operator= (const IR_ComponentRepository &);
+ void operator= (const IR_ComponentRepository &);
};
-class TAO_IR_ComponentRepository_Default_Proxy_Factory
-{
-public:
- TAO_IR_ComponentRepository_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_ComponentRepository_Default_Proxy_Factory (void);
- virtual IR_ComponentRepository_ptr create_proxy (
- IR_ComponentRepository_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_ComponentRepository_Proxy_Factory_Adapter
+class TAO_Export _TAO_ComponentRepository_Proxy_Impl :
+ public virtual _TAO_Repository_Proxy_Impl
{
public:
+ virtual ~_TAO_ComponentRepository_Proxy_Impl (void) { }
+
+ virtual IR_ComponentDef_ptr create_component (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_ComponentDef_ptr base_component,
+ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ComponentRepository_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_HomeDef_ptr create_home (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_HomeDef_ptr base_home,
+ IR_ComponentDef_ptr managed_component,
+ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_ComponentRepository_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_ComponentRepository_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_ComponentRepository_ptr create_proxy (
- IR_ComponentRepository_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_ComponentRepository_Proxy_Factory_Adapter (void);
- ~TAO_IR_ComponentRepository_Proxy_Factory_Adapter (void);
- TAO_IR_ComponentRepository_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ComponentRepository_Proxy_Factory_Adapter &
- );
- TAO_IR_ComponentRepository_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_ComponentRepository_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ComponentRepository_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ComponentRepository_Smart_Proxy_Base : public virtual IR_ComponentRepository
- {
- public:
- TAO_IR_ComponentRepository_Smart_Proxy_Base (::IR_ComponentRepository_ptr proxy);
- ~TAO_IR_ComponentRepository_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_ComponentDef_ptr create_component (
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_ComponentRepository_Remote_Proxy_Impl :
+ public virtual _TAO_ComponentRepository_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Repository_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ComponentRepository_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ComponentRepository_Remote_Proxy_Impl (void) { }
+
+ virtual IR_ComponentDef_ptr create_component (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_ComponentDef_ptr base_component,
const IR_InterfaceDefSeq & supports_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_HomeDef_ptr create_home (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_HomeDef_ptr base_home,
IR_ComponentDef_ptr managed_component,
IR_ValueDef_ptr primary_key,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ComponentRepository_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
+
+ virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
+ IR_ComponentRepository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ComponentRepository_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ComponentRepository_Remote_Proxy_Broker : public virtual _TAO_ComponentRepository_Proxy_Broker
+{
+public:
+ _TAO_ComponentRepository_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ComponentRepository_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
+ IR_ComponentRepository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_ComponentRepository_var base_proxy_;
+ _TAO_ComponentRepository_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_ModuleDef_Proxy_Impl;
+class _TAO_ModuleDef_Remote_Proxy_Impl;
+class _TAO_ModuleDef_Proxy_Broker;
+class _TAO_ModuleDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ModuleDef: public virtual IR_Container, public virtual IR_Contained
{
public:
@@ -5341,12 +6287,12 @@ public:
static IR_ModuleDef_ptr _duplicate (IR_ModuleDef_ptr obj);
static IR_ModuleDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ModuleDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ModuleDef_ptr _nil (void)
@@ -5357,83 +6303,153 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ModuleDef_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
+
protected:
- IR_ModuleDef (void);
- IR_ModuleDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ModuleDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ModuleDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ModuleDef_Remote_Proxy_Impl;
+ friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ModuleDef_Direct_Proxy_Impl;
+
virtual ~IR_ModuleDef (void);
private:
IR_ModuleDef (const IR_ModuleDef &);
- void operator= (const IR_ModuleDef &);
-};
+ void operator= (const IR_ModuleDef &);
+};
+
+
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+ ///////////////////////////////////////////////////////////////////////
+ // Base Impl. Declaration
+ //
+
+ class TAO_Export _TAO_ModuleDef_Proxy_Impl :
+ public virtual _TAO_Container_Proxy_Impl,
+ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ModuleDef_Proxy_Impl (void) { }
+
+ protected:
+ _TAO_ModuleDef_Proxy_Impl (void);
+
+ };
+
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
-class TAO_IR_ModuleDef_Default_Proxy_Factory
+class TAO_Export _TAO_ModuleDef_Remote_Proxy_Impl :
+ public virtual _TAO_ModuleDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Container_Remote_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
{
public:
+ _TAO_ModuleDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ModuleDef_Remote_Proxy_Impl (void) { }
+
+};
- TAO_IR_ModuleDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
- virtual ~TAO_IR_ModuleDef_Default_Proxy_Factory (void);
- virtual IR_ModuleDef_ptr create_proxy (
- IR_ModuleDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
-class TAO_IR_ModuleDef_Proxy_Factory_Adapter
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ModuleDef_Proxy_Broker
{
public:
+ virtual ~_TAO_ModuleDef_Proxy_Broker (void);
- friend class TAO_Singleton<TAO_IR_ModuleDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
+ IR_ModuleDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
- int register_proxy_factory (
- TAO_IR_ModuleDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_ModuleDef_Proxy_Broker (void);
+
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
- IR_ModuleDef_ptr create_proxy (
- IR_ModuleDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_ModuleDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ModuleDef_Proxy_Factory_Adapter (void);
- TAO_IR_ModuleDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ModuleDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ModuleDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_ModuleDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ModuleDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ModuleDef_Smart_Proxy_Base : public virtual IR_ModuleDef
- {
- public:
- TAO_IR_ModuleDef_Smart_Proxy_Base (::IR_ModuleDef_ptr proxy);
- ~TAO_IR_ModuleDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- private:
- ::IR_ModuleDef_var base_proxy_;
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ModuleDef_Remote_Proxy_Broker : public virtual _TAO_ModuleDef_Proxy_Broker
+{
+public:
+ _TAO_ModuleDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ModuleDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
+ IR_ModuleDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+private:
+ _TAO_ModuleDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_ModuleDescription
{
@@ -5456,18 +6472,18 @@ public:
IR_ModuleDescription_var (IR_ModuleDescription *);
IR_ModuleDescription_var (const IR_ModuleDescription_var &); // copy constructor
~IR_ModuleDescription_var (void); // destructor
-
+
IR_ModuleDescription_var &operator= (IR_ModuleDescription *);
IR_ModuleDescription_var &operator= (const IR_ModuleDescription_var &);
IR_ModuleDescription *operator-> (void);
const IR_ModuleDescription *operator-> (void) const;
-
+
operator const IR_ModuleDescription &() const;
operator IR_ModuleDescription &();
operator IR_ModuleDescription &() const;
operator IR_ModuleDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ModuleDescription &in (void) const;
IR_ModuleDescription &inout (void);
IR_ModuleDescription *&out (void);
@@ -5489,13 +6505,19 @@ public:
operator IR_ModuleDescription *&();
IR_ModuleDescription *&ptr (void);
IR_ModuleDescription *operator-> (void);
-
+
private:
IR_ModuleDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_ModuleDescription_var &);
};
+// Forward Classes Declaration
+class _TAO_ConstantDef_Proxy_Impl;
+class _TAO_ConstantDef_Remote_Proxy_Impl;
+class _TAO_ConstantDef_Proxy_Broker;
+class _TAO_ConstantDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ConstantDef: public virtual IR_Contained
{
public:
@@ -5508,12 +6530,12 @@ public:
static IR_ConstantDef_ptr _duplicate (IR_ConstantDef_ptr obj);
static IR_ConstantDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ConstantDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ConstantDef_ptr _nil (void)
@@ -5523,8 +6545,8 @@ public:
static void _tao_any_destructor (void*);
- virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual CORBA::TypeCode_ptr type (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -5532,7 +6554,7 @@ public:
));
virtual IR_IDLType_ptr type_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -5541,7 +6563,7 @@ public:
virtual void type_def (
IR_IDLType_ptr type_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -5549,7 +6571,7 @@ public:
));
virtual CORBA::Any * value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -5558,7 +6580,7 @@ public:
virtual void value (
const CORBA::Any & value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -5566,125 +6588,235 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ConstantDef_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
+
protected:
- IR_ConstantDef (void);
- IR_ConstantDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ConstantDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ConstantDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+ friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+
virtual ~IR_ConstantDef (void);
private:
IR_ConstantDef (const IR_ConstantDef &);
- void operator= (const IR_ConstantDef &);
+ void operator= (const IR_ConstantDef &);
};
-class TAO_IR_ConstantDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_ConstantDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_ConstantDef_Default_Proxy_Factory (void);
- virtual IR_ConstantDef_ptr create_proxy (
- IR_ConstantDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_ConstantDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_ConstantDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl
{
public:
+ virtual ~_TAO_ConstantDef_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ConstantDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_ConstantDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual CORBA::Any * value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_ConstantDef_ptr create_proxy (
- IR_ConstantDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void value (
+ CORBA_Object *_collocated_tao_target_,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_ConstantDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ConstantDef_Proxy_Factory_Adapter (void);
- TAO_IR_ConstantDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ConstantDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ConstantDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_ConstantDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_ConstantDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ConstantDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ConstantDef_Smart_Proxy_Base : public virtual IR_ConstantDef
- {
- public:
- TAO_IR_ConstantDef_Smart_Proxy_Base (::IR_ConstantDef_ptr proxy);
- ~TAO_IR_ConstantDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_ConstantDef_Remote_Proxy_Impl :
+ public virtual _TAO_ConstantDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ConstantDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ConstantDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_IDLType_ptr type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual CORBA::Any * value (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ virtual CORBA::Any * value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void value (
+ virtual void value (
+ CORBA_Object *_collocated_tao_target_,
const CORBA::Any & value,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ConstantDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ConstantDef_Proxy_Broker (void);
+
+ virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
+ IR_ConstantDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ConstantDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ConstantDef_Remote_Proxy_Broker : public virtual _TAO_ConstantDef_Proxy_Broker
+{
+public:
+ _TAO_ConstantDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ConstantDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
+ IR_ConstantDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_ConstantDef_var base_proxy_;
+ _TAO_ConstantDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_ConstantDescription
{
@@ -5709,18 +6841,18 @@ public:
IR_ConstantDescription_var (IR_ConstantDescription *);
IR_ConstantDescription_var (const IR_ConstantDescription_var &); // copy constructor
~IR_ConstantDescription_var (void); // destructor
-
+
IR_ConstantDescription_var &operator= (IR_ConstantDescription *);
IR_ConstantDescription_var &operator= (const IR_ConstantDescription_var &);
IR_ConstantDescription *operator-> (void);
const IR_ConstantDescription *operator-> (void) const;
-
+
operator const IR_ConstantDescription &() const;
operator IR_ConstantDescription &();
operator IR_ConstantDescription &() const;
operator IR_ConstantDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ConstantDescription &in (void) const;
IR_ConstantDescription &inout (void);
IR_ConstantDescription *&out (void);
@@ -5742,7 +6874,7 @@ public:
operator IR_ConstantDescription *&();
IR_ConstantDescription *&ptr (void);
IR_ConstantDescription *operator-> (void);
-
+
private:
IR_ConstantDescription *&ptr_;
// assignment from T_var not allowed
@@ -5753,17 +6885,17 @@ class TAO_Export IR_TypedefDef_var : public TAO_Base_var
{
public:
IR_TypedefDef_var (void); // default constructor
- IR_TypedefDef_var (IR_TypedefDef_ptr);
+ IR_TypedefDef_var (IR_TypedefDef_ptr p) : ptr_ (p) {}
IR_TypedefDef_var (const IR_TypedefDef_var &); // copy constructor
~IR_TypedefDef_var (void); // destructor
-
+
IR_TypedefDef_var &operator= (IR_TypedefDef_ptr);
IR_TypedefDef_var &operator= (const IR_TypedefDef_var &);
IR_TypedefDef_ptr operator-> (void) const;
-
+
operator const IR_TypedefDef_ptr &() const;
operator IR_TypedefDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_TypedefDef_ptr in (void) const;
IR_TypedefDef_ptr &inout (void);
IR_TypedefDef_ptr &out (void);
@@ -5789,11 +6921,17 @@ public:
operator IR_TypedefDef_ptr &();
IR_TypedefDef_ptr &ptr (void);
IR_TypedefDef_ptr operator-> (void);
-
+
private:
IR_TypedefDef_ptr &ptr_;
};
+// Forward Classes Declaration
+class _TAO_TypedefDef_Proxy_Impl;
+class _TAO_TypedefDef_Remote_Proxy_Impl;
+class _TAO_TypedefDef_Proxy_Broker;
+class _TAO_TypedefDef_Remote_Proxy_Broker;
+
class TAO_Export IR_TypedefDef: public virtual IR_Contained, public virtual IR_IDLType
{
public:
@@ -5806,12 +6944,12 @@ public:
static IR_TypedefDef_ptr _duplicate (IR_TypedefDef_ptr obj);
static IR_TypedefDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_TypedefDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_TypedefDef_ptr _nil (void)
@@ -5822,83 +6960,153 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_TypedefDef_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
+
protected:
- IR_TypedefDef (void);
- IR_TypedefDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_TypedefDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_TypedefDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_TypedefDef_Remote_Proxy_Impl;
+ friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_TypedefDef_Direct_Proxy_Impl;
+
virtual ~IR_TypedefDef (void);
private:
IR_TypedefDef (const IR_TypedefDef &);
- void operator= (const IR_TypedefDef &);
-};
+ void operator= (const IR_TypedefDef &);
+};
+
+
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+ ///////////////////////////////////////////////////////////////////////
+ // Base Impl. Declaration
+ //
+
+ class TAO_Export _TAO_TypedefDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl,
+ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_TypedefDef_Proxy_Impl (void) { }
+
+ protected:
+ _TAO_TypedefDef_Proxy_Impl (void);
+
+ };
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
-class TAO_IR_TypedefDef_Default_Proxy_Factory
+class TAO_Export _TAO_TypedefDef_Remote_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
{
public:
+ _TAO_TypedefDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_TypedefDef_Remote_Proxy_Impl (void) { }
+
+};
- TAO_IR_TypedefDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
- virtual ~TAO_IR_TypedefDef_Default_Proxy_Factory (void);
- virtual IR_TypedefDef_ptr create_proxy (
- IR_TypedefDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
-class TAO_IR_TypedefDef_Proxy_Factory_Adapter
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_TypedefDef_Proxy_Broker
{
public:
+ virtual ~_TAO_TypedefDef_Proxy_Broker (void);
- friend class TAO_Singleton<TAO_IR_TypedefDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
+ IR_TypedefDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
- int register_proxy_factory (
- TAO_IR_TypedefDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_TypedefDef_Proxy_Broker (void);
+
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
- IR_TypedefDef_ptr create_proxy (
- IR_TypedefDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_TypedefDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_TypedefDef_Proxy_Factory_Adapter (void);
- TAO_IR_TypedefDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_TypedefDef_Proxy_Factory_Adapter &
- );
- TAO_IR_TypedefDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_TypedefDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_TypedefDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_TypedefDef_Smart_Proxy_Base : public virtual IR_TypedefDef
- {
- public:
- TAO_IR_TypedefDef_Smart_Proxy_Base (::IR_TypedefDef_ptr proxy);
- ~TAO_IR_TypedefDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- private:
- ::IR_TypedefDef_var base_proxy_;
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_TypedefDef_Remote_Proxy_Broker : public virtual _TAO_TypedefDef_Proxy_Broker
+{
+public:
+ _TAO_TypedefDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_TypedefDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
+ IR_TypedefDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+private:
+ _TAO_TypedefDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_TypeDescription
{
@@ -5922,18 +7130,18 @@ public:
IR_TypeDescription_var (IR_TypeDescription *);
IR_TypeDescription_var (const IR_TypeDescription_var &); // copy constructor
~IR_TypeDescription_var (void); // destructor
-
+
IR_TypeDescription_var &operator= (IR_TypeDescription *);
IR_TypeDescription_var &operator= (const IR_TypeDescription_var &);
IR_TypeDescription *operator-> (void);
const IR_TypeDescription *operator-> (void) const;
-
+
operator const IR_TypeDescription &() const;
operator IR_TypeDescription &();
operator IR_TypeDescription &() const;
operator IR_TypeDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_TypeDescription &in (void) const;
IR_TypeDescription &inout (void);
IR_TypeDescription *&out (void);
@@ -5955,13 +7163,19 @@ public:
operator IR_TypeDescription *&();
IR_TypeDescription *&ptr (void);
IR_TypeDescription *operator-> (void);
-
+
private:
IR_TypeDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_TypeDescription_var &);
};
+// Forward Classes Declaration
+class _TAO_StructDef_Proxy_Impl;
+class _TAO_StructDef_Remote_Proxy_Impl;
+class _TAO_StructDef_Proxy_Broker;
+class _TAO_StructDef_Remote_Proxy_Broker;
+
class TAO_Export IR_StructDef: public virtual IR_TypedefDef, public virtual IR_Container
{
public:
@@ -5974,12 +7188,12 @@ public:
static IR_StructDef_ptr _duplicate (IR_StructDef_ptr obj);
static IR_StructDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_StructDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_StructDef_ptr _nil (void)
@@ -5989,17 +7203,17 @@ public:
static void _tao_any_destructor (void*);
- virtual IR_StructMemberSeq * members (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_StructMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void members (
- const IR_StructMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
+ virtual void members (
+ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6007,100 +7221,193 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_StructDef_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
+
protected:
- IR_StructDef (void);
- IR_StructDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_StructDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_StructDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_StructDef_Remote_Proxy_Impl;
+ friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_StructDef_Direct_Proxy_Impl;
+
virtual ~IR_StructDef (void);
private:
IR_StructDef (const IR_StructDef &);
- void operator= (const IR_StructDef &);
+ void operator= (const IR_StructDef &);
};
-class TAO_IR_StructDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_StructDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_StructDef_Default_Proxy_Factory (void);
- virtual IR_StructDef_ptr create_proxy (
- IR_StructDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_StructDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_StructDef_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl,
+ public virtual _TAO_Container_Proxy_Impl
{
public:
+ virtual ~_TAO_StructDef_Proxy_Impl (void) { }
+
+ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_StructDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_StructDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_StructDef_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_StructDef_ptr create_proxy (
- IR_StructDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_StructDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_StructDef_Proxy_Factory_Adapter (void);
- TAO_IR_StructDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_StructDef_Proxy_Factory_Adapter &
- );
- TAO_IR_StructDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_StructDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_StructDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_StructDef_Smart_Proxy_Base : public virtual IR_StructDef
- {
- public:
- TAO_IR_StructDef_Smart_Proxy_Base (::IR_StructDef_ptr proxy);
- ~TAO_IR_StructDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_StructMemberSeq * members (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_StructDef_Remote_Proxy_Impl :
+ public virtual _TAO_StructDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_TypedefDef_Remote_Proxy_Impl,
+ public virtual _TAO_Container_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_StructDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_StructDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void members (
+ CORBA_Object *_collocated_tao_target_,
const IR_StructMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_StructDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_StructDef_Proxy_Broker (void);
+
+ virtual _TAO_StructDef_Proxy_Impl &select_proxy (
+ IR_StructDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_StructDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_StructDef_Remote_Proxy_Broker : public virtual _TAO_StructDef_Proxy_Broker
+{
+public:
+ _TAO_StructDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_StructDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_StructDef_Proxy_Impl &select_proxy (
+ IR_StructDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_StructDef_var base_proxy_;
+ _TAO_StructDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_UnionDef_Proxy_Impl;
+class _TAO_UnionDef_Remote_Proxy_Impl;
+class _TAO_UnionDef_Proxy_Broker;
+class _TAO_UnionDef_Remote_Proxy_Broker;
+
class TAO_Export IR_UnionDef: public virtual IR_TypedefDef, public virtual IR_Container
{
public:
@@ -6113,12 +7420,12 @@ public:
static IR_UnionDef_ptr _duplicate (IR_UnionDef_ptr obj);
static IR_UnionDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_UnionDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_UnionDef_ptr _nil (void)
@@ -6129,7 +7436,7 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::TypeCode_ptr discriminator_type (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6137,7 +7444,7 @@ public:
));
virtual IR_IDLType_ptr discriminator_type_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6146,7 +7453,7 @@ public:
virtual void discriminator_type_def (
IR_IDLType_ptr discriminator_type_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6154,7 +7461,7 @@ public:
));
virtual IR_UnionMemberSeq * members (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6163,7 +7470,7 @@ public:
virtual void members (
const IR_UnionMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6171,125 +7478,243 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_UnionDef_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
+
protected:
- IR_UnionDef (void);
- IR_UnionDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_UnionDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_UnionDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_UnionDef_Remote_Proxy_Impl;
+ friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_UnionDef_Direct_Proxy_Impl;
+
virtual ~IR_UnionDef (void);
private:
- IR_UnionDef (const IR_UnionDef &);
- void operator= (const IR_UnionDef &);
+ IR_UnionDef (const IR_UnionDef &);
+ void operator= (const IR_UnionDef &);
};
-class TAO_IR_UnionDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_UnionDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_UnionDef_Default_Proxy_Factory (void);
- virtual IR_UnionDef_ptr create_proxy (
- IR_UnionDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_UnionDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_UnionDef_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl,
+ public virtual _TAO_Container_Proxy_Impl
{
public:
+ virtual ~_TAO_UnionDef_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr discriminator_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_UnionDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_IDLType_ptr discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_UnionDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_UnionMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_UnionDef_ptr create_proxy (
- IR_UnionDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_UnionDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_UnionDef_Proxy_Factory_Adapter (void);
- TAO_IR_UnionDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_UnionDef_Proxy_Factory_Adapter &
- );
- TAO_IR_UnionDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_UnionDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_UnionDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_UnionDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_UnionDef_Smart_Proxy_Base : public virtual IR_UnionDef
- {
- public:
- TAO_IR_UnionDef_Smart_Proxy_Base (::IR_UnionDef_ptr proxy);
- ~TAO_IR_UnionDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::TypeCode_ptr discriminator_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_UnionDef_Remote_Proxy_Impl :
+ public virtual _TAO_UnionDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_TypedefDef_Remote_Proxy_Impl,
+ public virtual _TAO_Container_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_UnionDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_UnionDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr discriminator_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_IDLType_ptr discriminator_type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr discriminator_type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_UnionMemberSeq * members (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void members (
+ CORBA_Object *_collocated_tao_target_,
const IR_UnionMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_UnionDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_UnionDef_Proxy_Broker (void);
+
+ virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
+ IR_UnionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_UnionDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_UnionDef_Remote_Proxy_Broker : public virtual _TAO_UnionDef_Proxy_Broker
+{
+public:
+ _TAO_UnionDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_UnionDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
+ IR_UnionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_UnionDef_var base_proxy_;
+ _TAO_UnionDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_EnumDef_Proxy_Impl;
+class _TAO_EnumDef_Remote_Proxy_Impl;
+class _TAO_EnumDef_Proxy_Broker;
+class _TAO_EnumDef_Remote_Proxy_Broker;
+
class TAO_Export IR_EnumDef: public virtual IR_TypedefDef
{
public:
@@ -6302,12 +7727,12 @@ public:
static IR_EnumDef_ptr _duplicate (IR_EnumDef_ptr obj);
static IR_EnumDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_EnumDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_EnumDef_ptr _nil (void)
@@ -6318,7 +7743,7 @@ public:
static void _tao_any_destructor (void*);
virtual IR_EnumMemberSeq * members (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6327,7 +7752,7 @@ public:
virtual void members (
const IR_EnumMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6335,100 +7760,191 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_EnumDef_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
+
protected:
- IR_EnumDef (void);
- IR_EnumDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_EnumDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_EnumDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_EnumDef_Remote_Proxy_Impl;
+ friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_EnumDef_Direct_Proxy_Impl;
+
virtual ~IR_EnumDef (void);
private:
IR_EnumDef (const IR_EnumDef &);
- void operator= (const IR_EnumDef &);
+ void operator= (const IR_EnumDef &);
};
-class TAO_IR_EnumDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_EnumDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_EnumDef_Default_Proxy_Factory (void);
- virtual IR_EnumDef_ptr create_proxy (
- IR_EnumDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_EnumDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_EnumDef_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl
{
public:
+ virtual ~_TAO_EnumDef_Proxy_Impl (void) { }
+
+ virtual IR_EnumMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_EnumDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+protected:
+ _TAO_EnumDef_Proxy_Impl (void);
- int register_proxy_factory (
- TAO_IR_EnumDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- IR_EnumDef_ptr create_proxy (
- IR_EnumDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-protected:
- TAO_IR_EnumDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_EnumDef_Proxy_Factory_Adapter (void);
- TAO_IR_EnumDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_EnumDef_Proxy_Factory_Adapter &
- );
- TAO_IR_EnumDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
- typedef TAO_Singleton<TAO_IR_EnumDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_EnumDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_EnumDef_Smart_Proxy_Base : public virtual IR_EnumDef
- {
- public:
- TAO_IR_EnumDef_Smart_Proxy_Base (::IR_EnumDef_ptr proxy);
- ~TAO_IR_EnumDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_EnumMemberSeq * members (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+class TAO_Export _TAO_EnumDef_Remote_Proxy_Impl :
+ public virtual _TAO_EnumDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_EnumDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_EnumDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_EnumMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void members (
+ CORBA_Object *_collocated_tao_target_,
const IR_EnumMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_EnumDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_EnumDef_Proxy_Broker (void);
+
+ virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
+ IR_EnumDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_EnumDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_EnumDef_Remote_Proxy_Broker : public virtual _TAO_EnumDef_Proxy_Broker
+{
+public:
+ _TAO_EnumDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_EnumDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
+ IR_EnumDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_EnumDef_var base_proxy_;
+ _TAO_EnumDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_AliasDef_Proxy_Impl;
+class _TAO_AliasDef_Remote_Proxy_Impl;
+class _TAO_AliasDef_Proxy_Broker;
+class _TAO_AliasDef_Remote_Proxy_Broker;
+
class TAO_Export IR_AliasDef: public virtual IR_TypedefDef
{
public:
@@ -6441,12 +7957,12 @@ public:
static IR_AliasDef_ptr _duplicate (IR_AliasDef_ptr obj);
static IR_AliasDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_AliasDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_AliasDef_ptr _nil (void)
@@ -6457,16 +7973,16 @@ public:
static void _tao_any_destructor (void*);
virtual IR_IDLType_ptr original_type_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void original_type_def (
+ virtual void original_type_def (
IR_IDLType_ptr original_type_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6474,100 +7990,191 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_AliasDef_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
+
protected:
- IR_AliasDef (void);
- IR_AliasDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_AliasDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_AliasDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_AliasDef_Remote_Proxy_Impl;
+ friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_AliasDef_Direct_Proxy_Impl;
+
virtual ~IR_AliasDef (void);
private:
IR_AliasDef (const IR_AliasDef &);
- void operator= (const IR_AliasDef &);
+ void operator= (const IR_AliasDef &);
};
-class TAO_IR_AliasDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_AliasDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_AliasDef_Default_Proxy_Factory (void);
- virtual IR_AliasDef_ptr create_proxy (
- IR_AliasDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_AliasDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_AliasDef_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl
{
public:
+ virtual ~_TAO_AliasDef_Proxy_Impl (void) { }
+
+ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_AliasDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_AliasDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_AliasDef_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_AliasDef_ptr create_proxy (
- IR_AliasDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_AliasDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_AliasDef_Proxy_Factory_Adapter (void);
- TAO_IR_AliasDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_AliasDef_Proxy_Factory_Adapter &
- );
- TAO_IR_AliasDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_AliasDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_AliasDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_AliasDef_Smart_Proxy_Base : public virtual IR_AliasDef
- {
- public:
- TAO_IR_AliasDef_Smart_Proxy_Base (::IR_AliasDef_ptr proxy);
- ~TAO_IR_AliasDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_IDLType_ptr original_type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_AliasDef_Remote_Proxy_Impl :
+ public virtual _TAO_AliasDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_AliasDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_AliasDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void original_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr original_type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_AliasDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_AliasDef_Proxy_Broker (void);
+
+ virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
+ IR_AliasDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_AliasDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_AliasDef_Remote_Proxy_Broker : public virtual _TAO_AliasDef_Proxy_Broker
+{
+public:
+ _TAO_AliasDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_AliasDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
+ IR_AliasDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_AliasDef_var base_proxy_;
+ _TAO_AliasDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_NativeDef_Proxy_Impl;
+class _TAO_NativeDef_Remote_Proxy_Impl;
+class _TAO_NativeDef_Proxy_Broker;
+class _TAO_NativeDef_Remote_Proxy_Broker;
+
class TAO_Export IR_NativeDef: public virtual IR_TypedefDef
{
public:
@@ -6580,12 +8187,12 @@ public:
static IR_NativeDef_ptr _duplicate (IR_NativeDef_ptr obj);
static IR_NativeDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_NativeDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_NativeDef_ptr _nil (void)
@@ -6596,83 +8203,157 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_NativeDef_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
+
protected:
- IR_NativeDef (void);
- IR_NativeDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_NativeDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_NativeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_NativeDef_Remote_Proxy_Impl;
+ friend class _TAO_NativeDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_NativeDef_Direct_Proxy_Impl;
+
virtual ~IR_NativeDef (void);
private:
IR_NativeDef (const IR_NativeDef &);
- void operator= (const IR_NativeDef &);
+ void operator= (const IR_NativeDef &);
};
-class TAO_IR_NativeDef_Default_Proxy_Factory
+
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
+
+class TAO_Export _TAO_NativeDef_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl
{
public:
+ virtual ~_TAO_NativeDef_Proxy_Impl (void) { }
+
+protected:
+ _TAO_NativeDef_Proxy_Impl (void);
+
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
- TAO_IR_NativeDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+class TAO_Export _TAO_NativeDef_Remote_Proxy_Impl :
+ public virtual _TAO_NativeDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_NativeDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_NativeDef_Remote_Proxy_Impl (void) { }
+
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
- virtual ~TAO_IR_NativeDef_Default_Proxy_Factory (void);
- virtual IR_NativeDef_ptr create_proxy (
- IR_NativeDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
-class TAO_IR_NativeDef_Proxy_Factory_Adapter
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_NativeDef_Proxy_Broker
{
public:
+ virtual ~_TAO_NativeDef_Proxy_Broker (void);
- friend class TAO_Singleton<TAO_IR_NativeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
+ IR_NativeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
- int register_proxy_factory (
- TAO_IR_NativeDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_NativeDef_Proxy_Broker (void);
+
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
- IR_NativeDef_ptr create_proxy (
- IR_NativeDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_NativeDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_NativeDef_Proxy_Factory_Adapter (void);
- TAO_IR_NativeDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_NativeDef_Proxy_Factory_Adapter &
- );
- TAO_IR_NativeDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_NativeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_NativeDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_NativeDef_Smart_Proxy_Base : public virtual IR_NativeDef
- {
- public:
- TAO_IR_NativeDef_Smart_Proxy_Base (::IR_NativeDef_ptr proxy);
- ~TAO_IR_NativeDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- private:
- ::IR_NativeDef_var base_proxy_;
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_NativeDef_Remote_Proxy_Broker : public virtual _TAO_NativeDef_Proxy_Broker
+{
+public:
+ _TAO_NativeDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_NativeDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
+ IR_NativeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+private:
+ _TAO_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
};
+// This funxtion is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+_TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
+
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_PrimitiveDef_Proxy_Impl;
+class _TAO_PrimitiveDef_Remote_Proxy_Impl;
+class _TAO_PrimitiveDef_Proxy_Broker;
+class _TAO_PrimitiveDef_Remote_Proxy_Broker;
+
class TAO_Export IR_PrimitiveDef: public virtual IR_IDLType
{
public:
@@ -6685,12 +8366,12 @@ public:
static IR_PrimitiveDef_ptr _duplicate (IR_PrimitiveDef_ptr obj);
static IR_PrimitiveDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_PrimitiveDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_PrimitiveDef_ptr _nil (void)
@@ -6700,8 +8381,8 @@ public:
static void _tao_any_destructor (void*);
- virtual IR::PrimitiveKind kind (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_PrimitiveKind kind (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6709,91 +8390,173 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_PrimitiveDef_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
+
protected:
- IR_PrimitiveDef (void);
- IR_PrimitiveDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_PrimitiveDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_PrimitiveDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
+ friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
+
virtual ~IR_PrimitiveDef (void);
private:
IR_PrimitiveDef (const IR_PrimitiveDef &);
- void operator= (const IR_PrimitiveDef &);
+ void operator= (const IR_PrimitiveDef &);
};
-class TAO_IR_PrimitiveDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_PrimitiveDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_PrimitiveDef_Default_Proxy_Factory (void);
- virtual IR_PrimitiveDef_ptr create_proxy (
- IR_PrimitiveDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_PrimitiveDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_PrimitiveDef_Proxy_Impl :
+ public virtual _TAO_IDLType_Proxy_Impl
{
public:
+ virtual ~_TAO_PrimitiveDef_Proxy_Impl (void) { }
+
+ virtual IR_PrimitiveKind kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_PrimitiveDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+protected:
+ _TAO_PrimitiveDef_Proxy_Impl (void);
- int register_proxy_factory (
- TAO_IR_PrimitiveDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- IR_PrimitiveDef_ptr create_proxy (
- IR_PrimitiveDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-protected:
- TAO_IR_PrimitiveDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_PrimitiveDef_Proxy_Factory_Adapter (void);
- TAO_IR_PrimitiveDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_PrimitiveDef_Proxy_Factory_Adapter &
- );
- TAO_IR_PrimitiveDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
- typedef TAO_Singleton<TAO_IR_PrimitiveDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_PrimitiveDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_PrimitiveDef_Smart_Proxy_Base : public virtual IR_PrimitiveDef
- {
- public:
- TAO_IR_PrimitiveDef_Smart_Proxy_Base (::IR_PrimitiveDef_ptr proxy);
- ~TAO_IR_PrimitiveDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR::PrimitiveKind kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+class TAO_Export _TAO_PrimitiveDef_Remote_Proxy_Impl :
+ public virtual _TAO_PrimitiveDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_PrimitiveDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_PrimitiveDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_PrimitiveKind kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_PrimitiveDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_PrimitiveDef_Proxy_Broker (void);
+
+ virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
+ IR_PrimitiveDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_PrimitiveDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_PrimitiveDef_Remote_Proxy_Broker : public virtual _TAO_PrimitiveDef_Proxy_Broker
+{
+public:
+ _TAO_PrimitiveDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
+ IR_PrimitiveDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_PrimitiveDef_var base_proxy_;
+ _TAO_PrimitiveDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_StringDef_Proxy_Impl;
+class _TAO_StringDef_Remote_Proxy_Impl;
+class _TAO_StringDef_Proxy_Broker;
+class _TAO_StringDef_Remote_Proxy_Broker;
+
class TAO_Export IR_StringDef: public virtual IR_IDLType
{
public:
@@ -6806,12 +8569,12 @@ public:
static IR_StringDef_ptr _duplicate (IR_StringDef_ptr obj);
static IR_StringDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_StringDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_StringDef_ptr _nil (void)
@@ -6822,7 +8585,7 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::ULong bound (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6831,7 +8594,7 @@ public:
virtual void bound (
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6839,100 +8602,191 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_StringDef_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
+
protected:
- IR_StringDef (void);
- IR_StringDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_StringDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_StringDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_StringDef_Remote_Proxy_Impl;
+ friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_StringDef_Direct_Proxy_Impl;
+
virtual ~IR_StringDef (void);
private:
IR_StringDef (const IR_StringDef &);
- void operator= (const IR_StringDef &);
+ void operator= (const IR_StringDef &);
};
-class TAO_IR_StringDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_StringDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_StringDef_Default_Proxy_Factory (void);
- virtual IR_StringDef_ptr create_proxy (
- IR_StringDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_StringDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_StringDef_Proxy_Impl :
+ public virtual _TAO_IDLType_Proxy_Impl
{
public:
+ virtual ~_TAO_StringDef_Proxy_Impl (void) { }
+
+ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_StringDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_StringDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_StringDef_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_StringDef_ptr create_proxy (
- IR_StringDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_StringDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_StringDef_Proxy_Factory_Adapter (void);
- TAO_IR_StringDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_StringDef_Proxy_Factory_Adapter &
- );
- TAO_IR_StringDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_StringDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_StringDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_StringDef_Smart_Proxy_Base : public virtual IR_StringDef
- {
- public:
- TAO_IR_StringDef_Smart_Proxy_Base (::IR_StringDef_ptr proxy);
- ~TAO_IR_StringDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::ULong bound (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_StringDef_Remote_Proxy_Impl :
+ public virtual _TAO_StringDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_StringDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_StringDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_StringDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_StringDef_Proxy_Broker (void);
+
+ virtual _TAO_StringDef_Proxy_Impl &select_proxy (
+ IR_StringDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_StringDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_StringDef_Remote_Proxy_Broker : public virtual _TAO_StringDef_Proxy_Broker
+{
+public:
+ _TAO_StringDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_StringDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_StringDef_Proxy_Impl &select_proxy (
+ IR_StringDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_StringDef_var base_proxy_;
+ _TAO_StringDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_WstringDef_Proxy_Impl;
+class _TAO_WstringDef_Remote_Proxy_Impl;
+class _TAO_WstringDef_Proxy_Broker;
+class _TAO_WstringDef_Remote_Proxy_Broker;
+
class TAO_Export IR_WstringDef: public virtual IR_IDLType
{
public:
@@ -6945,12 +8799,12 @@ public:
static IR_WstringDef_ptr _duplicate (IR_WstringDef_ptr obj);
static IR_WstringDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_WstringDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_WstringDef_ptr _nil (void)
@@ -6961,7 +8815,7 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::ULong bound (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6970,7 +8824,7 @@ public:
virtual void bound (
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -6978,100 +8832,191 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_WstringDef_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
+
protected:
- IR_WstringDef (void);
- IR_WstringDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_WstringDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_WstringDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_WstringDef_Remote_Proxy_Impl;
+ friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_WstringDef_Direct_Proxy_Impl;
+
virtual ~IR_WstringDef (void);
private:
IR_WstringDef (const IR_WstringDef &);
- void operator= (const IR_WstringDef &);
+ void operator= (const IR_WstringDef &);
};
-class TAO_IR_WstringDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_WstringDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_WstringDef_Default_Proxy_Factory (void);
- virtual IR_WstringDef_ptr create_proxy (
- IR_WstringDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_WstringDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_WstringDef_Proxy_Impl :
+ public virtual _TAO_IDLType_Proxy_Impl
{
public:
+ virtual ~_TAO_WstringDef_Proxy_Impl (void) { }
+
+ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_WstringDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_WstringDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_WstringDef_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_WstringDef_ptr create_proxy (
- IR_WstringDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_WstringDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_WstringDef_Proxy_Factory_Adapter (void);
- TAO_IR_WstringDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_WstringDef_Proxy_Factory_Adapter &
- );
- TAO_IR_WstringDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_WstringDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_WstringDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_WstringDef_Smart_Proxy_Base : public virtual IR_WstringDef
- {
- public:
- TAO_IR_WstringDef_Smart_Proxy_Base (::IR_WstringDef_ptr proxy);
- ~TAO_IR_WstringDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::ULong bound (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_WstringDef_Remote_Proxy_Impl :
+ public virtual _TAO_WstringDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_WstringDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_WstringDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_WstringDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_WstringDef_Proxy_Broker (void);
+
+ virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
+ IR_WstringDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_WstringDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_WstringDef_Remote_Proxy_Broker : public virtual _TAO_WstringDef_Proxy_Broker
+{
+public:
+ _TAO_WstringDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_WstringDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
+ IR_WstringDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_WstringDef_var base_proxy_;
+ _TAO_WstringDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_FixedDef_Proxy_Impl;
+class _TAO_FixedDef_Remote_Proxy_Impl;
+class _TAO_FixedDef_Proxy_Broker;
+class _TAO_FixedDef_Remote_Proxy_Broker;
+
class TAO_Export IR_FixedDef: public virtual IR_IDLType
{
public:
@@ -7084,12 +9029,12 @@ public:
static IR_FixedDef_ptr _duplicate (IR_FixedDef_ptr obj);
static IR_FixedDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_FixedDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_FixedDef_ptr _nil (void)
@@ -7099,8 +9044,8 @@ public:
static void _tao_any_destructor (void*);
- virtual CORBA::UShort digits (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual CORBA::UShort digits (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7109,7 +9054,7 @@ public:
virtual void digits (
CORBA::UShort digits,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7117,7 +9062,7 @@ public:
));
virtual CORBA::Short scale (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7126,7 +9071,7 @@ public:
virtual void scale (
CORBA::Short scale,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7134,117 +9079,225 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_FixedDef_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_;
+
protected:
- IR_FixedDef (void);
- IR_FixedDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_FixedDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_FixedDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_FixedDef_Remote_Proxy_Impl;
+ friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_FixedDef_Direct_Proxy_Impl;
+
virtual ~IR_FixedDef (void);
private:
IR_FixedDef (const IR_FixedDef &);
- void operator= (const IR_FixedDef &);
+ void operator= (const IR_FixedDef &);
};
-class TAO_IR_FixedDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_FixedDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_FixedDef_Default_Proxy_Factory (void);
- virtual IR_FixedDef_ptr create_proxy (
- IR_FixedDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_FixedDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_FixedDef_Proxy_Impl :
+ public virtual _TAO_IDLType_Proxy_Impl
{
public:
+ virtual ~_TAO_FixedDef_Proxy_Impl (void) { }
+
+ virtual CORBA::UShort digits (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_FixedDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
-
- int register_proxy_factory (
- TAO_IR_FixedDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void digits (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::UShort digits,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual CORBA::Short scale (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_FixedDef_ptr create_proxy (
- IR_FixedDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void scale (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_FixedDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_FixedDef_Proxy_Factory_Adapter (void);
- TAO_IR_FixedDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_FixedDef_Proxy_Factory_Adapter &
- );
- TAO_IR_FixedDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_FixedDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_FixedDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_FixedDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_FixedDef_Smart_Proxy_Base : public virtual IR_FixedDef
- {
- public:
- TAO_IR_FixedDef_Smart_Proxy_Base (::IR_FixedDef_ptr proxy);
- ~TAO_IR_FixedDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::UShort digits (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_FixedDef_Remote_Proxy_Impl :
+ public virtual _TAO_FixedDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_FixedDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_FixedDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::UShort digits (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void digits (
+ CORBA_Object *_collocated_tao_target_,
CORBA::UShort digits,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Short scale (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void scale (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Short scale,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_FixedDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_FixedDef_Proxy_Broker (void);
+
+ virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
+ IR_FixedDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_FixedDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_FixedDef_Remote_Proxy_Broker : public virtual _TAO_FixedDef_Proxy_Broker
+{
+public:
+ _TAO_FixedDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_FixedDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
+ IR_FixedDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_FixedDef_var base_proxy_;
+ _TAO_FixedDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_SequenceDef_Proxy_Impl;
+class _TAO_SequenceDef_Remote_Proxy_Impl;
+class _TAO_SequenceDef_Proxy_Broker;
+class _TAO_SequenceDef_Remote_Proxy_Broker;
+
class TAO_Export IR_SequenceDef: public virtual IR_IDLType
{
public:
@@ -7257,12 +9310,12 @@ public:
static IR_SequenceDef_ptr _duplicate (IR_SequenceDef_ptr obj);
static IR_SequenceDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_SequenceDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_SequenceDef_ptr _nil (void)
@@ -7273,7 +9326,7 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::ULong bound (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7282,7 +9335,7 @@ public:
virtual void bound (
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7290,7 +9343,7 @@ public:
));
virtual CORBA::TypeCode_ptr element_type (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7298,7 +9351,7 @@ public:
));
virtual IR_IDLType_ptr element_type_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7307,7 +9360,7 @@ public:
virtual void element_type_def (
IR_IDLType_ptr element_type_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7315,125 +9368,242 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_SequenceDef_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
+
protected:
- IR_SequenceDef (void);
- IR_SequenceDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_SequenceDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_SequenceDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_SequenceDef_Remote_Proxy_Impl;
+ friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_SequenceDef_Direct_Proxy_Impl;
+
virtual ~IR_SequenceDef (void);
private:
IR_SequenceDef (const IR_SequenceDef &);
- void operator= (const IR_SequenceDef &);
+ void operator= (const IR_SequenceDef &);
};
-class TAO_IR_SequenceDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_SequenceDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_SequenceDef_Default_Proxy_Factory (void);
- virtual IR_SequenceDef_ptr create_proxy (
- IR_SequenceDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_SequenceDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_SequenceDef_Proxy_Impl :
+ public virtual _TAO_IDLType_Proxy_Impl
{
public:
+ virtual ~_TAO_SequenceDef_Proxy_Impl (void) { }
+
+ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_SequenceDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_SequenceDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual CORBA::TypeCode_ptr element_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_IDLType_ptr element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_SequenceDef_ptr create_proxy (
- IR_SequenceDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_SequenceDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_SequenceDef_Proxy_Factory_Adapter (void);
- TAO_IR_SequenceDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_SequenceDef_Proxy_Factory_Adapter &
- );
- TAO_IR_SequenceDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_SequenceDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_SequenceDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_SequenceDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_SequenceDef_Smart_Proxy_Base : public virtual IR_SequenceDef
- {
- public:
- TAO_IR_SequenceDef_Smart_Proxy_Base (::IR_SequenceDef_ptr proxy);
- ~TAO_IR_SequenceDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::ULong bound (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_SequenceDef_Remote_Proxy_Impl :
+ public virtual _TAO_SequenceDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_SequenceDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_SequenceDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void bound (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong bound,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual CORBA::TypeCode_ptr element_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ virtual CORBA::TypeCode_ptr element_type(
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_IDLType_ptr element_type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void element_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr element_type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_SequenceDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_SequenceDef_Proxy_Broker (void);
+
+ virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
+ IR_SequenceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_SequenceDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_SequenceDef_Remote_Proxy_Broker : public virtual _TAO_SequenceDef_Proxy_Broker
+{
+public:
+ _TAO_SequenceDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_SequenceDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
+ IR_SequenceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_SequenceDef_var base_proxy_;
+ _TAO_SequenceDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_ArrayDef_Proxy_Impl;
+class _TAO_ArrayDef_Remote_Proxy_Impl;
+class _TAO_ArrayDef_Proxy_Broker;
+class _TAO_ArrayDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ArrayDef: public virtual IR_IDLType
{
public:
@@ -7446,12 +9616,12 @@ public:
static IR_ArrayDef_ptr _duplicate (IR_ArrayDef_ptr obj);
static IR_ArrayDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ArrayDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ArrayDef_ptr _nil (void)
@@ -7462,7 +9632,7 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::ULong length (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7471,7 +9641,7 @@ public:
virtual void length (
CORBA::ULong length,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7479,7 +9649,7 @@ public:
));
virtual CORBA::TypeCode_ptr element_type (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7487,7 +9657,7 @@ public:
));
virtual IR_IDLType_ptr element_type_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7496,7 +9666,7 @@ public:
virtual void element_type_def (
IR_IDLType_ptr element_type_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7504,126 +9674,244 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ArrayDef_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
+
protected:
- IR_ArrayDef (void);
- IR_ArrayDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ArrayDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ArrayDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+ friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+
virtual ~IR_ArrayDef (void);
private:
IR_ArrayDef (const IR_ArrayDef &);
- void operator= (const IR_ArrayDef &);
+ void operator= (const IR_ArrayDef &);
};
-class TAO_IR_ArrayDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_ArrayDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_ArrayDef_Default_Proxy_Factory (void);
- virtual IR_ArrayDef_ptr create_proxy (
- IR_ArrayDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_ArrayDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_ArrayDef_Proxy_Impl :
+ public virtual _TAO_IDLType_Proxy_Impl
{
public:
+ virtual ~_TAO_ArrayDef_Proxy_Impl (void) { }
+
+ virtual CORBA::ULong length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ArrayDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong length,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_ArrayDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual CORBA::TypeCode_ptr element_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_IDLType_ptr element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_ArrayDef_ptr create_proxy (
- IR_ArrayDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_ArrayDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ArrayDef_Proxy_Factory_Adapter (void);
- TAO_IR_ArrayDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ArrayDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ArrayDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_ArrayDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_ArrayDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ArrayDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ArrayDef_Smart_Proxy_Base : public virtual IR_ArrayDef
- {
- public:
- TAO_IR_ArrayDef_Smart_Proxy_Base (::IR_ArrayDef_ptr proxy);
- ~TAO_IR_ArrayDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::ULong length (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_ArrayDef_Remote_Proxy_Impl :
+ public virtual _TAO_ArrayDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ArrayDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ArrayDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::ULong length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void length (
+ CORBA_Object *_collocated_tao_target_,
CORBA::ULong length,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual CORBA::TypeCode_ptr element_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ virtual CORBA::TypeCode_ptr element_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR_IDLType_ptr element_type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ virtual IR_IDLType_ptr element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual void element_type_def (
+ virtual void element_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr element_type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ArrayDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ArrayDef_Proxy_Broker (void);
+
+ virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
+ IR_ArrayDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ArrayDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ArrayDef_Remote_Proxy_Broker : public virtual _TAO_ArrayDef_Proxy_Broker
+{
+public:
+ _TAO_ArrayDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ArrayDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
+ IR_ArrayDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_ArrayDef_var base_proxy_;
+ _TAO_ArrayDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void);
};
-class TAO_Export IR_ExceptionDef: public virtual IR_Contained, public virtual IR_Container
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_ExceptionDef_Proxy_Impl;
+class _TAO_ExceptionDef_Remote_Proxy_Impl;
+class _TAO_ExceptionDef_Proxy_Broker;
+class _TAO_ExceptionDef_Remote_Proxy_Broker;
+
+class TAO_Export IR_ExceptionDef
+ : public virtual IR_Contained,
+ public virtual IR_Container
{
public:
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -7635,12 +9923,12 @@ public:
static IR_ExceptionDef_ptr _duplicate (IR_ExceptionDef_ptr obj);
static IR_ExceptionDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ExceptionDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ExceptionDef_ptr _nil (void)
@@ -7651,7 +9939,7 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7659,7 +9947,7 @@ public:
));
virtual IR_StructMemberSeq * members (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7668,7 +9956,7 @@ public:
virtual void members (
const IR_StructMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -7676,108 +9964,203 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ExceptionDef_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
+
protected:
- IR_ExceptionDef (void);
- IR_ExceptionDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ExceptionDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ExceptionDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
+ friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
+
virtual ~IR_ExceptionDef (void);
private:
IR_ExceptionDef (const IR_ExceptionDef &);
- void operator= (const IR_ExceptionDef &);
+ void operator= (const IR_ExceptionDef &);
};
-class TAO_IR_ExceptionDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_ExceptionDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_ExceptionDef_Default_Proxy_Factory (void);
- virtual IR_ExceptionDef_ptr create_proxy (
- IR_ExceptionDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_ExceptionDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_ExceptionDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl,
+ public virtual _TAO_Container_Proxy_Impl
{
public:
+ virtual ~_TAO_ExceptionDef_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ExceptionDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_ExceptionDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_ExceptionDef_Proxy_Impl (void);
- IR_ExceptionDef_ptr create_proxy (
- IR_ExceptionDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
-protected:
- TAO_IR_ExceptionDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ExceptionDef_Proxy_Factory_Adapter (void);
- TAO_IR_ExceptionDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ExceptionDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ExceptionDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- typedef TAO_Singleton<TAO_IR_ExceptionDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ExceptionDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ExceptionDef_Smart_Proxy_Base : public virtual IR_ExceptionDef
- {
- public:
- TAO_IR_ExceptionDef_Smart_Proxy_Base (::IR_ExceptionDef_ptr proxy);
- ~TAO_IR_ExceptionDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_ExceptionDef_Remote_Proxy_Impl :
+ public virtual _TAO_ExceptionDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl,
+ public virtual _TAO_Container_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ExceptionDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ExceptionDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_StructMemberSeq * members (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void members (
+ CORBA_Object *_collocated_tao_target_,
const IR_StructMemberSeq & members,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ExceptionDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ExceptionDef_Proxy_Broker (void);
+
+ virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
+ IR_ExceptionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ExceptionDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ExceptionDef_Remote_Proxy_Broker : public virtual _TAO_ExceptionDef_Proxy_Broker
+{
+public:
+ _TAO_ExceptionDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ExceptionDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
+ IR_ExceptionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_ExceptionDef_var base_proxy_;
+ _TAO_ExceptionDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_ExceptionDescription
{
@@ -7801,18 +10184,18 @@ public:
IR_ExceptionDescription_var (IR_ExceptionDescription *);
IR_ExceptionDescription_var (const IR_ExceptionDescription_var &); // copy constructor
~IR_ExceptionDescription_var (void); // destructor
-
+
IR_ExceptionDescription_var &operator= (IR_ExceptionDescription *);
IR_ExceptionDescription_var &operator= (const IR_ExceptionDescription_var &);
IR_ExceptionDescription *operator-> (void);
const IR_ExceptionDescription *operator-> (void) const;
-
+
operator const IR_ExceptionDescription &() const;
operator IR_ExceptionDescription &();
operator IR_ExceptionDescription &() const;
operator IR_ExceptionDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ExceptionDescription &in (void) const;
IR_ExceptionDescription &inout (void);
IR_ExceptionDescription *&out (void);
@@ -7834,7 +10217,7 @@ public:
operator IR_ExceptionDescription *&();
IR_ExceptionDescription *&ptr (void);
IR_ExceptionDescription *operator-> (void);
-
+
private:
IR_ExceptionDescription *&ptr_;
// assignment from T_var not allowed
@@ -7842,12 +10225,12 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void);
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum);
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
@@ -7869,34 +10252,34 @@ private:
virtual void _downcast (
void* target,
CORBA_Object *src,
- CORBA_Environment &ACE_TRY_ENV =
+ CORBA_Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
virtual CORBA_Object* _upcast (void *src) const;
-
+
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ExceptionDefSeq
// *************************************************************
-class TAO_Export IR_ExceptionDefSeq : public
+class TAO_Export IR_ExceptionDefSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ExceptionDefSeq (void); // default ctor
IR_ExceptionDefSeq (CORBA::ULong max); // uses max size
IR_ExceptionDefSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ExceptionDef_ptr *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ExceptionDef_ptr *buffer,
+ CORBA::Boolean release = 0
);
IR_ExceptionDefSeq (const IR_ExceptionDefSeq &); // copy ctor
~IR_ExceptionDefSeq (void);
@@ -7919,19 +10302,20 @@ public:
IR_ExceptionDefSeq_var (IR_ExceptionDefSeq *);
IR_ExceptionDefSeq_var (const IR_ExceptionDefSeq_var &); // copy constructor
~IR_ExceptionDefSeq_var (void); // destructor
-
+
IR_ExceptionDefSeq_var &operator= (IR_ExceptionDefSeq *);
IR_ExceptionDefSeq_var &operator= (const IR_ExceptionDefSeq_var &);
IR_ExceptionDefSeq *operator-> (void);
const IR_ExceptionDefSeq *operator-> (void) const;
-
+
operator const IR_ExceptionDefSeq &() const;
operator IR_ExceptionDefSeq &();
operator IR_ExceptionDefSeq &() const;
operator IR_ExceptionDefSeq *&(); // variable-size base types only
-
+
TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ExceptionDefSeq &in (void) const;
IR_ExceptionDefSeq &inout (void);
IR_ExceptionDefSeq *&out (void);
@@ -7954,7 +10338,7 @@ public:
IR_ExceptionDefSeq *&ptr (void);
IR_ExceptionDefSeq *operator-> (void);
TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> operator[] (CORBA::ULong index);
-
+
private:
IR_ExceptionDefSeq *&ptr_;
// assignment from T_var not allowed
@@ -7962,14 +10346,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ExceptionDescription *data,
@@ -7986,7 +10370,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
const IR_ExceptionDescription *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -7995,27 +10379,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ExcDescriptionSeq
// *************************************************************
-class TAO_Export IR_ExcDescriptionSeq : public
+class TAO_Export IR_ExcDescriptionSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ExceptionDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ExcDescriptionSeq (void); // default ctor
IR_ExcDescriptionSeq (CORBA::ULong max); // uses max size
IR_ExcDescriptionSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ExceptionDescription *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ExceptionDescription *buffer,
+ CORBA::Boolean release = 0
);
IR_ExcDescriptionSeq (const IR_ExcDescriptionSeq &); // copy ctor
~IR_ExcDescriptionSeq (void);
@@ -8038,19 +10422,21 @@ public:
IR_ExcDescriptionSeq_var (IR_ExcDescriptionSeq *);
IR_ExcDescriptionSeq_var (const IR_ExcDescriptionSeq_var &); // copy constructor
~IR_ExcDescriptionSeq_var (void); // destructor
-
+
IR_ExcDescriptionSeq_var &operator= (IR_ExcDescriptionSeq *);
IR_ExcDescriptionSeq_var &operator= (const IR_ExcDescriptionSeq_var &);
IR_ExcDescriptionSeq *operator-> (void);
const IR_ExcDescriptionSeq *operator-> (void) const;
-
+
operator const IR_ExcDescriptionSeq &() const;
operator IR_ExcDescriptionSeq &();
operator IR_ExcDescriptionSeq &() const;
operator IR_ExcDescriptionSeq *&(); // variable-size base types only
-
- IR_ExceptionDescription &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_ExceptionDescription & operator[] (CORBA::ULong index);
+ const IR_ExceptionDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_ExcDescriptionSeq &in (void) const;
IR_ExcDescriptionSeq &inout (void);
IR_ExcDescriptionSeq *&out (void);
@@ -8072,29 +10458,35 @@ public:
operator IR_ExcDescriptionSeq *&();
IR_ExcDescriptionSeq *&ptr (void);
IR_ExcDescriptionSeq *operator-> (void);
- IR_ExceptionDescription &operator[] (CORBA::ULong index);
-
+ IR_ExceptionDescription & operator[] (CORBA::ULong index);
+
private:
IR_ExcDescriptionSeq *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_ExcDescriptionSeq_var &);
};
+enum IR_AttributeMode
+{
+ ATTR_NORMAL,
+ ATTR_READONLY
+};
+
class TAO_Export IR_AttributeDef_var : public TAO_Base_var
{
public:
IR_AttributeDef_var (void); // default constructor
- IR_AttributeDef_var (IR_AttributeDef_ptr);
+ IR_AttributeDef_var (IR_AttributeDef_ptr p) : ptr_ (p) {}
IR_AttributeDef_var (const IR_AttributeDef_var &); // copy constructor
~IR_AttributeDef_var (void); // destructor
-
+
IR_AttributeDef_var &operator= (IR_AttributeDef_ptr);
IR_AttributeDef_var &operator= (const IR_AttributeDef_var &);
IR_AttributeDef_ptr operator-> (void) const;
-
+
operator const IR_AttributeDef_ptr &() const;
operator IR_AttributeDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_AttributeDef_ptr in (void) const;
IR_AttributeDef_ptr &inout (void);
IR_AttributeDef_ptr &out (void);
@@ -8120,11 +10512,17 @@ public:
operator IR_AttributeDef_ptr &();
IR_AttributeDef_ptr &ptr (void);
IR_AttributeDef_ptr operator-> (void);
-
+
private:
IR_AttributeDef_ptr &ptr_;
};
+// Forward Classes Declaration
+class _TAO_AttributeDef_Proxy_Impl;
+class _TAO_AttributeDef_Remote_Proxy_Impl;
+class _TAO_AttributeDef_Proxy_Broker;
+class _TAO_AttributeDef_Remote_Proxy_Broker;
+
class TAO_Export IR_AttributeDef: public virtual IR_Contained
{
public:
@@ -8137,12 +10535,12 @@ public:
static IR_AttributeDef_ptr _duplicate (IR_AttributeDef_ptr obj);
static IR_AttributeDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_AttributeDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_AttributeDef_ptr _nil (void)
@@ -8153,7 +10551,7 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8161,7 +10559,7 @@ public:
));
virtual IR_IDLType_ptr type_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8170,15 +10568,15 @@ public:
virtual void type_def (
IR_IDLType_ptr type_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR::AttributeMode mode (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_AttributeMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8186,8 +10584,8 @@ public:
));
virtual void mode (
- IR::AttributeMode mode,
- CORBA::Environment &ACE_TRY_ENV =
+ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8195,125 +10593,235 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_AttributeDef_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
+
protected:
- IR_AttributeDef (void);
- IR_AttributeDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_AttributeDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_AttributeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+ friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+
virtual ~IR_AttributeDef (void);
private:
IR_AttributeDef (const IR_AttributeDef &);
- void operator= (const IR_AttributeDef &);
+ void operator= (const IR_AttributeDef &);
};
-class TAO_IR_AttributeDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_AttributeDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_AttributeDef_Default_Proxy_Factory (void);
- virtual IR_AttributeDef_ptr create_proxy (
- IR_AttributeDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_AttributeDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_AttributeDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl
{
public:
+ virtual ~_TAO_AttributeDef_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_AttributeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_AttributeDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_AttributeMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_AttributeDef_ptr create_proxy (
- IR_AttributeDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void mode (
+ CORBA_Object *_collocated_tao_target_,
+ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_AttributeDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_AttributeDef_Proxy_Factory_Adapter (void);
- TAO_IR_AttributeDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_AttributeDef_Proxy_Factory_Adapter &
- );
- TAO_IR_AttributeDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_AttributeDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_AttributeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_AttributeDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_AttributeDef_Smart_Proxy_Base : public virtual IR_AttributeDef
- {
- public:
- TAO_IR_AttributeDef_Smart_Proxy_Base (::IR_AttributeDef_ptr proxy);
- ~TAO_IR_AttributeDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_AttributeDef_Remote_Proxy_Impl :
+ public virtual _TAO_AttributeDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_AttributeDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_AttributeDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_IDLType_ptr type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR::AttributeMode mode (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ virtual IR_AttributeMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void mode (
- IR::AttributeMode mode,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_AttributeDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_AttributeDef_Proxy_Broker (void);
+
+ virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
+ IR_AttributeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_AttributeDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_AttributeDef_Remote_Proxy_Broker : public virtual _TAO_AttributeDef_Proxy_Broker
+{
+public:
+ _TAO_AttributeDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_AttributeDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
+ IR_AttributeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_AttributeDef_var base_proxy_;
+ _TAO_AttributeDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_AttributeDescription
{
@@ -8328,7 +10836,7 @@ struct TAO_Export IR_AttributeDescription
TAO_String_Manager defined_in;
TAO_String_Manager version;
CORBA::TypeCode_var type;
- IR::AttributeMode mode;
+ IR_AttributeMode mode;
IR_ExcDescriptionSeq get_exceptions;
IR_ExcDescriptionSeq put_exceptions;
};
@@ -8340,18 +10848,18 @@ public:
IR_AttributeDescription_var (IR_AttributeDescription *);
IR_AttributeDescription_var (const IR_AttributeDescription_var &); // copy constructor
~IR_AttributeDescription_var (void); // destructor
-
+
IR_AttributeDescription_var &operator= (IR_AttributeDescription *);
IR_AttributeDescription_var &operator= (const IR_AttributeDescription_var &);
IR_AttributeDescription *operator-> (void);
const IR_AttributeDescription *operator-> (void) const;
-
+
operator const IR_AttributeDescription &() const;
operator IR_AttributeDescription &();
operator IR_AttributeDescription &() const;
operator IR_AttributeDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_AttributeDescription &in (void) const;
IR_AttributeDescription &inout (void);
IR_AttributeDescription *&out (void);
@@ -8373,13 +10881,26 @@ public:
operator IR_AttributeDescription *&();
IR_AttributeDescription *&ptr (void);
IR_AttributeDescription *operator-> (void);
-
+
private:
IR_AttributeDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_AttributeDescription_var &);
};
+enum IR_OperationMode
+ {
+ OP_NORMAL,
+ OP_ONEWAY
+ };
+
+enum IR_ParameterMode
+ {
+ PARAM_IN,
+ PARAM_OUT,
+ PARAM_INOUT
+ };
+
struct TAO_Export IR_ParameterDescription
{
@@ -8392,7 +10913,7 @@ struct TAO_Export IR_ParameterDescription
TAO_String_Manager name;
CORBA::TypeCode_var type;
IR_IDLType_var type_def;
- IR::ParameterMode mode;
+ IR_ParameterMode mode;
};
class TAO_Export IR_ParameterDescription_var
@@ -8402,18 +10923,18 @@ public:
IR_ParameterDescription_var (IR_ParameterDescription *);
IR_ParameterDescription_var (const IR_ParameterDescription_var &); // copy constructor
~IR_ParameterDescription_var (void); // destructor
-
+
IR_ParameterDescription_var &operator= (IR_ParameterDescription *);
IR_ParameterDescription_var &operator= (const IR_ParameterDescription_var &);
IR_ParameterDescription *operator-> (void);
const IR_ParameterDescription *operator-> (void) const;
-
+
operator const IR_ParameterDescription &() const;
operator IR_ParameterDescription &();
operator IR_ParameterDescription &() const;
operator IR_ParameterDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ParameterDescription &in (void) const;
IR_ParameterDescription &inout (void);
IR_ParameterDescription *&out (void);
@@ -8435,7 +10956,7 @@ public:
operator IR_ParameterDescription *&();
IR_ParameterDescription *&ptr (void);
IR_ParameterDescription *operator-> (void);
-
+
private:
IR_ParameterDescription *&ptr_;
// assignment from T_var not allowed
@@ -8443,14 +10964,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ParDescriptionSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ParameterDescription *data,
@@ -8467,7 +10988,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
const IR_ParameterDescription *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -8476,27 +10997,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ParDescriptionSeq
// *************************************************************
-class TAO_Export IR_ParDescriptionSeq : public
+class TAO_Export IR_ParDescriptionSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ParDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ParameterDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ParDescriptionSeq (void); // default ctor
IR_ParDescriptionSeq (CORBA::ULong max); // uses max size
IR_ParDescriptionSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ParameterDescription *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ParameterDescription *buffer,
+ CORBA::Boolean release = 0
);
IR_ParDescriptionSeq (const IR_ParDescriptionSeq &); // copy ctor
~IR_ParDescriptionSeq (void);
@@ -8519,19 +11040,21 @@ public:
IR_ParDescriptionSeq_var (IR_ParDescriptionSeq *);
IR_ParDescriptionSeq_var (const IR_ParDescriptionSeq_var &); // copy constructor
~IR_ParDescriptionSeq_var (void); // destructor
-
+
IR_ParDescriptionSeq_var &operator= (IR_ParDescriptionSeq *);
IR_ParDescriptionSeq_var &operator= (const IR_ParDescriptionSeq_var &);
IR_ParDescriptionSeq *operator-> (void);
const IR_ParDescriptionSeq *operator-> (void) const;
-
+
operator const IR_ParDescriptionSeq &() const;
operator IR_ParDescriptionSeq &();
operator IR_ParDescriptionSeq &() const;
operator IR_ParDescriptionSeq *&(); // variable-size base types only
-
- IR_ParameterDescription &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_ParameterDescription & operator[] (CORBA::ULong index);
+ const IR_ParameterDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_ParDescriptionSeq &in (void) const;
IR_ParDescriptionSeq &inout (void);
IR_ParDescriptionSeq *&out (void);
@@ -8553,8 +11076,8 @@ public:
operator IR_ParDescriptionSeq *&();
IR_ParDescriptionSeq *&ptr (void);
IR_ParDescriptionSeq *operator-> (void);
- IR_ParameterDescription &operator[] (CORBA::ULong index);
-
+ IR_ParameterDescription & operator[] (CORBA::ULong index);
+
private:
IR_ParDescriptionSeq *&ptr_;
// assignment from T_var not allowed
@@ -8565,21 +11088,21 @@ private:
// IR_ContextIdSeq
// *************************************************************
-class TAO_Export IR_ContextIdSeq : public
+class TAO_Export IR_ContextIdSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ContextIdSeq (void); // default ctor
IR_ContextIdSeq (CORBA::ULong max); // uses max size
IR_ContextIdSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- char * *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
+ CORBA::Boolean release = 0
);
IR_ContextIdSeq (const IR_ContextIdSeq &); // copy ctor
~IR_ContextIdSeq (void);
@@ -8602,19 +11125,20 @@ public:
IR_ContextIdSeq_var (IR_ContextIdSeq *);
IR_ContextIdSeq_var (const IR_ContextIdSeq_var &); // copy constructor
~IR_ContextIdSeq_var (void); // destructor
-
+
IR_ContextIdSeq_var &operator= (IR_ContextIdSeq *);
IR_ContextIdSeq_var &operator= (const IR_ContextIdSeq_var &);
IR_ContextIdSeq *operator-> (void);
const IR_ContextIdSeq *operator-> (void) const;
-
+
operator const IR_ContextIdSeq &() const;
operator IR_ContextIdSeq &();
operator IR_ContextIdSeq &() const;
operator IR_ContextIdSeq *&(); // variable-size base types only
-
+
TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ContextIdSeq &in (void) const;
IR_ContextIdSeq &inout (void);
IR_ContextIdSeq *&out (void);
@@ -8637,7 +11161,7 @@ public:
IR_ContextIdSeq *&ptr (void);
IR_ContextIdSeq *operator-> (void);
TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
+
private:
IR_ContextIdSeq *&ptr_;
// assignment from T_var not allowed
@@ -8648,17 +11172,17 @@ class TAO_Export IR_OperationDef_var : public TAO_Base_var
{
public:
IR_OperationDef_var (void); // default constructor
- IR_OperationDef_var (IR_OperationDef_ptr);
+ IR_OperationDef_var (IR_OperationDef_ptr p) : ptr_ (p) {}
IR_OperationDef_var (const IR_OperationDef_var &); // copy constructor
~IR_OperationDef_var (void); // destructor
-
+
IR_OperationDef_var &operator= (IR_OperationDef_ptr);
IR_OperationDef_var &operator= (const IR_OperationDef_var &);
IR_OperationDef_ptr operator-> (void) const;
-
+
operator const IR_OperationDef_ptr &() const;
operator IR_OperationDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_OperationDef_ptr in (void) const;
IR_OperationDef_ptr &inout (void);
IR_OperationDef_ptr &out (void);
@@ -8684,11 +11208,17 @@ public:
operator IR_OperationDef_ptr &();
IR_OperationDef_ptr &ptr (void);
IR_OperationDef_ptr operator-> (void);
-
+
private:
IR_OperationDef_ptr &ptr_;
};
+// Forward Classes Declaration
+class _TAO_OperationDef_Proxy_Impl;
+class _TAO_OperationDef_Remote_Proxy_Impl;
+class _TAO_OperationDef_Proxy_Broker;
+class _TAO_OperationDef_Remote_Proxy_Broker;
+
class TAO_Export IR_OperationDef: public virtual IR_Contained
{
public:
@@ -8701,12 +11231,12 @@ public:
static IR_OperationDef_ptr _duplicate (IR_OperationDef_ptr obj);
static IR_OperationDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_OperationDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_OperationDef_ptr _nil (void)
@@ -8716,8 +11246,8 @@ public:
static void _tao_any_destructor (void*);
- virtual CORBA::TypeCode_ptr result (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual CORBA::TypeCode_ptr result (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8725,7 +11255,7 @@ public:
));
virtual IR_IDLType_ptr result_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8734,7 +11264,7 @@ public:
virtual void result_def (
IR_IDLType_ptr result_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8742,7 +11272,7 @@ public:
));
virtual IR_ParDescriptionSeq * params (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8751,15 +11281,15 @@ public:
virtual void params (
const IR_ParDescriptionSeq & params,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR::OperationMode mode (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_OperationMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8767,8 +11297,8 @@ public:
));
virtual void mode (
- IR::OperationMode mode,
- CORBA::Environment &ACE_TRY_ENV =
+ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8776,7 +11306,7 @@ public:
));
virtual IR_ContextIdSeq * contexts (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8785,7 +11315,7 @@ public:
virtual void contexts (
const IR_ContextIdSeq & contexts,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8793,7 +11323,7 @@ public:
));
virtual IR_ExceptionDefSeq * exceptions (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8802,7 +11332,7 @@ public:
virtual void exceptions (
const IR_ExceptionDefSeq & exceptions,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -8810,176 +11340,337 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_OperationDef_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
+
protected:
- IR_OperationDef (void);
- IR_OperationDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_OperationDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_OperationDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_OperationDef_Direct_Proxy_Impl;
+
virtual ~IR_OperationDef (void);
private:
IR_OperationDef (const IR_OperationDef &);
- void operator= (const IR_OperationDef &);
+ void operator= (const IR_OperationDef &);
};
-class TAO_IR_OperationDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_OperationDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_OperationDef_Default_Proxy_Factory (void);
- virtual IR_OperationDef_ptr create_proxy (
- IR_OperationDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_OperationDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_OperationDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl
{
public:
+ virtual ~_TAO_OperationDef_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr result (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_OperationDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_IDLType_ptr result_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_OperationDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void result_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_ParDescriptionSeq * params (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_OperationDef_ptr create_proxy (
- IR_OperationDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void params (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_OperationMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void mode (
+ CORBA_Object *_collocated_tao_target_,
+ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ContextIdSeq * contexts (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void contexts (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ExceptionDefSeq * exceptions (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void exceptions (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_OperationDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_OperationDef_Proxy_Factory_Adapter (void);
- TAO_IR_OperationDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_OperationDef_Proxy_Factory_Adapter &
- );
- TAO_IR_OperationDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_OperationDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_OperationDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_OperationDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_OperationDef_Smart_Proxy_Base : public virtual IR_OperationDef
- {
- public:
- TAO_IR_OperationDef_Smart_Proxy_Base (::IR_OperationDef_ptr proxy);
- ~TAO_IR_OperationDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::TypeCode_ptr result (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_OperationDef_Remote_Proxy_Impl :
+ public virtual _TAO_OperationDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_OperationDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_OperationDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr result (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_IDLType_ptr result_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void result_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr result_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ParDescriptionSeq * params (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void params (
+ CORBA_Object *_collocated_tao_target_,
const IR_ParDescriptionSeq & params,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR::OperationMode mode (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ virtual IR_OperationMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void mode (
- IR::OperationMode mode,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ContextIdSeq * contexts (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void contexts (
+ CORBA_Object *_collocated_tao_target_,
const IR_ContextIdSeq & contexts,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ExceptionDefSeq * exceptions (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void exceptions (
+ CORBA_Object *_collocated_tao_target_,
const IR_ExceptionDefSeq & exceptions,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_OperationDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_OperationDef_Proxy_Broker (void);
+
+ virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
+ IR_OperationDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_OperationDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_OperationDef_Remote_Proxy_Broker : public virtual _TAO_OperationDef_Proxy_Broker
+{
+public:
+ _TAO_OperationDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_OperationDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
+ IR_OperationDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_OperationDef_var base_proxy_;
+ _TAO_OperationDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_OperationDescription
{
@@ -8994,7 +11685,7 @@ struct TAO_Export IR_OperationDescription
TAO_String_Manager defined_in;
TAO_String_Manager version;
CORBA::TypeCode_var result;
- IR::OperationMode mode;
+ IR_OperationMode mode;
IR_ContextIdSeq contexts;
IR_ParDescriptionSeq parameters;
IR_ExcDescriptionSeq exceptions;
@@ -9007,18 +11698,18 @@ public:
IR_OperationDescription_var (IR_OperationDescription *);
IR_OperationDescription_var (const IR_OperationDescription_var &); // copy constructor
~IR_OperationDescription_var (void); // destructor
-
+
IR_OperationDescription_var &operator= (IR_OperationDescription *);
IR_OperationDescription_var &operator= (const IR_OperationDescription_var &);
IR_OperationDescription *operator-> (void);
const IR_OperationDescription *operator-> (void) const;
-
+
operator const IR_OperationDescription &() const;
operator IR_OperationDescription &();
operator IR_OperationDescription &() const;
operator IR_OperationDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_OperationDescription &in (void) const;
IR_OperationDescription &inout (void);
IR_OperationDescription *&out (void);
@@ -9040,7 +11731,7 @@ public:
operator IR_OperationDescription *&();
IR_OperationDescription *&ptr (void);
IR_OperationDescription *operator-> (void);
-
+
private:
IR_OperationDescription *&ptr_;
// assignment from T_var not allowed
@@ -9051,21 +11742,21 @@ private:
// IR_RepositoryIdSeq
// *************************************************************
-class TAO_Export IR_RepositoryIdSeq : public
+class TAO_Export IR_RepositoryIdSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
TAO_Unbounded_String_Sequence
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_String_Sequence
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_RepositoryIdSeq (void); // default ctor
IR_RepositoryIdSeq (CORBA::ULong max); // uses max size
IR_RepositoryIdSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- char * *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
+ CORBA::Boolean release = 0
);
IR_RepositoryIdSeq (const IR_RepositoryIdSeq &); // copy ctor
~IR_RepositoryIdSeq (void);
@@ -9088,19 +11779,20 @@ public:
IR_RepositoryIdSeq_var (IR_RepositoryIdSeq *);
IR_RepositoryIdSeq_var (const IR_RepositoryIdSeq_var &); // copy constructor
~IR_RepositoryIdSeq_var (void); // destructor
-
+
IR_RepositoryIdSeq_var &operator= (IR_RepositoryIdSeq *);
IR_RepositoryIdSeq_var &operator= (const IR_RepositoryIdSeq_var &);
IR_RepositoryIdSeq *operator-> (void);
const IR_RepositoryIdSeq *operator-> (void) const;
-
+
operator const IR_RepositoryIdSeq &() const;
operator IR_RepositoryIdSeq &();
operator IR_RepositoryIdSeq &() const;
operator IR_RepositoryIdSeq *&(); // variable-size base types only
-
+
TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_RepositoryIdSeq &in (void) const;
IR_RepositoryIdSeq &inout (void);
IR_RepositoryIdSeq *&out (void);
@@ -9123,7 +11815,7 @@ public:
IR_RepositoryIdSeq *&ptr (void);
IR_RepositoryIdSeq *operator-> (void);
TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
-
+
private:
IR_RepositoryIdSeq *&ptr_;
// assignment from T_var not allowed
@@ -9131,14 +11823,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_OpDescriptionSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_OperationDescription *data,
@@ -9155,7 +11847,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
const IR_OperationDescription *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -9164,27 +11856,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_OpDescriptionSeq
// *************************************************************
-class TAO_Export IR_OpDescriptionSeq : public
+class TAO_Export IR_OpDescriptionSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_OpDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_OperationDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_OpDescriptionSeq (void); // default ctor
IR_OpDescriptionSeq (CORBA::ULong max); // uses max size
IR_OpDescriptionSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_OperationDescription *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_OperationDescription *buffer,
+ CORBA::Boolean release = 0
);
IR_OpDescriptionSeq (const IR_OpDescriptionSeq &); // copy ctor
~IR_OpDescriptionSeq (void);
@@ -9207,19 +11899,21 @@ public:
IR_OpDescriptionSeq_var (IR_OpDescriptionSeq *);
IR_OpDescriptionSeq_var (const IR_OpDescriptionSeq_var &); // copy constructor
~IR_OpDescriptionSeq_var (void); // destructor
-
+
IR_OpDescriptionSeq_var &operator= (IR_OpDescriptionSeq *);
IR_OpDescriptionSeq_var &operator= (const IR_OpDescriptionSeq_var &);
IR_OpDescriptionSeq *operator-> (void);
const IR_OpDescriptionSeq *operator-> (void) const;
-
+
operator const IR_OpDescriptionSeq &() const;
operator IR_OpDescriptionSeq &();
operator IR_OpDescriptionSeq &() const;
operator IR_OpDescriptionSeq *&(); // variable-size base types only
-
- IR_OperationDescription &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_OperationDescription & operator[] (CORBA::ULong index);
+ const IR_OperationDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_OpDescriptionSeq &in (void) const;
IR_OpDescriptionSeq &inout (void);
IR_OpDescriptionSeq *&out (void);
@@ -9241,8 +11935,8 @@ public:
operator IR_OpDescriptionSeq *&();
IR_OpDescriptionSeq *&ptr (void);
IR_OpDescriptionSeq *operator-> (void);
- IR_OperationDescription &operator[] (CORBA::ULong index);
-
+ IR_OperationDescription & operator[] (CORBA::ULong index);
+
private:
IR_OpDescriptionSeq *&ptr_;
// assignment from T_var not allowed
@@ -9250,14 +11944,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_AttributeDescription *data,
@@ -9274,7 +11968,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
const IR_AttributeDescription *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -9283,27 +11977,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_AttrDescriptionSeq
// *************************************************************
-class TAO_Export IR_AttrDescriptionSeq : public
+class TAO_Export IR_AttrDescriptionSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_AttributeDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_AttrDescriptionSeq (void); // default ctor
IR_AttrDescriptionSeq (CORBA::ULong max); // uses max size
IR_AttrDescriptionSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_AttributeDescription *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_AttributeDescription *buffer,
+ CORBA::Boolean release = 0
);
IR_AttrDescriptionSeq (const IR_AttrDescriptionSeq &); // copy ctor
~IR_AttrDescriptionSeq (void);
@@ -9315,6 +12009,7 @@ public:
};
+
// *************************************************************
// class IR_AttrDescriptionSeq_var
// *************************************************************
@@ -9326,19 +12021,21 @@ public:
IR_AttrDescriptionSeq_var (IR_AttrDescriptionSeq *);
IR_AttrDescriptionSeq_var (const IR_AttrDescriptionSeq_var &); // copy constructor
~IR_AttrDescriptionSeq_var (void); // destructor
-
+
IR_AttrDescriptionSeq_var &operator= (IR_AttrDescriptionSeq *);
IR_AttrDescriptionSeq_var &operator= (const IR_AttrDescriptionSeq_var &);
IR_AttrDescriptionSeq *operator-> (void);
const IR_AttrDescriptionSeq *operator-> (void) const;
-
+
operator const IR_AttrDescriptionSeq &() const;
operator IR_AttrDescriptionSeq &();
operator IR_AttrDescriptionSeq &() const;
operator IR_AttrDescriptionSeq *&(); // variable-size base types only
-
- IR_AttributeDescription &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_AttributeDescription & operator[] (CORBA::ULong index);
+ const IR_AttributeDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_AttrDescriptionSeq &in (void) const;
IR_AttrDescriptionSeq &inout (void);
IR_AttrDescriptionSeq *&out (void);
@@ -9360,14 +12057,20 @@ public:
operator IR_AttrDescriptionSeq *&();
IR_AttrDescriptionSeq *&ptr (void);
IR_AttrDescriptionSeq *operator-> (void);
- IR_AttributeDescription &operator[] (CORBA::ULong index);
-
+ IR_AttributeDescription & operator[] (CORBA::ULong index);
+
private:
IR_AttrDescriptionSeq *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_AttrDescriptionSeq_var &);
};
+// Forward Classes Declaration
+class _TAO_InterfaceDef_Proxy_Impl;
+class _TAO_InterfaceDef_Remote_Proxy_Impl;
+class _TAO_InterfaceDef_Proxy_Broker;
+class _TAO_InterfaceDef_Remote_Proxy_Broker;
+
class TAO_Export IR_InterfaceDef: public virtual IR_Container, public virtual IR_Contained, public virtual IR_IDLType
{
public:
@@ -9380,12 +12083,12 @@ public:
static IR_InterfaceDef_ptr _duplicate (IR_InterfaceDef_ptr obj);
static IR_InterfaceDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_InterfaceDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_InterfaceDef_ptr _nil (void)
@@ -9396,7 +12099,7 @@ public:
static void _tao_any_destructor (void*);
virtual IR_InterfaceDefSeq * base_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9405,7 +12108,7 @@ public:
virtual void base_interfaces (
const IR_InterfaceDefSeq & base_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9413,7 +12116,7 @@ public:
));
virtual CORBA::Boolean is_abstract (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9422,7 +12125,7 @@ public:
virtual void is_abstract (
CORBA::Boolean is_abstract,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9430,7 +12133,7 @@ public:
));
virtual CORBA::Boolean is_local (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9439,7 +12142,7 @@ public:
virtual void is_local (
CORBA::Boolean is_local,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9448,7 +12151,7 @@ public:
virtual CORBA::Boolean is_a (
const char * interface_id,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9460,10 +12163,10 @@ public:
const char * name,
const char * version,
IR_IDLType_ptr type,
- IR::AttributeMode mode,
+ IR_AttributeMode mode,
const IR_ExceptionDefSeq & get_exceptions,
const IR_ExceptionDefSeq & put_exceptions,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9475,11 +12178,11 @@ public:
const char * name,
const char * version,
IR_IDLType_ptr result,
- IR::OperationMode mode,
+ IR_OperationMode mode,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
const IR_ContextIdSeq & contexts,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9487,174 +12190,337 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_InterfaceDef_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
+
protected:
- IR_InterfaceDef (void);
- IR_InterfaceDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_InterfaceDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_InterfaceDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+ friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+
virtual ~IR_InterfaceDef (void);
private:
IR_InterfaceDef (const IR_InterfaceDef &);
- void operator= (const IR_InterfaceDef &);
+ void operator= (const IR_InterfaceDef &);
};
-class TAO_IR_InterfaceDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_InterfaceDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_InterfaceDef_Default_Proxy_Factory (void);
- virtual IR_InterfaceDef_ptr create_proxy (
- IR_InterfaceDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_InterfaceDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_InterfaceDef_Proxy_Impl :
+ public virtual _TAO_Container_Proxy_Impl,
+ public virtual _TAO_Contained_Proxy_Impl,
+ public virtual _TAO_IDLType_Proxy_Impl
{
public:
+ virtual ~_TAO_InterfaceDef_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDefSeq * base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_InterfaceDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_InterfaceDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual CORBA::Boolean is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_InterfaceDef_ptr create_proxy (
- IR_InterfaceDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual CORBA::Boolean is_local (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void is_local (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * interface_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_AttributeDef_ptr create_attribute (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr type,
+ IR_AttributeMode mode,
+ const IR_ExceptionDefSeq & get_exceptions,
+ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_OperationDef_ptr create_operation (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr result,
+ IR_OperationMode mode,
+ const IR_ParDescriptionSeq & params,
+ const IR_ExceptionDefSeq & exceptions,
+ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_InterfaceDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_InterfaceDef_Proxy_Factory_Adapter (void);
- TAO_IR_InterfaceDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_InterfaceDef_Proxy_Factory_Adapter &
- );
- TAO_IR_InterfaceDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_InterfaceDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_InterfaceDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_InterfaceDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_InterfaceDef_Smart_Proxy_Base : public virtual IR_InterfaceDef
- {
- public:
- TAO_IR_InterfaceDef_Smart_Proxy_Base (::IR_InterfaceDef_ptr proxy);
- ~TAO_IR_InterfaceDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_InterfaceDefSeq * base_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_InterfaceDef_Remote_Proxy_Impl :
+ public virtual _TAO_InterfaceDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Container_Remote_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_InterfaceDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_InterfaceDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDefSeq * base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
const IR_InterfaceDefSeq & base_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_abstract (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void is_abstract (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_abstract,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_local (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void is_local (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_local,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
const char * interface_id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_AttributeDef_ptr create_attribute (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr type,
- IR::AttributeMode mode,
+ IR_AttributeMode mode,
const IR_ExceptionDefSeq & get_exceptions,
const IR_ExceptionDefSeq & put_exceptions,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_OperationDef_ptr create_operation (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr result,
- IR::OperationMode mode,
+ IR_OperationMode mode,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
const IR_ContextIdSeq & contexts,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_InterfaceDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_InterfaceDef_Proxy_Broker (void);
+
+ virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
+ IR_InterfaceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_InterfaceDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_InterfaceDef_Remote_Proxy_Broker : public virtual _TAO_InterfaceDef_Proxy_Broker
+{
+public:
+ _TAO_InterfaceDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_InterfaceDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
+ IR_InterfaceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_InterfaceDef_var base_proxy_;
+ _TAO_InterfaceDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_InterfaceDescription
{
@@ -9683,18 +12549,18 @@ public:
IR_InterfaceDescription_var (IR_InterfaceDescription *);
IR_InterfaceDescription_var (const IR_InterfaceDescription_var &); // copy constructor
~IR_InterfaceDescription_var (void); // destructor
-
+
IR_InterfaceDescription_var &operator= (IR_InterfaceDescription *);
IR_InterfaceDescription_var &operator= (const IR_InterfaceDescription_var &);
IR_InterfaceDescription *operator-> (void);
const IR_InterfaceDescription *operator-> (void) const;
-
+
operator const IR_InterfaceDescription &() const;
operator IR_InterfaceDescription &();
operator IR_InterfaceDescription &() const;
operator IR_InterfaceDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_InterfaceDescription &in (void) const;
IR_InterfaceDescription &inout (void);
IR_InterfaceDescription *&out (void);
@@ -9716,7 +12582,7 @@ public:
operator IR_InterfaceDescription *&();
IR_InterfaceDescription *&ptr (void);
IR_InterfaceDescription *operator-> (void);
-
+
private:
IR_InterfaceDescription *&ptr_;
// assignment from T_var not allowed
@@ -9748,18 +12614,18 @@ public:
IR_ValueMember_var (IR_ValueMember *);
IR_ValueMember_var (const IR_ValueMember_var &); // copy constructor
~IR_ValueMember_var (void); // destructor
-
+
IR_ValueMember_var &operator= (IR_ValueMember *);
IR_ValueMember_var &operator= (const IR_ValueMember_var &);
IR_ValueMember *operator-> (void);
const IR_ValueMember *operator-> (void) const;
-
+
operator const IR_ValueMember &() const;
operator IR_ValueMember &();
operator IR_ValueMember &() const;
operator IR_ValueMember *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ValueMember &in (void) const;
IR_ValueMember &inout (void);
IR_ValueMember *&out (void);
@@ -9781,7 +12647,7 @@ public:
operator IR_ValueMember *&();
IR_ValueMember *&ptr (void);
IR_ValueMember *operator-> (void);
-
+
private:
IR_ValueMember *&ptr_;
// assignment from T_var not allowed
@@ -9789,14 +12655,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ValueMemberSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ValueMember *data,
@@ -9813,7 +12679,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_ValueMember *get_buffer (CORBA::Boolean orphan = 0);
const IR_ValueMember *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -9822,27 +12688,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ValueMemberSeq
// *************************************************************
-class TAO_Export IR_ValueMemberSeq : public
+class TAO_Export IR_ValueMemberSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ValueMemberSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ValueMember>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ValueMemberSeq (void); // default ctor
IR_ValueMemberSeq (CORBA::ULong max); // uses max size
IR_ValueMemberSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ValueMember *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ValueMember *buffer,
+ CORBA::Boolean release = 0
);
IR_ValueMemberSeq (const IR_ValueMemberSeq &); // copy ctor
~IR_ValueMemberSeq (void);
@@ -9865,19 +12731,21 @@ public:
IR_ValueMemberSeq_var (IR_ValueMemberSeq *);
IR_ValueMemberSeq_var (const IR_ValueMemberSeq_var &); // copy constructor
~IR_ValueMemberSeq_var (void); // destructor
-
+
IR_ValueMemberSeq_var &operator= (IR_ValueMemberSeq *);
IR_ValueMemberSeq_var &operator= (const IR_ValueMemberSeq_var &);
IR_ValueMemberSeq *operator-> (void);
const IR_ValueMemberSeq *operator-> (void) const;
-
+
operator const IR_ValueMemberSeq &() const;
operator IR_ValueMemberSeq &();
operator IR_ValueMemberSeq &() const;
operator IR_ValueMemberSeq *&(); // variable-size base types only
-
- IR_ValueMember &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_ValueMember & operator[] (CORBA::ULong index);
+ const IR_ValueMember & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_ValueMemberSeq &in (void) const;
IR_ValueMemberSeq &inout (void);
IR_ValueMemberSeq *&out (void);
@@ -9899,8 +12767,8 @@ public:
operator IR_ValueMemberSeq *&();
IR_ValueMemberSeq *&ptr (void);
IR_ValueMemberSeq *operator-> (void);
- IR_ValueMember &operator[] (CORBA::ULong index);
-
+ IR_ValueMember & operator[] (CORBA::ULong index);
+
private:
IR_ValueMemberSeq *&ptr_;
// assignment from T_var not allowed
@@ -9911,17 +12779,17 @@ class TAO_Export IR_ValueMemberDef_var : public TAO_Base_var
{
public:
IR_ValueMemberDef_var (void); // default constructor
- IR_ValueMemberDef_var (IR_ValueMemberDef_ptr);
+ IR_ValueMemberDef_var (IR_ValueMemberDef_ptr p) : ptr_ (p) {}
IR_ValueMemberDef_var (const IR_ValueMemberDef_var &); // copy constructor
~IR_ValueMemberDef_var (void); // destructor
-
- IR_ValueMemberDef_var &operator= (IR_ValueMemberDef *);
+
+ IR_ValueMemberDef_var &operator= (IR_ValueMemberDef_ptr);
IR_ValueMemberDef_var &operator= (const IR_ValueMemberDef_var &);
- IR_ValueMemberDef *operator-> (void) const;
-
+ IR_ValueMemberDef_ptr operator-> (void) const;
+
operator const IR_ValueMemberDef_ptr &() const;
operator IR_ValueMemberDef_ptr &();
- // in, inout, out, _retn
+ // in, inout, out, _retn
IR_ValueMemberDef_ptr in (void) const;
IR_ValueMemberDef_ptr &inout (void);
IR_ValueMemberDef_ptr &out (void);
@@ -9929,7 +12797,7 @@ public:
IR_ValueMemberDef_ptr ptr (void) const;
private:
- IR_ValueMemberDef *ptr_;
+ IR_ValueMemberDef_ptr ptr_;
// Unimplemented - prevents widening assignment.
IR_ValueMemberDef_var (const TAO_Base_var &rhs);
IR_ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
@@ -9947,11 +12815,17 @@ public:
operator IR_ValueMemberDef_ptr &();
IR_ValueMemberDef_ptr &ptr (void);
IR_ValueMemberDef_ptr operator-> (void);
-
+
private:
IR_ValueMemberDef_ptr &ptr_;
};
+// Forward Classes Declaration
+class _TAO_ValueMemberDef_Proxy_Impl;
+class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+class _TAO_ValueMemberDef_Proxy_Broker;
+class _TAO_ValueMemberDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ValueMemberDef: public virtual IR_Contained
{
public:
@@ -9964,12 +12838,12 @@ public:
static IR_ValueMemberDef_ptr _duplicate (IR_ValueMemberDef_ptr obj);
static IR_ValueMemberDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ValueMemberDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ValueMemberDef_ptr _nil (void)
@@ -9979,8 +12853,8 @@ public:
static void _tao_any_destructor (void*);
- virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual CORBA::TypeCode_ptr type (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9988,7 +12862,7 @@ public:
));
virtual IR_IDLType_ptr type_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -9997,7 +12871,7 @@ public:
virtual void type_def (
IR_IDLType_ptr type_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10005,7 +12879,7 @@ public:
));
virtual CORBA::Visibility access (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10014,7 +12888,7 @@ public:
virtual void access (
CORBA::Visibility access,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10022,125 +12896,241 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ValueMemberDef_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_;
+
protected:
- IR_ValueMemberDef (void);
- IR_ValueMemberDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ValueMemberDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ValueMemberDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+
virtual ~IR_ValueMemberDef (void);
private:
IR_ValueMemberDef (const IR_ValueMemberDef &);
- void operator= (const IR_ValueMemberDef &);
+ void operator= (const IR_ValueMemberDef &);
};
-class TAO_IR_ValueMemberDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_ValueMemberDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_ValueMemberDef_Default_Proxy_Factory (void);
- virtual IR_ValueMemberDef_ptr create_proxy (
- IR_ValueMemberDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_ValueMemberDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_ValueMemberDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl
{
public:
+ virtual ~_TAO_ValueMemberDef_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ValueMemberDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_ValueMemberDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual CORBA::Visibility access (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_ValueMemberDef_ptr create_proxy (
- IR_ValueMemberDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void access (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_ValueMemberDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ValueMemberDef_Proxy_Factory_Adapter (void);
- TAO_IR_ValueMemberDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ValueMemberDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ValueMemberDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_ValueMemberDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_ValueMemberDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ValueMemberDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ValueMemberDef_Smart_Proxy_Base : public virtual IR_ValueMemberDef
- {
- public:
- TAO_IR_ValueMemberDef_Smart_Proxy_Base (::IR_ValueMemberDef_ptr proxy);
- ~TAO_IR_ValueMemberDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::TypeCode_ptr type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_ValueMemberDef_Remote_Proxy_Impl :
+ public virtual _TAO_ValueMemberDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ValueMemberDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ValueMemberDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_IDLType_ptr type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Visibility access (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void access (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Visibility access,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ValueMemberDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ValueMemberDef_Proxy_Broker (void);
+
+ virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
+ IR_ValueMemberDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ValueMemberDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ValueMemberDef_Remote_Proxy_Broker : public virtual _TAO_ValueMemberDef_Proxy_Broker
+{
+public:
+ _TAO_ValueMemberDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
+ IR_ValueMemberDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- IR_ValueMemberDef_var base_proxy_;
+ _TAO_ValueMemberDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_ValueDef_Proxy_Impl;
+class _TAO_ValueDef_Remote_Proxy_Impl;
+class _TAO_ValueDef_Proxy_Broker;
+class _TAO_ValueDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ValueDef: public virtual IR_Container, public virtual IR_Contained, public virtual IR_IDLType
{
public:
@@ -10153,12 +13143,12 @@ public:
static IR_ValueDef_ptr _duplicate (IR_ValueDef_ptr obj);
static IR_ValueDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ValueDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ValueDef_ptr _nil (void)
@@ -10169,7 +13159,7 @@ public:
static void _tao_any_destructor (void*);
virtual IR_InterfaceDefSeq * supported_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10178,7 +13168,7 @@ public:
virtual void supported_interfaces (
const IR_InterfaceDefSeq & supported_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10186,7 +13176,7 @@ public:
));
virtual IR_InitializerSeq * initializers (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10195,7 +13185,7 @@ public:
virtual void initializers (
const IR_InitializerSeq & initializers,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10203,7 +13193,7 @@ public:
));
virtual IR_ValueDef_ptr base_value (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10212,7 +13202,7 @@ public:
virtual void base_value (
IR_ValueDef_ptr base_value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10220,7 +13210,7 @@ public:
));
virtual IR_ValueDefSeq * abstract_base_values (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10229,7 +13219,7 @@ public:
virtual void abstract_base_values (
const IR_ValueDefSeq & abstract_base_values,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10237,7 +13227,7 @@ public:
));
virtual CORBA::Boolean is_abstract (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10246,7 +13236,7 @@ public:
virtual void is_abstract (
CORBA::Boolean is_abstract,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10254,7 +13244,7 @@ public:
));
virtual CORBA::Boolean is_custom (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10263,7 +13253,7 @@ public:
virtual void is_custom (
CORBA::Boolean is_custom,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10271,7 +13261,7 @@ public:
));
virtual CORBA::Boolean is_truncatable (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10280,7 +13270,7 @@ public:
virtual void is_truncatable (
CORBA::Boolean is_truncatable,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10289,7 +13279,7 @@ public:
virtual CORBA::Boolean is_a (
const char * id,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10302,7 +13292,7 @@ public:
const char * version,
IR_IDLType_ptr type,
CORBA::Visibility access,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10314,10 +13304,10 @@ public:
const char * name,
const char * version,
IR_IDLType_ptr type,
- IR::AttributeMode mode,
+ IR_AttributeMode mode,
const IR_ExceptionDefSeq & get_exceptions,
const IR_ExceptionDefSeq & put_exceptions,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10329,11 +13319,11 @@ public:
const char * name,
const char * version,
IR_IDLType_ptr result,
- IR::OperationMode mode,
+ IR_OperationMode mode,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
const IR_ContextIdSeq & contexts,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10341,255 +13331,499 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ValueDef_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_;
+
protected:
- IR_ValueDef (void);
- IR_ValueDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ValueDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ValueDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ValueDef_Direct_Proxy_Impl;
+
virtual ~IR_ValueDef (void);
private:
IR_ValueDef (const IR_ValueDef &);
- void operator= (const IR_ValueDef &);
+ void operator= (const IR_ValueDef &);
};
-class TAO_IR_ValueDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_ValueDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_ValueDef_Default_Proxy_Factory (void);
- virtual IR_ValueDef_ptr create_proxy (
- IR_ValueDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_ValueDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_ValueDef_Proxy_Impl :
+ public virtual _TAO_Container_Proxy_Impl,
+ public virtual _TAO_Contained_Proxy_Impl,
+ public virtual _TAO_IDLType_Proxy_Impl
{
public:
+ virtual ~_TAO_ValueDef_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ValueDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_ValueDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_InitializerSeq * initializers (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual void initializers (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_ValueDef_ptr create_proxy (
- IR_ValueDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_ValueDef_ptr base_value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void base_value (
+ CORBA_Object *_collocated_tao_target_,
+ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ValueDefSeq * abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual CORBA::Boolean is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual CORBA::Boolean is_custom (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void is_custom (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_custom,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual CORBA::Boolean is_truncatable (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual void is_truncatable (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_truncatable,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ValueMemberDef_ptr create_value_member (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr type,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_AttributeDef_ptr create_attribute (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr type,
+ IR_AttributeMode mode,
+ const IR_ExceptionDefSeq & get_exceptions,
+ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_OperationDef_ptr create_operation (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_IDLType_ptr result,
+ IR_OperationMode mode,
+ const IR_ParDescriptionSeq & params,
+ const IR_ExceptionDefSeq & exceptions,
+ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_ValueDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ValueDef_Proxy_Factory_Adapter (void);
- TAO_IR_ValueDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ValueDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ValueDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_ValueDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_ValueDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ValueDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ValueDef_Smart_Proxy_Base : public virtual IR_ValueDef
- {
- public:
- TAO_IR_ValueDef_Smart_Proxy_Base (::IR_ValueDef_ptr proxy);
- ~TAO_IR_ValueDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_InterfaceDefSeq * supported_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_ValueDef_Remote_Proxy_Impl :
+ public virtual _TAO_ValueDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Container_Remote_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl,
+ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ValueDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ValueDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
const IR_InterfaceDefSeq & supported_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_InitializerSeq * initializers (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void initializers (
+ CORBA_Object *_collocated_tao_target_,
const IR_InitializerSeq & initializers,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ValueDef_ptr base_value (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void base_value (
+ CORBA_Object *_collocated_tao_target_,
IR_ValueDef_ptr base_value,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ValueDefSeq * abstract_base_values (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
const IR_ValueDefSeq & abstract_base_values,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_abstract (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void is_abstract (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_abstract,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_custom (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void is_custom (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_custom,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_truncatable (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void is_truncatable (
+ CORBA_Object *_collocated_tao_target_,
CORBA::Boolean is_truncatable,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ValueMemberDef_ptr create_value_member (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr type,
CORBA::Visibility access,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_AttributeDef_ptr create_attribute (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr type,
- IR::AttributeMode mode,
+ IR_AttributeMode mode,
const IR_ExceptionDefSeq & get_exceptions,
const IR_ExceptionDefSeq & put_exceptions,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_OperationDef_ptr create_operation (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_IDLType_ptr result,
- IR::OperationMode mode,
+ IR_OperationMode mode,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
const IR_ContextIdSeq & contexts,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ValueDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ValueDef_Proxy_Broker (void);
+
+ virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
+ IR_ValueDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ValueDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ValueDef_Remote_Proxy_Broker : public virtual _TAO_ValueDef_Proxy_Broker
+{
+public:
+ _TAO_ValueDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
+ IR_ValueDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_ValueDef_var base_proxy_;
+ _TAO_ValueDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_ValueDescription
{
@@ -10623,18 +13857,18 @@ public:
IR_ValueDescription_var (IR_ValueDescription *);
IR_ValueDescription_var (const IR_ValueDescription_var &); // copy constructor
~IR_ValueDescription_var (void); // destructor
-
+
IR_ValueDescription_var &operator= (IR_ValueDescription *);
IR_ValueDescription_var &operator= (const IR_ValueDescription_var &);
IR_ValueDescription *operator-> (void);
const IR_ValueDescription *operator-> (void) const;
-
+
operator const IR_ValueDescription &() const;
operator IR_ValueDescription &();
operator IR_ValueDescription &() const;
operator IR_ValueDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ValueDescription &in (void) const;
IR_ValueDescription &inout (void);
IR_ValueDescription *&out (void);
@@ -10656,13 +13890,19 @@ public:
operator IR_ValueDescription *&();
IR_ValueDescription *&ptr (void);
IR_ValueDescription *operator-> (void);
-
+
private:
IR_ValueDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_ValueDescription_var &);
};
+// Forward Classes Declaration
+class _TAO_ValueBoxDef_Proxy_Impl;
+class _TAO_ValueBoxDef_Remote_Proxy_Impl;
+class _TAO_ValueBoxDef_Proxy_Broker;
+class _TAO_ValueBoxDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ValueBoxDef: public virtual IR_TypedefDef
{
public:
@@ -10675,12 +13915,12 @@ public:
static IR_ValueBoxDef_ptr _duplicate (IR_ValueBoxDef_ptr obj);
static IR_ValueBoxDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ValueBoxDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ValueBoxDef_ptr _nil (void)
@@ -10691,7 +13931,7 @@ public:
static void _tao_any_destructor (void*);
virtual IR_IDLType_ptr original_type_def (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10700,7 +13940,7 @@ public:
virtual void original_type_def (
IR_IDLType_ptr original_type_def,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10708,100 +13948,191 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ValueBoxDef_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_;
+
protected:
- IR_ValueBoxDef (void);
- IR_ValueBoxDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ValueBoxDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ValueBoxDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
+
virtual ~IR_ValueBoxDef (void);
private:
IR_ValueBoxDef (const IR_ValueBoxDef &);
- void operator= (const IR_ValueBoxDef &);
+ void operator= (const IR_ValueBoxDef &);
};
-class TAO_IR_ValueBoxDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_ValueBoxDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_ValueBoxDef_Default_Proxy_Factory (void);
- virtual IR_ValueBoxDef_ptr create_proxy (
- IR_ValueBoxDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_ValueBoxDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_ValueBoxDef_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl
{
public:
+ virtual ~_TAO_ValueBoxDef_Proxy_Impl (void) { }
+
+ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ValueBoxDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual void original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_ValueBoxDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_ValueBoxDef_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_ValueBoxDef_ptr create_proxy (
- IR_ValueBoxDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_ValueBoxDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ValueBoxDef_Proxy_Factory_Adapter (void);
- TAO_IR_ValueBoxDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ValueBoxDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ValueBoxDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_ValueBoxDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ValueBoxDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ValueBoxDef_Smart_Proxy_Base : public virtual IR_ValueBoxDef
- {
- public:
- TAO_IR_ValueBoxDef_Smart_Proxy_Base (::IR_ValueBoxDef_ptr proxy);
- ~TAO_IR_ValueBoxDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_IDLType_ptr original_type_def (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_ValueBoxDef_Remote_Proxy_Impl :
+ public virtual _TAO_ValueBoxDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ValueBoxDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ValueBoxDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void original_type_def (
+ CORBA_Object *_collocated_tao_target_,
IR_IDLType_ptr original_type_def,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ValueBoxDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ValueBoxDef_Proxy_Broker (void);
+
+ virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
+ IR_ValueBoxDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ValueBoxDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ValueBoxDef_Remote_Proxy_Broker : public virtual _TAO_ValueBoxDef_Proxy_Broker
+{
+public:
+ _TAO_ValueBoxDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
+ IR_ValueBoxDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_ValueBoxDef_var base_proxy_;
+ _TAO_ValueBoxDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_ProvidesDef_Proxy_Impl;
+class _TAO_ProvidesDef_Remote_Proxy_Impl;
+class _TAO_ProvidesDef_Proxy_Broker;
+class _TAO_ProvidesDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ProvidesDef: public virtual IR_Contained
{
public:
@@ -10814,12 +14145,12 @@ public:
static IR_ProvidesDef_ptr _duplicate (IR_ProvidesDef_ptr obj);
static IR_ProvidesDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ProvidesDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ProvidesDef_ptr _nil (void)
@@ -10830,7 +14161,7 @@ public:
static void _tao_any_destructor (void*);
virtual IR_InterfaceDef_ptr interface_type (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -10838,91 +14169,167 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
+
protected:
- IR_ProvidesDef (void);
- IR_ProvidesDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ProvidesDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ProvidesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
+ friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
+
virtual ~IR_ProvidesDef (void);
private:
IR_ProvidesDef (const IR_ProvidesDef &);
- void operator= (const IR_ProvidesDef &);
+ void operator= (const IR_ProvidesDef &);
};
-class TAO_IR_ProvidesDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_ProvidesDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_ProvidesDef_Default_Proxy_Factory (void);
- virtual IR_ProvidesDef_ptr create_proxy (
- IR_ProvidesDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_ProvidesDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_ProvidesDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl
{
public:
+ virtual ~_TAO_ProvidesDef_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ProvidesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+protected:
+ _TAO_ProvidesDef_Proxy_Impl (void);
- int register_proxy_factory (
- TAO_IR_ProvidesDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- IR_ProvidesDef_ptr create_proxy (
- IR_ProvidesDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-protected:
- TAO_IR_ProvidesDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ProvidesDef_Proxy_Factory_Adapter (void);
- TAO_IR_ProvidesDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ProvidesDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ProvidesDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
- typedef TAO_Singleton<TAO_IR_ProvidesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ProvidesDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ProvidesDef_Smart_Proxy_Base : public virtual IR_ProvidesDef
- {
- public:
- TAO_IR_ProvidesDef_Smart_Proxy_Base (::IR_ProvidesDef_ptr proxy);
- ~TAO_IR_ProvidesDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_InterfaceDef_ptr interface_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+class TAO_Export _TAO_ProvidesDef_Remote_Proxy_Impl :
+ public virtual _TAO_ProvidesDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ProvidesDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ProvidesDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
+
+ virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
+ IR_ProvidesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ProvidesDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ProvidesDef_Remote_Proxy_Broker : public virtual _TAO_ProvidesDef_Proxy_Broker
+{
+public:
+ _TAO_ProvidesDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ProvidesDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
+ IR_ProvidesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_ProvidesDef_var base_proxy_;
+ _TAO_ProvidesDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_ProvidesDescription
{
@@ -10946,18 +14353,18 @@ public:
IR_ProvidesDescription_var (IR_ProvidesDescription *);
IR_ProvidesDescription_var (const IR_ProvidesDescription_var &); // copy constructor
~IR_ProvidesDescription_var (void); // destructor
-
+
IR_ProvidesDescription_var &operator= (IR_ProvidesDescription *);
IR_ProvidesDescription_var &operator= (const IR_ProvidesDescription_var &);
IR_ProvidesDescription *operator-> (void);
const IR_ProvidesDescription *operator-> (void) const;
-
+
operator const IR_ProvidesDescription &() const;
operator IR_ProvidesDescription &();
operator IR_ProvidesDescription &() const;
operator IR_ProvidesDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ProvidesDescription &in (void) const;
IR_ProvidesDescription &inout (void);
IR_ProvidesDescription *&out (void);
@@ -10979,13 +14386,19 @@ public:
operator IR_ProvidesDescription *&();
IR_ProvidesDescription *&ptr (void);
IR_ProvidesDescription *operator-> (void);
-
+
private:
IR_ProvidesDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_ProvidesDescription_var &);
};
+// Forward Classes Declaration
+class _TAO_UsesDef_Proxy_Impl;
+class _TAO_UsesDef_Remote_Proxy_Impl;
+class _TAO_UsesDef_Proxy_Broker;
+class _TAO_UsesDef_Remote_Proxy_Broker;
+
class TAO_Export IR_UsesDef: public virtual IR_Contained
{
public:
@@ -10998,12 +14411,12 @@ public:
static IR_UsesDef_ptr _duplicate (IR_UsesDef_ptr obj);
static IR_UsesDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_UsesDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_UsesDef_ptr _nil (void)
@@ -11014,7 +14427,7 @@ public:
static void _tao_any_destructor (void*);
virtual IR_InterfaceDef_ptr interface_type (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -11022,7 +14435,7 @@ public:
));
virtual CORBA::Boolean is_multiple (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -11030,99 +14443,183 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
+
protected:
- IR_UsesDef (void);
- IR_UsesDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_UsesDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_UsesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_UsesDef_Remote_Proxy_Impl;
+ friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_UsesDef_Direct_Proxy_Impl;
+
virtual ~IR_UsesDef (void);
private:
IR_UsesDef (const IR_UsesDef &);
- void operator= (const IR_UsesDef &);
+ void operator= (const IR_UsesDef &);
};
-class TAO_IR_UsesDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_UsesDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_UsesDef_Default_Proxy_Factory (void);
- virtual IR_UsesDef_ptr create_proxy (
- IR_UsesDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_UsesDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_UsesDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl
{
public:
+ virtual ~_TAO_UsesDef_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_UsesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual CORBA::Boolean is_multiple (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_UsesDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_UsesDef_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_UsesDef_ptr create_proxy (
- IR_UsesDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_UsesDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_UsesDef_Proxy_Factory_Adapter (void);
- TAO_IR_UsesDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_UsesDef_Proxy_Factory_Adapter &
- );
- TAO_IR_UsesDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_UsesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_UsesDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_UsesDef_Smart_Proxy_Base : public virtual IR_UsesDef
- {
- public:
- TAO_IR_UsesDef_Smart_Proxy_Base (::IR_UsesDef_ptr proxy);
- ~TAO_IR_UsesDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_InterfaceDef_ptr interface_type (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_UsesDef_Remote_Proxy_Impl :
+ public virtual _TAO_UsesDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_UsesDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_multiple (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_UsesDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_UsesDef_Proxy_Broker (void);
+
+ virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
+ IR_UsesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_UsesDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_UsesDef_Remote_Proxy_Broker : public virtual _TAO_UsesDef_Proxy_Broker
+{
+public:
+ _TAO_UsesDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_UsesDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
+ IR_UsesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_UsesDef_var base_proxy_;
+ _TAO_UsesDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_UsesDescription
{
@@ -11147,18 +14644,18 @@ public:
IR_UsesDescription_var (IR_UsesDescription *);
IR_UsesDescription_var (const IR_UsesDescription_var &); // copy constructor
~IR_UsesDescription_var (void); // destructor
-
+
IR_UsesDescription_var &operator= (IR_UsesDescription *);
IR_UsesDescription_var &operator= (const IR_UsesDescription_var &);
IR_UsesDescription *operator-> (void);
const IR_UsesDescription *operator-> (void) const;
-
+
operator const IR_UsesDescription &() const;
operator IR_UsesDescription &();
operator IR_UsesDescription &() const;
operator IR_UsesDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_UsesDescription &in (void) const;
IR_UsesDescription &inout (void);
IR_UsesDescription *&out (void);
@@ -11180,7 +14677,7 @@ public:
operator IR_UsesDescription *&();
IR_UsesDescription *&ptr (void);
IR_UsesDescription *operator-> (void);
-
+
private:
IR_UsesDescription *&ptr_;
// assignment from T_var not allowed
@@ -11189,16 +14686,15 @@ private:
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IR_UsesDescription;
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ProvidesDescSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ProvidesDescription *data,
@@ -11215,7 +14711,7 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IR_UsesDescription;
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
const IR_ProvidesDescription *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -11224,27 +14720,27 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IR_UsesDescription;
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_ProvidesDescSeq
// *************************************************************
-class TAO_Export IR_ProvidesDescSeq : public
+class TAO_Export IR_ProvidesDescSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_ProvidesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_ProvidesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_ProvidesDescSeq (void); // default ctor
IR_ProvidesDescSeq (CORBA::ULong max); // uses max size
IR_ProvidesDescSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_ProvidesDescription *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_ProvidesDescription *buffer,
+ CORBA::Boolean release = 0
);
IR_ProvidesDescSeq (const IR_ProvidesDescSeq &); // copy ctor
~IR_ProvidesDescSeq (void);
@@ -11267,19 +14763,21 @@ public:
IR_ProvidesDescSeq_var (IR_ProvidesDescSeq *);
IR_ProvidesDescSeq_var (const IR_ProvidesDescSeq_var &); // copy constructor
~IR_ProvidesDescSeq_var (void); // destructor
-
+
IR_ProvidesDescSeq_var &operator= (IR_ProvidesDescSeq *);
IR_ProvidesDescSeq_var &operator= (const IR_ProvidesDescSeq_var &);
IR_ProvidesDescSeq *operator-> (void);
const IR_ProvidesDescSeq *operator-> (void) const;
-
+
operator const IR_ProvidesDescSeq &() const;
operator IR_ProvidesDescSeq &();
operator IR_ProvidesDescSeq &() const;
operator IR_ProvidesDescSeq *&(); // variable-size base types only
-
- IR_ProvidesDescription &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_ProvidesDescription & operator[] (CORBA::ULong index);
+ const IR_ProvidesDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_ProvidesDescSeq &in (void) const;
IR_ProvidesDescSeq &inout (void);
IR_ProvidesDescSeq *&out (void);
@@ -11301,8 +14799,8 @@ public:
operator IR_ProvidesDescSeq *&();
IR_ProvidesDescSeq *&ptr (void);
IR_ProvidesDescSeq *operator-> (void);
- IR_ProvidesDescription &operator[] (CORBA::ULong index);
-
+ IR_ProvidesDescription & operator[] (CORBA::ULong index);
+
private:
IR_ProvidesDescSeq *&ptr_;
// assignment from T_var not allowed
@@ -11310,14 +14808,14 @@ private:
};
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
+
class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UsesDescSeq : public TAO_Unbounded_Base_Sequence
{
public:
// = Initialization and termination methods.
-
+
_TAO_Unbounded_Sequence_IR_UsesDescSeq (void); // Default constructor.
- _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum);
_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_UsesDescription *data,
@@ -11334,7 +14832,7 @@ private:
virtual void _allocate_buffer (CORBA::ULong length);
virtual void _deallocate_buffer (void);
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
IR_UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
const IR_UsesDescription *get_buffer (void) const;
void replace (CORBA::ULong max,
@@ -11343,27 +14841,27 @@ private:
CORBA::Boolean release);
};
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// IR_UsesDescSeq
// *************************************************************
-class TAO_Export IR_UsesDescSeq : public
+class TAO_Export IR_UsesDescSeq : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
_TAO_Unbounded_Sequence_IR_UsesDescSeq
#else /* TAO_USE_SEQUENCE_TEMPLATES */
TAO_Unbounded_Sequence<IR_UsesDescription>
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
{
public:
IR_UsesDescSeq (void); // default ctor
IR_UsesDescSeq (CORBA::ULong max); // uses max size
IR_UsesDescSeq (
- CORBA::ULong max,
- CORBA::ULong length,
- IR_UsesDescription *buffer,
- CORBA::Boolean release=0
+ CORBA::ULong max,
+ CORBA::ULong length,
+ IR_UsesDescription *buffer,
+ CORBA::Boolean release = 0
);
IR_UsesDescSeq (const IR_UsesDescSeq &); // copy ctor
~IR_UsesDescSeq (void);
@@ -11386,19 +14884,21 @@ public:
IR_UsesDescSeq_var (IR_UsesDescSeq *);
IR_UsesDescSeq_var (const IR_UsesDescSeq_var &); // copy constructor
~IR_UsesDescSeq_var (void); // destructor
-
+
IR_UsesDescSeq_var &operator= (IR_UsesDescSeq *);
IR_UsesDescSeq_var &operator= (const IR_UsesDescSeq_var &);
IR_UsesDescSeq *operator-> (void);
const IR_UsesDescSeq *operator-> (void) const;
-
+
operator const IR_UsesDescSeq &() const;
operator IR_UsesDescSeq &();
operator IR_UsesDescSeq &() const;
operator IR_UsesDescSeq *&(); // variable-size base types only
-
- IR_UsesDescription &operator[] (CORBA::ULong index);
- // in, inout, out, _retn
+
+ IR_UsesDescription & operator[] (CORBA::ULong index);
+ const IR_UsesDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
const IR_UsesDescSeq &in (void) const;
IR_UsesDescSeq &inout (void);
IR_UsesDescSeq *&out (void);
@@ -11420,14 +14920,20 @@ public:
operator IR_UsesDescSeq *&();
IR_UsesDescSeq *&ptr (void);
IR_UsesDescSeq *operator-> (void);
- IR_UsesDescription &operator[] (CORBA::ULong index);
-
+ IR_UsesDescription & operator[] (CORBA::ULong index);
+
private:
IR_UsesDescSeq *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_UsesDescSeq_var &);
};
+// Forward Classes Declaration
+class _TAO_EventDef_Proxy_Impl;
+class _TAO_EventDef_Remote_Proxy_Impl;
+class _TAO_EventDef_Proxy_Broker;
+class _TAO_EventDef_Remote_Proxy_Broker;
+
class TAO_Export IR_EventDef: public virtual IR_Contained
{
public:
@@ -11440,12 +14946,12 @@ public:
static IR_EventDef_ptr _duplicate (IR_EventDef_ptr obj);
static IR_EventDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_EventDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_EventDef_ptr _nil (void)
@@ -11457,7 +14963,7 @@ public:
virtual CORBA::Boolean is_a (
const char * event_id,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -11465,7 +14971,7 @@ public:
));
virtual IR_ValueDef_ptr event (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -11473,100 +14979,185 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
+
protected:
- IR_EventDef (void);
- IR_EventDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_EventDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_EventDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_EventDef_Remote_Proxy_Impl;
+ friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_EventDef_Direct_Proxy_Impl;
+
virtual ~IR_EventDef (void);
private:
IR_EventDef (const IR_EventDef &);
- void operator= (const IR_EventDef &);
+ void operator= (const IR_EventDef &);
};
-class TAO_IR_EventDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_EventDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_EventDef_Default_Proxy_Factory (void);
- virtual IR_EventDef_ptr create_proxy (
- IR_EventDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_EventDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_EventDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl
{
public:
+ virtual ~_TAO_EventDef_Proxy_Impl (void) { }
+
+ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * event_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_EventDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_ValueDef_ptr event (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_EventDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_EventDef_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_EventDef_ptr create_proxy (
- IR_EventDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_EventDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_EventDef_Proxy_Factory_Adapter (void);
- TAO_IR_EventDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_EventDef_Proxy_Factory_Adapter &
- );
- TAO_IR_EventDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_EventDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_EventDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_EventDef_Smart_Proxy_Base : public virtual IR_EventDef
- {
- public:
- TAO_IR_EventDef_Smart_Proxy_Base (::IR_EventDef_ptr proxy);
- ~TAO_IR_EventDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::Boolean is_a (
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_EventDef_Remote_Proxy_Impl :
+ public virtual _TAO_EventDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_EventDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_EventDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
const char * event_id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ValueDef_ptr event (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_EventDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_EventDef_Proxy_Broker (void);
+
+ virtual _TAO_EventDef_Proxy_Impl &select_proxy (
+ IR_EventDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_EventDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_EventDef_Remote_Proxy_Broker : public virtual _TAO_EventDef_Proxy_Broker
+{
+public:
+ _TAO_EventDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_EventDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_EventDef_Proxy_Impl &select_proxy (
+ IR_EventDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_EventDef_var base_proxy_;
+ _TAO_EventDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_EventDescription
{
@@ -11590,18 +15181,18 @@ public:
IR_EventDescription_var (IR_EventDescription *);
IR_EventDescription_var (const IR_EventDescription_var &); // copy constructor
~IR_EventDescription_var (void); // destructor
-
+
IR_EventDescription_var &operator= (IR_EventDescription *);
IR_EventDescription_var &operator= (const IR_EventDescription_var &);
IR_EventDescription *operator-> (void);
const IR_EventDescription *operator-> (void) const;
-
+
operator const IR_EventDescription &() const;
operator IR_EventDescription &();
operator IR_EventDescription &() const;
operator IR_EventDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_EventDescription &in (void) const;
IR_EventDescription &inout (void);
IR_EventDescription *&out (void);
@@ -11623,13 +15214,19 @@ public:
operator IR_EventDescription *&();
IR_EventDescription *&ptr (void);
IR_EventDescription *operator-> (void);
-
+
private:
IR_EventDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_EventDescription_var &);
};
+// Forward Classes Declaration
+class _TAO_EmitsDef_Proxy_Impl;
+class _TAO_EmitsDef_Remote_Proxy_Impl;
+class _TAO_EmitsDef_Proxy_Broker;
+class _TAO_EmitsDef_Remote_Proxy_Broker;
+
class TAO_Export IR_EmitsDef: public virtual IR_EventDef
{
public:
@@ -11642,12 +15239,12 @@ public:
static IR_EmitsDef_ptr _duplicate (IR_EmitsDef_ptr obj);
static IR_EmitsDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_EmitsDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_EmitsDef_ptr _nil (void)
@@ -11658,83 +15255,156 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
+
protected:
- IR_EmitsDef (void);
- IR_EmitsDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_EmitsDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_EmitsDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_EmitsDef_Remote_Proxy_Impl;
+ friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_EmitsDef_Direct_Proxy_Impl;
+
virtual ~IR_EmitsDef (void);
private:
IR_EmitsDef (const IR_EmitsDef &);
- void operator= (const IR_EmitsDef &);
+ void operator= (const IR_EmitsDef &);
};
-class TAO_IR_EmitsDef_Default_Proxy_Factory
+
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
+
+class TAO_Export _TAO_EmitsDef_Proxy_Impl
+ : public virtual _TAO_EventDef_Proxy_Impl
{
public:
+ virtual ~_TAO_EmitsDef_Proxy_Impl (void) { }
+
+protected:
+ _TAO_EmitsDef_Proxy_Impl (void);
+
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
- TAO_IR_EmitsDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+class TAO_Export _TAO_EmitsDef_Remote_Proxy_Impl :
+ public virtual _TAO_EmitsDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_EventDef_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_EmitsDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_EmitsDef_Remote_Proxy_Impl (void) { }
+
+};
- virtual ~TAO_IR_EmitsDef_Default_Proxy_Factory (void);
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- virtual IR_EmitsDef_ptr create_proxy (
- IR_EmitsDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
-class TAO_IR_EmitsDef_Proxy_Factory_Adapter
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_EmitsDef_Proxy_Broker
{
public:
+ virtual ~_TAO_EmitsDef_Proxy_Broker (void);
- friend class TAO_Singleton<TAO_IR_EmitsDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
+ IR_EmitsDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
- int register_proxy_factory (
- TAO_IR_EmitsDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_EmitsDef_Proxy_Broker (void);
+
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
- IR_EmitsDef_ptr create_proxy (
- IR_EmitsDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_EmitsDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_EmitsDef_Proxy_Factory_Adapter (void);
- TAO_IR_EmitsDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_EmitsDef_Proxy_Factory_Adapter &
- );
- TAO_IR_EmitsDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_EmitsDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_EmitsDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_EmitsDef_Smart_Proxy_Base : public virtual IR_EmitsDef
- {
- public:
- TAO_IR_EmitsDef_Smart_Proxy_Base (::IR_EmitsDef_ptr proxy);
- ~TAO_IR_EmitsDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- private:
- ::IR_EmitsDef_var base_proxy_;
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_EmitsDef_Remote_Proxy_Broker : public virtual _TAO_EmitsDef_Proxy_Broker
+{
+public:
+ _TAO_EmitsDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_EmitsDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
+ IR_EmitsDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+private:
+ _TAO_EmitsDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+class _TAO_PublishesDef_Proxy_Impl;
+class _TAO_PublishesDef_Remote_Proxy_Impl;
+class _TAO_PublishesDef_Proxy_Broker;
+class _TAO_PublishesDef_Remote_Proxy_Broker;
+
class TAO_Export IR_PublishesDef: public virtual IR_EventDef
{
public:
@@ -11747,12 +15417,12 @@ public:
static IR_PublishesDef_ptr _duplicate (IR_PublishesDef_ptr obj);
static IR_PublishesDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_PublishesDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_PublishesDef_ptr _nil (void)
@@ -11763,83 +15433,157 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
+
protected:
- IR_PublishesDef (void);
- IR_PublishesDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_PublishesDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_PublishesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_PublishesDef_Remote_Proxy_Impl;
+ friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_PublishesDef_Direct_Proxy_Impl;
+
virtual ~IR_PublishesDef (void);
private:
IR_PublishesDef (const IR_PublishesDef &);
- void operator= (const IR_PublishesDef &);
+ void operator= (const IR_PublishesDef &);
};
-class TAO_IR_PublishesDef_Default_Proxy_Factory
+
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
+
+class TAO_Export _TAO_PublishesDef_Proxy_Impl
+ : public virtual _TAO_EventDef_Proxy_Impl
{
public:
+ virtual ~_TAO_PublishesDef_Proxy_Impl (void) { }
+
+protected:
+ _TAO_PublishesDef_Proxy_Impl (void);
+
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_PublishesDef_Remote_Proxy_Impl :
+ public virtual _TAO_PublishesDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_EventDef_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_PublishesDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_PublishesDef_Remote_Proxy_Impl (void) { }
+
+};
- TAO_IR_PublishesDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- virtual ~TAO_IR_PublishesDef_Default_Proxy_Factory (void);
- virtual IR_PublishesDef_ptr create_proxy (
- IR_PublishesDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
-class TAO_IR_PublishesDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_PublishesDef_Proxy_Broker
{
public:
+ virtual ~_TAO_PublishesDef_Proxy_Broker (void);
- friend class TAO_Singleton<TAO_IR_PublishesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
+ IR_PublishesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
- int register_proxy_factory (
- TAO_IR_PublishesDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_PublishesDef_Proxy_Broker (void);
+
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
- IR_PublishesDef_ptr create_proxy (
- IR_PublishesDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_PublishesDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_PublishesDef_Proxy_Factory_Adapter (void);
- TAO_IR_PublishesDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_PublishesDef_Proxy_Factory_Adapter &
- );
- TAO_IR_PublishesDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_PublishesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_PublishesDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_PublishesDef_Smart_Proxy_Base : public virtual IR_PublishesDef
- {
- public:
- TAO_IR_PublishesDef_Smart_Proxy_Base (::IR_PublishesDef_ptr proxy);
- ~TAO_IR_PublishesDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- private:
- ::IR_PublishesDef_var base_proxy_;
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_PublishesDef_Remote_Proxy_Broker : public virtual _TAO_PublishesDef_Proxy_Broker
+{
+public:
+ _TAO_PublishesDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_PublishesDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
+ IR_PublishesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+private:
+ _TAO_PublishesDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_ConsumesDef_Proxy_Impl;
+class _TAO_ConsumesDef_Remote_Proxy_Impl;
+class _TAO_ConsumesDef_Proxy_Broker;
+class _TAO_ConsumesDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ConsumesDef: public virtual IR_EventDef
{
public:
@@ -11852,12 +15596,12 @@ public:
static IR_ConsumesDef_ptr _duplicate (IR_ConsumesDef_ptr obj);
static IR_ConsumesDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ConsumesDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ConsumesDef_ptr _nil (void)
@@ -11868,83 +15612,157 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
+
protected:
- IR_ConsumesDef (void);
- IR_ConsumesDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ConsumesDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ConsumesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ConsumesDef_Remote_Proxy_Impl;
+ friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
+
virtual ~IR_ConsumesDef (void);
private:
IR_ConsumesDef (const IR_ConsumesDef &);
- void operator= (const IR_ConsumesDef &);
+ void operator= (const IR_ConsumesDef &);
+};
+
+
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
+
+class TAO_Export _TAO_ConsumesDef_Proxy_Impl
+ : public virtual _TAO_EventDef_Proxy_Impl
+{
+public:
+ virtual ~_TAO_ConsumesDef_Proxy_Impl (void) { }
+
+protected:
+ _TAO_ConsumesDef_Proxy_Impl (void);
+
};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
-class TAO_IR_ConsumesDef_Default_Proxy_Factory
+class TAO_Export _TAO_ConsumesDef_Remote_Proxy_Impl :
+ public virtual _TAO_ConsumesDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_EventDef_Remote_Proxy_Impl
+
{
public:
+ _TAO_ConsumesDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ConsumesDef_Remote_Proxy_Impl (void) { }
+
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- TAO_IR_ConsumesDef_Default_Proxy_Factory (int register_proxy_factory = 1);
- virtual ~TAO_IR_ConsumesDef_Default_Proxy_Factory (void);
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
- virtual IR_ConsumesDef_ptr create_proxy (
- IR_ConsumesDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
-class TAO_IR_ConsumesDef_Proxy_Factory_Adapter
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ConsumesDef_Proxy_Broker
{
public:
+ virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
- friend class TAO_Singleton<TAO_IR_ConsumesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+ IR_ConsumesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
- int register_proxy_factory (
- TAO_IR_ConsumesDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_ConsumesDef_Proxy_Broker (void);
+
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
- IR_ConsumesDef_ptr create_proxy (
- IR_ConsumesDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_ConsumesDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ConsumesDef_Proxy_Factory_Adapter (void);
- TAO_IR_ConsumesDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ConsumesDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ConsumesDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_ConsumesDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ConsumesDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ConsumesDef_Smart_Proxy_Base : public virtual IR_ConsumesDef
- {
- public:
- TAO_IR_ConsumesDef_Smart_Proxy_Base (::IR_ConsumesDef_ptr proxy);
- ~TAO_IR_ConsumesDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- private:
- ::IR_ConsumesDef_var base_proxy_;
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ConsumesDef_Remote_Proxy_Broker : public virtual _TAO_ConsumesDef_Proxy_Broker
+{
+public:
+ _TAO_ConsumesDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+ IR_ConsumesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+private:
+ _TAO_ConsumesDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_ComponentDef_Proxy_Impl;
+class _TAO_ComponentDef_Remote_Proxy_Impl;
+class _TAO_ComponentDef_Proxy_Broker;
+class _TAO_ComponentDef_Remote_Proxy_Broker;
+
class TAO_Export IR_ComponentDef: public virtual IR_InterfaceDef
{
public:
@@ -11957,12 +15775,12 @@ public:
static IR_ComponentDef_ptr _duplicate (IR_ComponentDef_ptr obj);
static IR_ComponentDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ComponentDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_ComponentDef_ptr _nil (void)
@@ -11973,7 +15791,7 @@ public:
static void _tao_any_destructor (void*);
virtual IR_InterfaceDefSeq * supported_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -11982,7 +15800,7 @@ public:
virtual void supported_interfaces (
const IR_InterfaceDefSeq & supported_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -11990,7 +15808,7 @@ public:
));
virtual IR_ComponentDef_ptr base_component (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -11998,7 +15816,7 @@ public:
));
virtual IR_ProvidesDefSeq * provides_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12006,7 +15824,7 @@ public:
));
virtual IR_UsesDefSeq * uses_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12014,7 +15832,7 @@ public:
));
virtual IR_EmitsDefSeq * emits_events (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12022,7 +15840,7 @@ public:
));
virtual IR_PublishesDefSeq * publishes_events (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12030,7 +15848,7 @@ public:
));
virtual IR_ConsumesDefSeq * consumes_events (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12038,7 +15856,7 @@ public:
));
virtual CORBA::Boolean is_basic (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12050,7 +15868,7 @@ public:
const char * name,
const char * version,
IR_InterfaceDef_ptr interface_type,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12063,7 +15881,7 @@ public:
const char * version,
IR_InterfaceDef_ptr interface_type,
CORBA::Boolean is_multiple,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12075,7 +15893,7 @@ public:
const char * name,
const char * version,
IR_ValueDef_ptr value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12087,7 +15905,7 @@ public:
const char * name,
const char * version,
IR_ValueDef_ptr value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12099,7 +15917,7 @@ public:
const char * name,
const char * version,
IR_ValueDef_ptr value,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12107,217 +15925,418 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
+
protected:
- IR_ComponentDef (void);
- IR_ComponentDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_ComponentDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_ComponentDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+
virtual ~IR_ComponentDef (void);
private:
IR_ComponentDef (const IR_ComponentDef &);
- void operator= (const IR_ComponentDef &);
+ void operator= (const IR_ComponentDef &);
};
-class TAO_IR_ComponentDef_Default_Proxy_Factory
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
+
+class TAO_Export _TAO_ComponentDef_Proxy_Impl :
+ public virtual _TAO_InterfaceDef_Proxy_Impl
{
public:
+ virtual ~_TAO_ComponentDef_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- TAO_IR_ComponentDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+ virtual void supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- virtual ~TAO_IR_ComponentDef_Default_Proxy_Factory (void);
+ virtual IR_ComponentDef_ptr base_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- virtual IR_ComponentDef_ptr create_proxy (
- IR_ComponentDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+ virtual IR_ProvidesDefSeq * provides_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
-class TAO_IR_ComponentDef_Proxy_Factory_Adapter
-{
-public:
+ virtual IR_UsesDefSeq * uses_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_ComponentDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_EmitsDefSeq * emits_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_ComponentDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_PublishesDefSeq * publishes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_ConsumesDefSeq * consumes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_ComponentDef_ptr create_proxy (
- IR_ComponentDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual CORBA::Boolean is_basic (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ProvidesDef_ptr create_provides (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_UsesDef_ptr create_uses (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_EmitsDef_ptr create_emits (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_PublishesDef_ptr create_publishes (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_ConsumesDef_ptr create_consumes (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_ComponentDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_ComponentDef_Proxy_Factory_Adapter (void);
- TAO_IR_ComponentDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_ComponentDef_Proxy_Factory_Adapter &
- );
- TAO_IR_ComponentDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_ComponentDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_ComponentDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_ComponentDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_ComponentDef_Smart_Proxy_Base : public virtual IR_ComponentDef
- {
- public:
- TAO_IR_ComponentDef_Smart_Proxy_Base (::IR_ComponentDef_ptr proxy);
- ~TAO_IR_ComponentDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_InterfaceDefSeq * supported_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_ComponentDef_Remote_Proxy_Impl :
+ public virtual _TAO_ComponentDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_ComponentDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual void supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
const IR_InterfaceDefSeq & supported_interfaces,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ComponentDef_ptr base_component (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ProvidesDefSeq * provides_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_UsesDefSeq * uses_interfaces (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_EmitsDefSeq * emits_events (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_PublishesDefSeq * publishes_events (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ConsumesDefSeq * consumes_events (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_basic (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ProvidesDef_ptr create_provides (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_InterfaceDef_ptr interface_type,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_UsesDef_ptr create_uses (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_InterfaceDef_ptr interface_type,
CORBA::Boolean is_multiple,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_EmitsDef_ptr create_emits (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_ValueDef_ptr value,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_PublishesDef_ptr create_publishes (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_ValueDef_ptr value,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ConsumesDef_ptr create_consumes (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_ValueDef_ptr value,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ComponentDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_ComponentDef_Proxy_Broker (void);
+
+ virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
+ IR_ComponentDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_ComponentDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_ComponentDef_Remote_Proxy_Broker : public virtual _TAO_ComponentDef_Proxy_Broker
+{
+public:
+ _TAO_ComponentDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ComponentDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
+ IR_ComponentDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_ComponentDef_var base_proxy_;
+ _TAO_ComponentDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_ComponentDescription
{
@@ -12349,18 +16368,18 @@ public:
IR_ComponentDescription_var (IR_ComponentDescription *);
IR_ComponentDescription_var (const IR_ComponentDescription_var &); // copy constructor
~IR_ComponentDescription_var (void); // destructor
-
+
IR_ComponentDescription_var &operator= (IR_ComponentDescription *);
IR_ComponentDescription_var &operator= (const IR_ComponentDescription_var &);
IR_ComponentDescription *operator-> (void);
const IR_ComponentDescription *operator-> (void) const;
-
+
operator const IR_ComponentDescription &() const;
operator IR_ComponentDescription &();
operator IR_ComponentDescription &() const;
operator IR_ComponentDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_ComponentDescription &in (void) const;
IR_ComponentDescription &inout (void);
IR_ComponentDescription *&out (void);
@@ -12382,13 +16401,19 @@ public:
operator IR_ComponentDescription *&();
IR_ComponentDescription *&ptr (void);
IR_ComponentDescription *operator-> (void);
-
+
private:
IR_ComponentDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_ComponentDescription_var &);
};
+// Forward Classes Declaration
+class _TAO_PrimaryKeyDef_Proxy_Impl;
+class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+class _TAO_PrimaryKeyDef_Proxy_Broker;
+class _TAO_PrimaryKeyDef_Remote_Proxy_Broker;
+
class TAO_Export IR_PrimaryKeyDef: public virtual IR_Contained
{
public:
@@ -12401,12 +16426,12 @@ public:
static IR_PrimaryKeyDef_ptr _duplicate (IR_PrimaryKeyDef_ptr obj);
static IR_PrimaryKeyDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_PrimaryKeyDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_PrimaryKeyDef_ptr _nil (void)
@@ -12418,7 +16443,7 @@ public:
virtual CORBA::Boolean is_a (
const char * primary_key_id,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12426,7 +16451,7 @@ public:
));
virtual IR_ValueDef_ptr primary_key (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12434,100 +16459,185 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_PrimaryKeyDef_Proxy_Broker *the_TAO_PrimaryKeyDef_Proxy_Broker_;
+
protected:
- IR_PrimaryKeyDef (void);
- IR_PrimaryKeyDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_PrimaryKeyDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_PrimaryKeyDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+ friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
+
virtual ~IR_PrimaryKeyDef (void);
private:
IR_PrimaryKeyDef (const IR_PrimaryKeyDef &);
- void operator= (const IR_PrimaryKeyDef &);
+ void operator= (const IR_PrimaryKeyDef &);
};
-class TAO_IR_PrimaryKeyDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_PrimaryKeyDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_PrimaryKeyDef_Default_Proxy_Factory (void);
- virtual IR_PrimaryKeyDef_ptr create_proxy (
- IR_PrimaryKeyDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_PrimaryKeyDef_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl
{
public:
+ virtual ~_TAO_PrimaryKeyDef_Proxy_Impl (void) { }
+
+ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * primary_key_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_ValueDef_ptr primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_PrimaryKeyDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_PrimaryKeyDef_Proxy_Impl (void);
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+};
- IR_PrimaryKeyDef_ptr create_proxy (
- IR_PrimaryKeyDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter (void);
- TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter &
- );
- TAO_IR_PrimaryKeyDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_PrimaryKeyDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_PrimaryKeyDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_PrimaryKeyDef_Smart_Proxy_Base : public virtual IR_PrimaryKeyDef
- {
- public:
- TAO_IR_PrimaryKeyDef_Smart_Proxy_Base (::IR_PrimaryKeyDef_ptr proxy);
- ~TAO_IR_PrimaryKeyDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual CORBA::Boolean is_a (
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl :
+ public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_PrimaryKeyDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void) { }
+
+ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
const char * primary_key_id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ValueDef_ptr primary_key (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_PrimaryKeyDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
+
+ virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
+ IR_PrimaryKeyDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_PrimaryKeyDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_PrimaryKeyDef_Remote_Proxy_Broker : public virtual _TAO_PrimaryKeyDef_Proxy_Broker
+{
+public:
+ _TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
+ IR_PrimaryKeyDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_PrimaryKeyDef_var base_proxy_;
+ _TAO_PrimaryKeyDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_PrimaryKeyDescription
{
@@ -12551,18 +16661,18 @@ public:
IR_PrimaryKeyDescription_var (IR_PrimaryKeyDescription *);
IR_PrimaryKeyDescription_var (const IR_PrimaryKeyDescription_var &); // copy constructor
~IR_PrimaryKeyDescription_var (void); // destructor
-
+
IR_PrimaryKeyDescription_var &operator= (IR_PrimaryKeyDescription *);
IR_PrimaryKeyDescription_var &operator= (const IR_PrimaryKeyDescription_var &);
IR_PrimaryKeyDescription *operator-> (void);
const IR_PrimaryKeyDescription *operator-> (void) const;
-
+
operator const IR_PrimaryKeyDescription &() const;
operator IR_PrimaryKeyDescription &();
operator IR_PrimaryKeyDescription &() const;
operator IR_PrimaryKeyDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_PrimaryKeyDescription &in (void) const;
IR_PrimaryKeyDescription &inout (void);
IR_PrimaryKeyDescription *&out (void);
@@ -12584,13 +16694,19 @@ public:
operator IR_PrimaryKeyDescription *&();
IR_PrimaryKeyDescription *&ptr (void);
IR_PrimaryKeyDescription *operator-> (void);
-
+
private:
IR_PrimaryKeyDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_PrimaryKeyDescription_var &);
};
+// Forward Classes Declaration
+class _TAO_FactoryDef_Proxy_Impl;
+class _TAO_FactoryDef_Remote_Proxy_Impl;
+class _TAO_FactoryDef_Proxy_Broker;
+class _TAO_FactoryDef_Remote_Proxy_Broker;
+
class TAO_Export IR_FactoryDef: public virtual IR_OperationDef
{
public:
@@ -12603,12 +16719,12 @@ public:
static IR_FactoryDef_ptr _duplicate (IR_FactoryDef_ptr obj);
static IR_FactoryDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_FactoryDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_FactoryDef_ptr _nil (void)
@@ -12619,83 +16735,157 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
+
protected:
- IR_FactoryDef (void);
- IR_FactoryDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_FactoryDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_FactoryDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_FactoryDef_Remote_Proxy_Impl;
+ friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_FactoryDef_Direct_Proxy_Impl;
+
virtual ~IR_FactoryDef (void);
private:
IR_FactoryDef (const IR_FactoryDef &);
- void operator= (const IR_FactoryDef &);
+ void operator= (const IR_FactoryDef &);
+};
+
+
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
+
+class TAO_Export _TAO_FactoryDef_Proxy_Impl
+ : public virtual _TAO_OperationDef_Proxy_Impl
+{
+public:
+ virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
+
+protected:
+ _TAO_FactoryDef_Proxy_Impl (void);
+
};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
-class TAO_IR_FactoryDef_Default_Proxy_Factory
+class TAO_Export _TAO_FactoryDef_Remote_Proxy_Impl :
+ public virtual _TAO_FactoryDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_OperationDef_Remote_Proxy_Impl
+
{
public:
+ _TAO_FactoryDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_FactoryDef_Remote_Proxy_Impl (void) { }
+
+};
- TAO_IR_FactoryDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- virtual ~TAO_IR_FactoryDef_Default_Proxy_Factory (void);
- virtual IR_FactoryDef_ptr create_proxy (
- IR_FactoryDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
-class TAO_IR_FactoryDef_Proxy_Factory_Adapter
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_FactoryDef_Proxy_Broker
{
public:
+ virtual ~_TAO_FactoryDef_Proxy_Broker (void);
- friend class TAO_Singleton<TAO_IR_FactoryDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
+ IR_FactoryDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
- int register_proxy_factory (
- TAO_IR_FactoryDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_FactoryDef_Proxy_Broker (void);
+
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
- IR_FactoryDef_ptr create_proxy (
- IR_FactoryDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_FactoryDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_FactoryDef_Proxy_Factory_Adapter (void);
- TAO_IR_FactoryDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_FactoryDef_Proxy_Factory_Adapter &
- );
- TAO_IR_FactoryDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_FactoryDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_FactoryDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_FactoryDef_Smart_Proxy_Base : public virtual IR_FactoryDef
- {
- public:
- TAO_IR_FactoryDef_Smart_Proxy_Base (::IR_FactoryDef_ptr proxy);
- ~TAO_IR_FactoryDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- private:
- ::IR_FactoryDef_var base_proxy_;
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_FactoryDef_Remote_Proxy_Broker : public virtual _TAO_FactoryDef_Proxy_Broker
+{
+public:
+ _TAO_FactoryDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_FactoryDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
+ IR_FactoryDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+private:
+ _TAO_FactoryDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_FinderDef_Proxy_Impl;
+class _TAO_FinderDef_Remote_Proxy_Impl;
+class _TAO_FinderDef_Proxy_Broker;
+class _TAO_FinderDef_Remote_Proxy_Broker;
+
class TAO_Export IR_FinderDef: public virtual IR_OperationDef
{
public:
@@ -12708,12 +16898,12 @@ public:
static IR_FinderDef_ptr _duplicate (IR_FinderDef_ptr obj);
static IR_FinderDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_FinderDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_FinderDef_ptr _nil (void)
@@ -12724,83 +16914,157 @@ public:
static void _tao_any_destructor (void*);
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
+
protected:
- IR_FinderDef (void);
- IR_FinderDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_FinderDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_FinderDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_FinderDef_Remote_Proxy_Impl;
+ friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_FinderDef_Direct_Proxy_Impl;
+
virtual ~IR_FinderDef (void);
private:
IR_FinderDef (const IR_FinderDef &);
- void operator= (const IR_FinderDef &);
+ void operator= (const IR_FinderDef &);
+};
+
+
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
+
+class TAO_Export _TAO_FinderDef_Proxy_Impl
+ : public virtual _TAO_OperationDef_Proxy_Impl
+{
+public:
+ virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
+
+protected:
+ _TAO_FinderDef_Proxy_Impl (void);
+
};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
-class TAO_IR_FinderDef_Default_Proxy_Factory
+class TAO_Export _TAO_FinderDef_Remote_Proxy_Impl :
+ public virtual _TAO_FinderDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_OperationDef_Remote_Proxy_Impl
+
{
public:
+ _TAO_FinderDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_FinderDef_Remote_Proxy_Impl (void) { }
+
+};
- TAO_IR_FinderDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
- virtual ~TAO_IR_FinderDef_Default_Proxy_Factory (void);
- virtual IR_FinderDef_ptr create_proxy (
- IR_FinderDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
-class TAO_IR_FinderDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_FinderDef_Proxy_Broker
{
public:
+ virtual ~_TAO_FinderDef_Proxy_Broker (void);
- friend class TAO_Singleton<TAO_IR_FinderDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
+ IR_FinderDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
- int register_proxy_factory (
- TAO_IR_FinderDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+protected:
+ _TAO_FinderDef_Proxy_Broker (void);
+
+};
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
- IR_FinderDef_ptr create_proxy (
- IR_FinderDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
-protected:
- TAO_IR_FinderDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_FinderDef_Proxy_Factory_Adapter (void);
- TAO_IR_FinderDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_FinderDef_Proxy_Factory_Adapter &
- );
- TAO_IR_FinderDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
- typedef TAO_Singleton<TAO_IR_FinderDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_FinderDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_FinderDef_Smart_Proxy_Base : public virtual IR_FinderDef
- {
- public:
- TAO_IR_FinderDef_Smart_Proxy_Base (::IR_FinderDef_ptr proxy);
- ~TAO_IR_FinderDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- private:
- ::IR_FinderDef_var base_proxy_;
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_FinderDef_Remote_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker
+{
+public:
+ _TAO_FinderDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
+ IR_FinderDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+private:
+ _TAO_FinderDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+// Forward Classes Declaration
+class _TAO_HomeDef_Proxy_Impl;
+class _TAO_HomeDef_Remote_Proxy_Impl;
+class _TAO_HomeDef_Proxy_Broker;
+class _TAO_HomeDef_Remote_Proxy_Broker;
+
class TAO_Export IR_HomeDef: public virtual IR_InterfaceDef
{
public:
@@ -12813,12 +17077,12 @@ public:
static IR_HomeDef_ptr _duplicate (IR_HomeDef_ptr obj);
static IR_HomeDef_ptr _narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_HomeDef_ptr _unchecked_narrow (
CORBA::Object_ptr obj,
- CORBA::Environment &env =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
static IR_HomeDef_ptr _nil (void)
@@ -12828,8 +17092,8 @@ public:
static void _tao_any_destructor (void*);
- virtual IR_HomeDef_ptr base_home (
- CORBA::Environment &ACE_TRY_ENV =
+ virtual IR_HomeDef_ptr base_home (
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12837,7 +17101,7 @@ public:
));
virtual IR_ComponentDef_ptr managed_component (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12845,7 +17109,7 @@ public:
));
virtual IR_PrimaryKeyDef_ptr primary_key (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12853,7 +17117,7 @@ public:
));
virtual IR_FactoryDefSeq * factories (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12861,7 +17125,7 @@ public:
));
virtual IR_FinderDefSeq * finders (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12869,7 +17133,7 @@ public:
));
virtual CORBA::Boolean is_basic (
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12881,7 +17145,7 @@ public:
const char * name,
const char * version,
IR_ValueDef_ptr primary_key,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12894,7 +17158,7 @@ public:
const char * version,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12907,7 +17171,7 @@ public:
const char * version,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
- CORBA::Environment &ACE_TRY_ENV =
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
)
ACE_THROW_SPEC ((
@@ -12915,169 +17179,323 @@ public:
));
virtual CORBA::Boolean _is_a (
- const CORBA::Char *type_id,
- CORBA::Environment &env =
+ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ()
);
+ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
virtual const char* _interface_repository_id (void) const;
+private:
+ _TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
+
protected:
- IR_HomeDef (void);
- IR_HomeDef (TAO_Stub *objref,
- CORBA::Boolean _tao_collocated = 0
- );
+ IR_HomeDef (int collocated = 0);
+
+protected:
+ // This methods travese the inheritance tree and set the
+ // parents piece of the given class in the right mode
+ virtual void _tao_setup_collocation (int collocated);
+
+ IR_HomeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+ );
+
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_HomeDef_Direct_Proxy_Impl;
+
virtual ~IR_HomeDef (void);
private:
IR_HomeDef (const IR_HomeDef &);
- void operator= (const IR_HomeDef &);
+ void operator= (const IR_HomeDef &);
};
-class TAO_IR_HomeDef_Default_Proxy_Factory
-{
-public:
- TAO_IR_HomeDef_Default_Proxy_Factory (int register_proxy_factory = 1);
+// The Proxy Implementations are used by each interface to
+// perform a call. Each different implementation encapsulate
+// an invocation logics.
- virtual ~TAO_IR_HomeDef_Default_Proxy_Factory (void);
- virtual IR_HomeDef_ptr create_proxy (
- IR_HomeDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
-};
+///////////////////////////////////////////////////////////////////////
+// Base Impl. Declaration
+//
-class TAO_IR_HomeDef_Proxy_Factory_Adapter
+class TAO_Export _TAO_HomeDef_Proxy_Impl :
+ public virtual _TAO_InterfaceDef_Proxy_Impl
{
public:
+ virtual ~_TAO_HomeDef_Proxy_Impl (void) { }
+
+ virtual IR_HomeDef_ptr base_home (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- friend class TAO_Singleton<TAO_IR_HomeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
+ virtual IR_ComponentDef_ptr managed_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int register_proxy_factory (
- TAO_IR_HomeDef_Default_Proxy_Factory *df,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_PrimaryKeyDef_ptr primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- int unregister_proxy_factory (
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_FactoryDefSeq * factories (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
- IR_HomeDef_ptr create_proxy (
- IR_HomeDef_ptr proxy,
- CORBA::Environment &env =
- TAO_default_environment ()
- );
+ virtual IR_FinderDefSeq * finders (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual CORBA::Boolean is_basic (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_PrimaryKeyDef_ptr create_primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_FactoryDef_ptr create_factory (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_ParDescriptionSeq & params,
+ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+ virtual IR_FinderDef_ptr create_finder (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ const IR_ParDescriptionSeq & params,
+ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
protected:
- TAO_IR_HomeDef_Proxy_Factory_Adapter (void);
- ~TAO_IR_HomeDef_Proxy_Factory_Adapter (void);
- TAO_IR_HomeDef_Proxy_Factory_Adapter &operator= (
- const TAO_IR_HomeDef_Proxy_Factory_Adapter &
- );
- TAO_IR_HomeDef_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
- };
+ _TAO_HomeDef_Proxy_Impl (void);
- typedef TAO_Singleton<TAO_IR_HomeDef_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_IR_HomeDef_PROXY_FACTORY_ADAPTER;
- class TAO_IR_HomeDef_Smart_Proxy_Base : public virtual IR_HomeDef
- {
- public:
- TAO_IR_HomeDef_Smart_Proxy_Base (::IR_HomeDef_ptr proxy);
- ~TAO_IR_HomeDef_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- virtual IR_HomeDef_ptr base_home (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Impl. Declaration
+//
+
+class TAO_Export _TAO_HomeDef_Remote_Proxy_Impl :
+ public virtual _TAO_HomeDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+ public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
+
+{
+public:
+ _TAO_HomeDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) { }
+
+ virtual IR_HomeDef_ptr base_home (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_ComponentDef_ptr managed_component (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR_PrimaryKeyDef_ptr primary_key (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ virtual IR_PrimaryKeyDef_ptr primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_FactoryDefSeq * factories (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_FinderDefSeq * finders (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual CORBA::Boolean is_basic (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_PrimaryKeyDef_ptr create_primary_key (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
IR_ValueDef_ptr primary_key,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
virtual IR_FactoryDef_ptr create_factory (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
- virtual IR_FinderDef_ptr create_finder (
+ virtual IR_FinderDef_ptr create_finder (
+ CORBA_Object *_collocated_tao_target_,
const char * id,
const char * name,
const char * version,
const IR_ParDescriptionSeq & params,
const IR_ExceptionDefSeq & exceptions,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
+ CORBA::Environment &ACE_TRY_ENV
)
ACE_THROW_SPEC ((
CORBA::SystemException
));
+};
+
+//
+// Base Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+// The Proxy Brokers are used by each interface to get
+// the right proxy for performing a call. In the new
+// collocation scheme, the proxy to be used can vary on
+// a call by call basis.
+
+
+
+///////////////////////////////////////////////////////////////////////
+// Base Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_HomeDef_Proxy_Broker
+{
+public:
+ virtual ~_TAO_HomeDef_Proxy_Broker (void);
+
+ virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+ IR_HomeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+protected:
+ _TAO_HomeDef_Proxy_Broker (void);
+
+};
+
+
+//
+// End Base Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+// Remote Proxy Broker Declaration
+//
+
+class TAO_Export _TAO_HomeDef_Remote_Proxy_Broker : public virtual _TAO_HomeDef_Proxy_Broker
+{
+public:
+ _TAO_HomeDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_HomeDef_Remote_Proxy_Broker (void);
+
+ virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+ IR_HomeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
private:
- ::IR_HomeDef_var base_proxy_;
+ _TAO_HomeDef_Remote_Proxy_Impl remote_proxy_impl_;
+// This member function is used to get an handle to the unique instance
+// of the Remote Proxy Broker that is available for a given
+// interface.
+
+public:
+ static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
};
+//
+// End Remote Proxy Broker Declaration
+///////////////////////////////////////////////////////////////////////
+
struct TAO_Export IR_HomeDescription
{
@@ -13108,18 +17526,18 @@ public:
IR_HomeDescription_var (IR_HomeDescription *);
IR_HomeDescription_var (const IR_HomeDescription_var &); // copy constructor
~IR_HomeDescription_var (void); // destructor
-
+
IR_HomeDescription_var &operator= (IR_HomeDescription *);
IR_HomeDescription_var &operator= (const IR_HomeDescription_var &);
IR_HomeDescription *operator-> (void);
const IR_HomeDescription *operator-> (void) const;
-
+
operator const IR_HomeDescription &() const;
operator IR_HomeDescription &();
operator IR_HomeDescription &() const;
operator IR_HomeDescription *&(); // variable-size types only
-
- // in, inout, out, _retn
+
+ // in, inout, out, _retn
const IR_HomeDescription &in (void) const;
IR_HomeDescription &inout (void);
IR_HomeDescription *&out (void);
@@ -13141,26 +17559,24 @@ public:
operator IR_HomeDescription *&();
IR_HomeDescription *&ptr (void);
IR_HomeDescription *operator-> (void);
-
+
private:
IR_HomeDescription *&ptr_;
// assignment from T_var not allowed
void operator= (const IR_HomeDescription_var &);
};
-TAO_Export void operator<<= (CORBA::Any &, IR::DefinitionKind);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::DefinitionKind &);
-extern TAO_Export IR_Contained_ptr (*_TAO_collocation_IR_Contained_Stub_Factory_function_pointer) (
+TAO_Export void operator<<= (CORBA::Any &, IR_DefinitionKind);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_DefinitionKind &);
+extern TAO_Export _TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
-
-extern TAO_Export CORBA::IRObject_ptr (*_TAO_collocation_CORBA_IRObject_Stub_Factory_function_pointer) (
+// Any operators for interface CORBA_IRObject
+TAO_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
+extern TAO_Export _TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
-// Any operators for interface CORBA::IRObject
-TAO_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject *&);
-
// Any operators for interface IR_Contained
TAO_Export void operator<<= (CORBA::Any &, IR_Contained_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Contained *&);
@@ -13244,7 +17660,7 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_EnumMemberSeq &); // copying
TAO_Export void operator<<= (CORBA::Any &, IR_EnumMemberSeq*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumMemberSeq *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EnumMemberSeq *&);
-extern TAO_Export IR_Container_ptr (*_TAO_collocation_IR_Container_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_Container
@@ -13258,27 +17674,27 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_Container::DescriptionSeq &)
TAO_Export void operator<<= (CORBA::Any &, IR_Container::DescriptionSeq*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container::DescriptionSeq *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Container::DescriptionSeq *&);
-extern TAO_Export IR_IDLType_ptr (*_TAO_collocation_IR_IDLType_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_IDLType
TAO_Export void operator<<= (CORBA::Any &, IR_IDLType_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_IDLType *&);
-TAO_Export void operator<<= (CORBA::Any &, IR::PrimitiveKind);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveKind &);
-extern TAO_Export IR_Repository_ptr (*_TAO_collocation_IR_Repository_Stub_Factory_function_pointer) (
+TAO_Export void operator<<= (CORBA::Any &, IR_PrimitiveKind);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveKind &);
+extern TAO_Export _TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_Repository
TAO_Export void operator<<= (CORBA::Any &, IR_Repository_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Repository *&);
-extern TAO_Export IR_ComponentRepository_ptr (*_TAO_collocation_IR_ComponentRepository_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ComponentRepository
TAO_Export void operator<<= (CORBA::Any &, IR_ComponentRepository_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentRepository *&);
-extern TAO_Export IR_ModuleDef_ptr (*_TAO_collocation_IR_ModuleDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ModuleDef
@@ -13288,7 +17704,7 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_ModuleDescription &); // cop
TAO_Export void operator<<= (CORBA::Any &, IR_ModuleDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ModuleDescription *&);
-extern TAO_Export IR_ConstantDef_ptr (*_TAO_collocation_IR_ConstantDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ConstantDef
@@ -13298,7 +17714,7 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_ConstantDescription &); // c
TAO_Export void operator<<= (CORBA::Any &, IR_ConstantDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ConstantDescription *&);
-extern TAO_Export IR_TypedefDef_ptr (*_TAO_collocation_IR_TypedefDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_TypedefDef
@@ -13308,73 +17724,73 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_TypeDescription &); // copyi
TAO_Export void operator<<= (CORBA::Any &, IR_TypeDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypeDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_TypeDescription *&);
-extern TAO_Export IR_StructDef_ptr (*_TAO_collocation_IR_StructDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_StructDef
TAO_Export void operator<<= (CORBA::Any &, IR_StructDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructDef *&);
-extern TAO_Export IR_UnionDef_ptr (*_TAO_collocation_IR_UnionDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_UnionDef
TAO_Export void operator<<= (CORBA::Any &, IR_UnionDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionDef *&);
-extern TAO_Export IR_EnumDef_ptr (*_TAO_collocation_IR_EnumDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_EnumDef
TAO_Export void operator<<= (CORBA::Any &, IR_EnumDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumDef *&);
-extern TAO_Export IR_AliasDef_ptr (*_TAO_collocation_IR_AliasDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_AliasDef
TAO_Export void operator<<= (CORBA::Any &, IR_AliasDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AliasDef *&);
-extern TAO_Export IR_NativeDef_ptr (*_TAO_collocation_IR_NativeDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_NativeDef
TAO_Export void operator<<= (CORBA::Any &, IR_NativeDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_NativeDef *&);
-extern TAO_Export IR_PrimitiveDef_ptr (*_TAO_collocation_IR_PrimitiveDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_PrimitiveDef
TAO_Export void operator<<= (CORBA::Any &, IR_PrimitiveDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveDef *&);
-extern TAO_Export IR_StringDef_ptr (*_TAO_collocation_IR_StringDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_StringDef
TAO_Export void operator<<= (CORBA::Any &, IR_StringDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StringDef *&);
-extern TAO_Export IR_WstringDef_ptr (*_TAO_collocation_IR_WstringDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_WstringDef
TAO_Export void operator<<= (CORBA::Any &, IR_WstringDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_WstringDef *&);
-extern TAO_Export IR_FixedDef_ptr (*_TAO_collocation_IR_FixedDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_FixedDef
TAO_Export void operator<<= (CORBA::Any &, IR_FixedDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FixedDef *&);
-extern TAO_Export IR_SequenceDef_ptr (*_TAO_collocation_IR_SequenceDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_SequenceDef
TAO_Export void operator<<= (CORBA::Any &, IR_SequenceDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_SequenceDef *&);
-extern TAO_Export IR_ArrayDef_ptr (*_TAO_collocation_IR_ArrayDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ArrayDef
TAO_Export void operator<<= (CORBA::Any &, IR_ArrayDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ArrayDef *&);
-extern TAO_Export IR_ExceptionDef_ptr (*_TAO_collocation_IR_ExceptionDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ExceptionDef
@@ -13392,9 +17808,9 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_ExcDescriptionSeq &); // cop
TAO_Export void operator<<= (CORBA::Any &, IR_ExcDescriptionSeq*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExcDescriptionSeq *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExcDescriptionSeq *&);
-TAO_Export void operator<<= (CORBA::Any &, IR::AttributeMode);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeMode &);
-extern TAO_Export IR_AttributeDef_ptr (*_TAO_collocation_IR_AttributeDef_Stub_Factory_function_pointer) (
+TAO_Export void operator<<= (CORBA::Any &, IR_AttributeMode);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeMode &);
+extern TAO_Export _TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_AttributeDef
@@ -13404,10 +17820,10 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_AttributeDescription &); //
TAO_Export void operator<<= (CORBA::Any &, IR_AttributeDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_AttributeDescription *&);
-TAO_Export void operator<<= (CORBA::Any &, IR::OperationMode);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationMode &);
-TAO_Export void operator<<= (CORBA::Any &, IR::ParameterMode);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterMode &);
+TAO_Export void operator<<= (CORBA::Any &, IR_OperationMode);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationMode &);
+TAO_Export void operator<<= (CORBA::Any &, IR_ParameterMode);
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ParameterMode &);
TAO_Export void operator<<= (CORBA::Any &, const IR_ParameterDescription &); // copying version
TAO_Export void operator<<= (CORBA::Any &, IR_ParameterDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ParameterDescription *&); // deprecated
@@ -13420,7 +17836,7 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_ContextIdSeq &); // copying
TAO_Export void operator<<= (CORBA::Any &, IR_ContextIdSeq*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ContextIdSeq *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ContextIdSeq *&);
-extern TAO_Export IR_OperationDef_ptr (*_TAO_collocation_IR_OperationDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_OperationDef
@@ -13442,7 +17858,7 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_AttrDescriptionSeq &); // co
TAO_Export void operator<<= (CORBA::Any &, IR_AttrDescriptionSeq*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttrDescriptionSeq *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_AttrDescriptionSeq *&);
-extern TAO_Export IR_InterfaceDef_ptr (*_TAO_collocation_IR_InterfaceDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_InterfaceDef
@@ -13460,13 +17876,13 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_ValueMemberSeq &); // copyin
TAO_Export void operator<<= (CORBA::Any &, IR_ValueMemberSeq*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberSeq *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueMemberSeq *&);
-extern TAO_Export IR_ValueMemberDef_ptr (*_TAO_collocation_IR_ValueMemberDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ValueMemberDef
TAO_Export void operator<<= (CORBA::Any &, IR_ValueMemberDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberDef *&);
-extern TAO_Export IR_ValueDef_ptr (*_TAO_collocation_IR_ValueDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ValueDef
@@ -13476,13 +17892,13 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_ValueDescription &); // copy
TAO_Export void operator<<= (CORBA::Any &, IR_ValueDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueDescription *&);
-extern TAO_Export IR_ValueBoxDef_ptr (*_TAO_collocation_IR_ValueBoxDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ValueBoxDef
TAO_Export void operator<<= (CORBA::Any &, IR_ValueBoxDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueBoxDef *&);
-extern TAO_Export IR_ProvidesDef_ptr (*_TAO_collocation_IR_ProvidesDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ProvidesDef
@@ -13492,7 +17908,7 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_ProvidesDescription &); // c
TAO_Export void operator<<= (CORBA::Any &, IR_ProvidesDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDescription *&);
-extern TAO_Export IR_UsesDef_ptr (*_TAO_collocation_IR_UsesDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_UsesDef
@@ -13510,7 +17926,7 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_UsesDescSeq &); // copying v
TAO_Export void operator<<= (CORBA::Any &, IR_UsesDescSeq*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDescSeq *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDescSeq *&);
-extern TAO_Export IR_EventDef_ptr (*_TAO_collocation_IR_EventDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_EventDef
@@ -13520,25 +17936,25 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_EventDescription &); // copy
TAO_Export void operator<<= (CORBA::Any &, IR_EventDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EventDescription *&);
-extern TAO_Export IR_EmitsDef_ptr (*_TAO_collocation_IR_EmitsDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_EmitsDef
TAO_Export void operator<<= (CORBA::Any &, IR_EmitsDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EmitsDef *&);
-extern TAO_Export IR_PublishesDef_ptr (*_TAO_collocation_IR_PublishesDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_PublishesDef
TAO_Export void operator<<= (CORBA::Any &, IR_PublishesDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PublishesDef *&);
-extern TAO_Export IR_ConsumesDef_ptr (*_TAO_collocation_IR_ConsumesDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ConsumesDef
TAO_Export void operator<<= (CORBA::Any &, IR_ConsumesDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConsumesDef *&);
-extern TAO_Export IR_ComponentDef_ptr (*_TAO_collocation_IR_ComponentDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_ComponentDef
@@ -13548,7 +17964,7 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_ComponentDescription &); //
TAO_Export void operator<<= (CORBA::Any &, IR_ComponentDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ComponentDescription *&);
-extern TAO_Export IR_PrimaryKeyDef_ptr (*_TAO_collocation_IR_PrimaryKeyDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_PrimaryKeyDef
@@ -13558,19 +17974,19 @@ TAO_Export void operator<<= (CORBA::Any &, const IR_PrimaryKeyDescription &); //
TAO_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDescription*); // noncopying version
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDescription *&); // deprecated
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_PrimaryKeyDescription *&);
-extern TAO_Export IR_FactoryDef_ptr (*_TAO_collocation_IR_FactoryDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_FactoryDef
TAO_Export void operator<<= (CORBA::Any &, IR_FactoryDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FactoryDef *&);
-extern TAO_Export IR_FinderDef_ptr (*_TAO_collocation_IR_FinderDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_FinderDef
TAO_Export void operator<<= (CORBA::Any &, IR_FinderDef_ptr);
TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FinderDef *&);
-extern TAO_Export IR_HomeDef_ptr (*_TAO_collocation_IR_HomeDef_Stub_Factory_function_pointer) (
+extern TAO_Export _TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
CORBA::Object_ptr obj
);
// Any operators for interface IR_HomeDef
@@ -13583,16 +17999,15 @@ TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_HomeDescript
#ifndef __ACE_INLINE__
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::DefinitionKind &); //
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::DefinitionKind &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_DefinitionKind &); //
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_DefinitionKind &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IRObject_ptr );
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IRObject_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Contained_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Contained_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Contained::Description &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Contained::Description &);
-#if !defined _TAO_CDR_OP_IR_InterfaceDefSeq_H_
-#define _TAO_CDR_OP_IR_InterfaceDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_InterfaceDefSeq &
@@ -13602,12 +18017,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_InterfaceDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_InterfaceDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_ValueDefSeq_H_
-#define _TAO_CDR_OP_IR_ValueDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ValueDefSeq &
@@ -13617,12 +18026,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_ValueDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_ValueDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_ComponentDefSeq_H_
-#define _TAO_CDR_OP_IR_ComponentDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ComponentDefSeq &
@@ -13632,12 +18035,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_ComponentDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_ComponentDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_H_
-#define _TAO_CDR_OP_IR_ProvidesDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ProvidesDefSeq &
@@ -13647,12 +18044,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_ProvidesDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_UsesDefSeq_H_
-#define _TAO_CDR_OP_IR_UsesDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_UsesDefSeq &
@@ -13662,12 +18053,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_UsesDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_UsesDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_HomeDefSeq_H_
-#define _TAO_CDR_OP_IR_HomeDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_HomeDefSeq &
@@ -13677,12 +18062,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_HomeDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_HomeDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_EmitsDefSeq_H_
-#define _TAO_CDR_OP_IR_EmitsDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_EmitsDefSeq &
@@ -13692,12 +18071,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_EmitsDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_EmitsDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_PublishesDefSeq_H_
-#define _TAO_CDR_OP_IR_PublishesDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_PublishesDefSeq &
@@ -13707,12 +18080,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_PublishesDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_PublishesDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_H_
-#define _TAO_CDR_OP_IR_ConsumesDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ConsumesDefSeq &
@@ -13722,12 +18089,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_ConsumesDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_FactoryDefSeq_H_
-#define _TAO_CDR_OP_IR_FactoryDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_FactoryDefSeq &
@@ -13737,12 +18098,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_FactoryDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_FactoryDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_FinderDefSeq_H_
-#define _TAO_CDR_OP_IR_FinderDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_FinderDefSeq &
@@ -13752,12 +18107,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_FinderDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_FinderDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_ContainedSeq_H_
-#define _TAO_CDR_OP_IR_ContainedSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ContainedSeq &
@@ -13767,14 +18116,9 @@ TAO_Export CORBA::Boolean operator>> (
IR_ContainedSeq &
);
-#endif /* _TAO_CDR_OP_IR_ContainedSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_StructMember &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_StructMember &);
-#if !defined _TAO_CDR_OP_IR_StructMemberSeq_H_
-#define _TAO_CDR_OP_IR_StructMemberSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_StructMemberSeq &
@@ -13784,14 +18128,9 @@ TAO_Export CORBA::Boolean operator>> (
IR_StructMemberSeq &
);
-#endif /* _TAO_CDR_OP_IR_StructMemberSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Initializer &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Initializer &);
-#if !defined _TAO_CDR_OP_IR_InitializerSeq_H_
-#define _TAO_CDR_OP_IR_InitializerSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_InitializerSeq &
@@ -13801,14 +18140,9 @@ TAO_Export CORBA::Boolean operator>> (
IR_InitializerSeq &
);
-#endif /* _TAO_CDR_OP_IR_InitializerSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UnionMember &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UnionMember &);
-#if !defined _TAO_CDR_OP_IR_UnionMemberSeq_H_
-#define _TAO_CDR_OP_IR_UnionMemberSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_UnionMemberSeq &
@@ -13818,12 +18152,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_UnionMemberSeq &
);
-#endif /* _TAO_CDR_OP_IR_UnionMemberSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_EnumMemberSeq_H_
-#define _TAO_CDR_OP_IR_EnumMemberSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_EnumMemberSeq &
@@ -13833,16 +18161,11 @@ TAO_Export CORBA::Boolean operator>> (
IR_EnumMemberSeq &
);
-#endif /* _TAO_CDR_OP_IR_EnumMemberSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Container_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Container_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Container::Description &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Container::Description &);
-#if !defined _TAO_CDR_OP_IR_Container_DescriptionSeq_H_
-#define _TAO_CDR_OP_IR_Container_DescriptionSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_Container::DescriptionSeq &
@@ -13852,12 +18175,10 @@ TAO_Export CORBA::Boolean operator>> (
IR_Container::DescriptionSeq &
);
-#endif /* _TAO_CDR_OP_IR_Container_DescriptionSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_IDLType_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_IDLType_ptr &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimitiveKind &); //
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimitiveKind &);
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimitiveKind &); //
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimitiveKind &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Repository_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Repository_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ComponentRepository_ptr );
@@ -13901,9 +18222,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ExceptionDef_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ExceptionDescription &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ExceptionDescription &);
-#if !defined _TAO_CDR_OP_IR_ExceptionDefSeq_H_
-#define _TAO_CDR_OP_IR_ExceptionDefSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ExceptionDefSeq &
@@ -13913,12 +18231,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_ExceptionDefSeq &
);
-#endif /* _TAO_CDR_OP_IR_ExceptionDefSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_ExcDescriptionSeq_H_
-#define _TAO_CDR_OP_IR_ExcDescriptionSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ExcDescriptionSeq &
@@ -13928,24 +18240,19 @@ TAO_Export CORBA::Boolean operator>> (
IR_ExcDescriptionSeq &
);
-#endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_H_ */
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeMode &); //
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeMode &); //
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeMode &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDef_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDef_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDescription &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDescription &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::OperationMode &); //
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationMode &); //
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationMode &);
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ParameterMode &); //
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterMode &); //
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterMode &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterDescription &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ParameterDescription &);
-#if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_H_
-#define _TAO_CDR_OP_IR_ParDescriptionSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ParDescriptionSeq &
@@ -13955,12 +18262,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_ParDescriptionSeq &
);
-#endif /* _TAO_CDR_OP_IR_ParDescriptionSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_ContextIdSeq_H_
-#define _TAO_CDR_OP_IR_ContextIdSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ContextIdSeq &
@@ -13970,16 +18271,11 @@ TAO_Export CORBA::Boolean operator>> (
IR_ContextIdSeq &
);
-#endif /* _TAO_CDR_OP_IR_ContextIdSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationDef_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationDef_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationDescription &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationDescription &);
-#if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_H_
-#define _TAO_CDR_OP_IR_RepositoryIdSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_RepositoryIdSeq &
@@ -13989,12 +18285,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_RepositoryIdSeq &
);
-#endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_OpDescriptionSeq_H_
-#define _TAO_CDR_OP_IR_OpDescriptionSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_OpDescriptionSeq &
@@ -14004,12 +18294,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_OpDescriptionSeq &
);
-#endif /* _TAO_CDR_OP_IR_OpDescriptionSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_AttrDescriptionSeq_H_
-#define _TAO_CDR_OP_IR_AttrDescriptionSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_AttrDescriptionSeq &
@@ -14019,8 +18303,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_AttrDescriptionSeq &
);
-#endif /* _TAO_CDR_OP_IR_AttrDescriptionSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_InterfaceDef_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_InterfaceDef_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_InterfaceDescription &);
@@ -14028,9 +18310,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_InterfaceDescription &)
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueMember &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueMember &);
-#if !defined _TAO_CDR_OP_IR_ValueMemberSeq_H_
-#define _TAO_CDR_OP_IR_ValueMemberSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ValueMemberSeq &
@@ -14040,8 +18319,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_ValueMemberSeq &
);
-#endif /* _TAO_CDR_OP_IR_ValueMemberSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueMemberDef_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueMemberDef_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueDef_ptr );
@@ -14059,9 +18336,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UsesDef_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UsesDescription &);
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UsesDescription &);
-#if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_H_
-#define _TAO_CDR_OP_IR_ProvidesDescSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ProvidesDescSeq &
@@ -14071,12 +18345,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_ProvidesDescSeq &
);
-#endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_H_ */
-
-
-#if !defined _TAO_CDR_OP_IR_UsesDescSeq_H_
-#define _TAO_CDR_OP_IR_UsesDescSeq_H_
-
TAO_Export CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_UsesDescSeq &
@@ -14086,8 +18354,6 @@ TAO_Export CORBA::Boolean operator>> (
IR_UsesDescSeq &
);
-#endif /* _TAO_CDR_OP_IR_UsesDescSeq_H_ */
-
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EventDef_ptr );
TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EventDef_ptr &);
TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EventDescription &);
diff --git a/TAO/tao/InterfaceC.i b/TAO/tao/InterfaceC.i
index 05dbec5d7a4..67069babf0f 100644
--- a/TAO/tao/InterfaceC.i
+++ b/TAO/tao/InterfaceC.i
@@ -1,217 +1,201 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+//
//$Id$
-// ****** Code generated by the The ACE ORB (TAO) IDL Compiler *******
-// TAO and the TAO IDL Compiler have been developed by the Center for
-// Distributed Object Computing at Washington University, St. Louis.
+// **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+// Center for Distributed Object Computing
+// Washington University
+// St. Louis, MO
+// USA
+// http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+// Distributed Object Computing Laboratory
+// University of California at Irvine
+// Irvine, CA
+// USA
+// http://doc.ece.uci.edu/
//
// Information about TAO is available at:
-// http://www.cs.wustl.edu/~schmidt/TAO.html
+// http://www.cs.wustl.edu/~schmidt/TAO.html
ACE_INLINE
-CORBA_IRObject::CORBA_IRObject (void) // default constructor
-{}
-
-ACE_INLINE
-CORBA_IRObject::CORBA_IRObject (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-CORBA_IRObject::~CORBA_IRObject (void) // destructor
-{}
-
-
-#if !defined (_CORBA_IROBJECT___VAR_CI_)
-#define _CORBA_IROBJECT___VAR_CI_
+CORBA_IRObject::CORBA_IRObject (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
// *************************************************************
// Inline operations for class CORBA::IRObject_var
// *************************************************************
ACE_INLINE
-CORBA_IRObject_var::CORBA_IRObject_var (void) // default constructor
- : ptr_ (CORBA::IRObject::_nil ())
+CORBA::IRObject_var::IRObject_var (void) // default constructor
+ : ptr_ (IRObject::_nil ())
{}
-ACE_INLINE
-CORBA_IRObject_var::CORBA_IRObject_var (CORBA_IRObject_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE CORBA_IRObject_ptr
-CORBA_IRObject_var::ptr (void) const
+ACE_INLINE ::CORBA::IRObject_ptr
+CORBA::IRObject_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-CORBA_IRObject_var::CORBA_IRObject_var (const CORBA::IRObject_var &p) // copy constructor
+CORBA::IRObject_var::IRObject_var (const ::CORBA::IRObject_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (CORBA::IRObject::_duplicate (p.ptr ()))
+ ptr_ (IRObject::_duplicate (p.ptr ()))
{}
ACE_INLINE
-CORBA_IRObject_var::~CORBA_IRObject_var (void) // destructor
+CORBA::IRObject_var::~IRObject_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE CORBA_IRObject_var &
-CORBA_IRObject_var::operator= (CORBA_IRObject_ptr p)
+ACE_INLINE CORBA::IRObject_var &
+CORBA::IRObject_var::operator= (IRObject_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE CORBA_IRObject_var &
-CORBA_IRObject_var::operator= (const CORBA_IRObject_var &p)
+ACE_INLINE CORBA::IRObject_var &
+CORBA::IRObject_var::operator= (const ::CORBA::IRObject_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = CORBA::IRObject::_duplicate (p.ptr ());
+ this->ptr_ = ::CORBA::IRObject::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-CORBA_IRObject_var::operator const CORBA_IRObject_ptr &() const // cast
+ACE_INLINE
+CORBA::IRObject_var::operator const ::CORBA::IRObject_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-CORBA_IRObject_var::operator CORBA_IRObject_ptr &() // cast
+ACE_INLINE
+CORBA::IRObject_var::operator ::CORBA::IRObject_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE CORBA_IRObject_ptr
-CORBA_IRObject_var::operator-> (void) const
+ACE_INLINE ::CORBA::IRObject_ptr
+CORBA::IRObject_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE CORBA_IRObject_ptr
-CORBA_IRObject_var::in (void) const
+ACE_INLINE ::CORBA::IRObject_ptr
+CORBA::IRObject_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE CORBA_IRObject_ptr &
-CORBA_IRObject_var::inout (void)
+ACE_INLINE ::CORBA::IRObject_ptr &
+CORBA::IRObject_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE CORBA_IRObject_ptr &
-CORBA_IRObject_var::out (void)
+ACE_INLINE ::CORBA::IRObject_ptr &
+CORBA::IRObject_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = CORBA::IRObject::_nil ();
+ this->ptr_ = ::CORBA::IRObject::_nil ();
return this->ptr_;
}
-ACE_INLINE CORBA_IRObject_ptr
-CORBA_IRObject_var::_retn (void)
+ACE_INLINE ::CORBA::IRObject_ptr
+CORBA::IRObject_var::_retn (void)
{
// yield ownership of managed obj reference
- CORBA::IRObject_ptr val = this->ptr_;
- this->ptr_ = CORBA::IRObject::_nil ();
+ ::CORBA::IRObject_ptr val = this->ptr_;
+ this->ptr_ = ::CORBA::IRObject::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_CORBA_IROBJECT___OUT_CI_)
-#define _CORBA_IROBJECT___OUT_CI_
-
// *************************************************************
// Inline operations for class CORBA::IRObject_out
// *************************************************************
ACE_INLINE
-CORBA_IRObject_out::CORBA_IRObject_out (CORBA::IRObject_ptr &p)
+CORBA::IRObject_out::IRObject_out (IRObject_ptr &p)
: ptr_ (p)
{
- this->ptr_ = CORBA::IRObject::_nil ();
+ this->ptr_ = ::CORBA::IRObject::_nil ();
}
ACE_INLINE
-CORBA_IRObject_out::CORBA_IRObject_out (CORBA::IRObject_var &p) // constructor from _var
+CORBA::IRObject_out::IRObject_out (IRObject_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = CORBA::IRObject::_nil ();
+ this->ptr_ = ::CORBA::IRObject::_nil ();
}
ACE_INLINE
-CORBA_IRObject_out::CORBA_IRObject_out (const CORBA_IRObject_out &p) // copy constructor
- : ptr_ (ACE_const_cast (CORBA::IRObject_out&,p).ptr_)
+CORBA::IRObject_out::IRObject_out (const ::CORBA::IRObject_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IRObject_out &, p).ptr_)
{}
-ACE_INLINE CORBA_IRObject_out &
-CORBA_IRObject_out::operator= (const CORBA_IRObject_out &p)
+ACE_INLINE ::CORBA::IRObject_out &
+CORBA::IRObject_out::operator= (const ::CORBA::IRObject_out &p)
{
- this->ptr_ = ACE_const_cast (CORBA::IRObject_out&,p).ptr_;
+ this->ptr_ = ACE_const_cast (CORBA_IRObject_out&, p).ptr_;
return *this;
}
-ACE_INLINE CORBA_IRObject_out &
-CORBA_IRObject_out::operator= (const CORBA_IRObject_var &p)
+ACE_INLINE CORBA::IRObject_out &
+CORBA::IRObject_out::operator= (const ::CORBA::IRObject_var &p)
{
- this->ptr_ = CORBA::IRObject::_duplicate (p.ptr ());
+ this->ptr_ = ::CORBA::IRObject::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE CORBA_IRObject_out &
-CORBA_IRObject_out::operator= (CORBA::IRObject_ptr p)
+ACE_INLINE CORBA::IRObject_out &
+CORBA::IRObject_out::operator= (IRObject_ptr p)
{
this->ptr_ = p;
return *this;
}
-ACE_INLINE
-CORBA_IRObject_out::operator CORBA_IRObject_ptr &() // cast
+ACE_INLINE
+CORBA::IRObject_out::operator ::CORBA::IRObject_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE CORBA_IRObject_ptr &
-CORBA_IRObject_out::ptr (void) // ptr
+ACE_INLINE ::CORBA::IRObject_ptr &
+CORBA::IRObject_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE CORBA_IRObject_ptr
-CORBA_IRObject_out::operator-> (void)
+ACE_INLINE ::CORBA::IRObject_ptr
+CORBA::IRObject_out::operator-> (void)
{
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
ACE_INLINE
-IR_Contained::IR_Contained (void) // default constructor
-{}
-
-ACE_INLINE
-IR_Contained::IR_Contained (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_Contained::~IR_Contained (void) // destructor
-{}
-
-
-#if !defined (_IR_CONTAINED___VAR_CI_)
-#define _IR_CONTAINED___VAR_CI_
+IR_Contained::IR_Contained (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
// *************************************************************
// Inline operations for class IR_Contained_var
@@ -222,19 +206,14 @@ IR_Contained_var::IR_Contained_var (void) // default constructor
: ptr_ (IR_Contained::_nil ())
{}
-ACE_INLINE
-IR_Contained_var::IR_Contained_var (IR_Contained_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_Contained_ptr
+ACE_INLINE IR_Contained_ptr
IR_Contained_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_Contained_var::IR_Contained_var (const ::IR_Contained_var &p) // copy constructor
+IR_Contained_var::IR_Contained_var (const IR_Contained_var &p) // copy constructor
: TAO_Base_var (),
ptr_ (IR_Contained::_duplicate (p.ptr ()))
{}
@@ -254,70 +233,63 @@ IR_Contained_var::operator= (IR_Contained_ptr p)
}
ACE_INLINE IR_Contained_var &
-IR_Contained_var::operator= (const ::IR_Contained_var &p)
+IR_Contained_var::operator= (const IR_Contained_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Contained::_duplicate (p.ptr ());
+ this->ptr_ = IR_Contained::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_Contained_var::operator const ::IR_Contained_ptr &() const // cast
+ACE_INLINE
+IR_Contained_var::operator const IR_Contained_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_Contained_var::operator ::IR_Contained_ptr &() // cast
+ACE_INLINE
+IR_Contained_var::operator IR_Contained_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_Contained_ptr
+ACE_INLINE IR_Contained_ptr
IR_Contained_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_Contained_ptr
+ACE_INLINE IR_Contained_ptr
IR_Contained_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_Contained_ptr &
+ACE_INLINE IR_Contained_ptr &
IR_Contained_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_Contained_ptr &
+ACE_INLINE IR_Contained_ptr &
IR_Contained_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Contained::_nil ();
+ this->ptr_ = IR_Contained::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_Contained_ptr
+ACE_INLINE IR_Contained_ptr
IR_Contained_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_Contained_ptr val = this->ptr_;
- this->ptr_ = ::IR_Contained::_nil ();
+ IR_Contained_ptr val = this->ptr_;
+ this->ptr_ = IR_Contained::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONTAINED___OUT_CI_)
-#define _IR_CONTAINED___OUT_CI_
-
// *************************************************************
// Inline operations for class IR_Contained_out
// *************************************************************
@@ -326,7 +298,7 @@ ACE_INLINE
IR_Contained_out::IR_Contained_out (IR_Contained_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_Contained::_nil ();
+ this->ptr_ = IR_Contained::_nil ();
}
ACE_INLINE
@@ -334,25 +306,25 @@ IR_Contained_out::IR_Contained_out (IR_Contained_var &p) // constructor from _va
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Contained::_nil ();
+ this->ptr_ = IR_Contained::_nil ();
}
ACE_INLINE
-IR_Contained_out::IR_Contained_out (const ::IR_Contained_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_Contained_out &, p).ptr_)
+IR_Contained_out::IR_Contained_out (const IR_Contained_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_Contained_out&,p).ptr_)
{}
-ACE_INLINE ::IR_Contained_out &
-IR_Contained_out::operator= (const ::IR_Contained_out &p)
+ACE_INLINE IR_Contained_out &
+IR_Contained_out::operator= (const IR_Contained_out &p)
{
- this->ptr_ = ACE_const_cast (IR_Contained_out&, p).ptr_;
+ this->ptr_ = ACE_const_cast (IR_Contained_out&,p).ptr_;
return *this;
}
ACE_INLINE IR_Contained_out &
-IR_Contained_out::operator= (const ::IR_Contained_var &p)
+IR_Contained_out::operator= (const IR_Contained_var &p)
{
- this->ptr_ = ::IR_Contained::_duplicate (p.ptr ());
+ this->ptr_ = IR_Contained::_duplicate (p.ptr ());
return *this;
}
@@ -363,26 +335,357 @@ IR_Contained_out::operator= (IR_Contained_ptr p)
return *this;
}
-ACE_INLINE
-IR_Contained_out::operator ::IR_Contained_ptr &() // cast
+ACE_INLINE
+IR_Contained_out::operator IR_Contained_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_Contained_ptr &
+ACE_INLINE IR_Contained_ptr &
IR_Contained_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_Contained_ptr
+ACE_INLINE IR_Contained_ptr
IR_Contained_out::operator-> (void)
{
return this->ptr_;
}
+ACE_INLINE
+IR_Repository::IR_Repository (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_Repository_var
+// *************************************************************
+
+ACE_INLINE
+IR_Repository_var::IR_Repository_var (void) // default constructor
+ : ptr_ (IR_Repository::_nil ())
+{}
+
+ACE_INLINE IR_Repository_ptr
+IR_Repository_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_Repository_var::IR_Repository_var (const IR_Repository_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_Repository::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_Repository_var::~IR_Repository_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_Repository_var &
+IR_Repository_var::operator= (IR_Repository_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_Repository_var &
+IR_Repository_var::operator= (const IR_Repository_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_Repository::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_Repository_var::operator const IR_Repository_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_Repository_var::operator IR_Repository_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Repository_ptr
+IR_Repository_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Repository_ptr
+IR_Repository_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Repository_ptr &
+IR_Repository_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Repository_ptr &
+IR_Repository_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_Repository::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Repository_ptr
+IR_Repository_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_Repository_ptr val = this->ptr_;
+ this->ptr_ = IR_Repository::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_Repository_out
+// *************************************************************
+
+ACE_INLINE
+IR_Repository_out::IR_Repository_out (IR_Repository_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_Repository::_nil ();
+}
+
+ACE_INLINE
+IR_Repository_out::IR_Repository_out (IR_Repository_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_Repository::_nil ();
+}
+
+ACE_INLINE
+IR_Repository_out::IR_Repository_out (const IR_Repository_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_Repository_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_Repository_out &
+IR_Repository_out::operator= (const IR_Repository_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_Repository_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_Repository_out &
+IR_Repository_out::operator= (const IR_Repository_var &p)
+{
+ this->ptr_ = IR_Repository::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_Repository_out &
+IR_Repository_out::operator= (IR_Repository_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_Repository_out::operator IR_Repository_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Repository_ptr &
+IR_Repository_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Repository_ptr
+IR_Repository_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_Container::IR_Container (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_Container_var
+// *************************************************************
+
+ACE_INLINE
+IR_Container_var::IR_Container_var (void) // default constructor
+ : ptr_ (IR_Container::_nil ())
+{}
+
+ACE_INLINE IR_Container_ptr
+IR_Container_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_Container_var::IR_Container_var (const IR_Container_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_Container::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_Container_var::~IR_Container_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_Container_var &
+IR_Container_var::operator= (IR_Container_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_Container_var &
+IR_Container_var::operator= (const IR_Container_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_Container::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_Container_var::operator const IR_Container_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_Container_var::operator IR_Container_ptr &() // cast
+{
+ return this->ptr_;
+}
-#endif /* end #if !defined */
+ACE_INLINE IR_Container_ptr
+IR_Container_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Container_ptr
+IR_Container_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Container_ptr &
+IR_Container_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Container_ptr &
+IR_Container_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_Container::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Container_ptr
+IR_Container_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_Container_ptr val = this->ptr_;
+ this->ptr_ = IR_Container::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_Container_out
+// *************************************************************
+
+ACE_INLINE
+IR_Container_out::IR_Container_out (IR_Container_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_Container::_nil ();
+}
+
+ACE_INLINE
+IR_Container_out::IR_Container_out (IR_Container_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_Container::_nil ();
+}
+
+ACE_INLINE
+IR_Container_out::IR_Container_out (const IR_Container_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_Container_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_Container_out &
+IR_Container_out::operator= (const IR_Container_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_Container_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_Container_out &
+IR_Container_out::operator= (const IR_Container_var &p)
+{
+ this->ptr_ = IR_Container::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_Container_out &
+IR_Container_out::operator= (IR_Container_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_Container_out::operator IR_Container_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Container_ptr &
+IR_Container_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_Container_ptr
+IR_Container_out::operator-> (void)
+{
+ return this->ptr_;
+}
// *************************************************************
// Inline operations for class IR_Contained::Description_var
@@ -451,20 +754,20 @@ IR_Contained::Description_var::operator const ::IR_Contained::Description &() co
}
ACE_INLINE
-IR_Contained::Description_var::operator ::IR_Contained::Description &() // cast
+IR_Contained::Description_var::operator ::IR_Contained::Description &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_Contained::Description_var::operator ::IR_Contained::Description &() const // cast
+IR_Contained::Description_var::operator ::IR_Contained::Description &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_Contained::Description_var::operator ::IR_Contained::Description *&() // cast
+IR_Contained::Description_var::operator ::IR_Contained::Description *&() // cast
{
return this->ptr_;
}
@@ -481,7 +784,7 @@ IR_Contained::Description_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_Contained::Description *&
IR_Contained::Description_var::out (void)
{
@@ -542,7 +845,7 @@ IR_Contained::Description_out::operator= (Description *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_Contained::Description_out::operator ::IR_Contained::Description *&() // cast
{
return this->ptr_;
@@ -560,46 +863,368 @@ IR_Contained::Description_out::operator-> (void)
return this->ptr_;
}
+ACE_INLINE
+IR_ModuleDef::IR_ModuleDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_ModuleDef_var
+// *************************************************************
ACE_INLINE
-IR_IDLType::IR_IDLType (void) // default constructor
+IR_ModuleDef_var::IR_ModuleDef_var (void) // default constructor
+ : ptr_ (IR_ModuleDef::_nil ())
{}
+ACE_INLINE IR_ModuleDef_ptr
+IR_ModuleDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
ACE_INLINE
-IR_IDLType::IR_IDLType (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
+IR_ModuleDef_var::IR_ModuleDef_var (const IR_ModuleDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_ModuleDef::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_IDLType::~IR_IDLType (void) // destructor
+IR_ModuleDef_var::~IR_ModuleDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_ModuleDef_var &
+IR_ModuleDef_var::operator= (IR_ModuleDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_ModuleDef_var &
+IR_ModuleDef_var::operator= (const IR_ModuleDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ModuleDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_ModuleDef_var::operator const IR_ModuleDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ModuleDef_var::operator IR_ModuleDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ModuleDef_ptr
+IR_ModuleDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ModuleDef_ptr
+IR_ModuleDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ModuleDef_ptr &
+IR_ModuleDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ModuleDef_ptr &
+IR_ModuleDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ModuleDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ModuleDef_ptr
+IR_ModuleDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_ModuleDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ModuleDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_ModuleDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_ModuleDef_out::IR_ModuleDef_out (IR_ModuleDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_ModuleDef::_nil ();
+}
+
+ACE_INLINE
+IR_ModuleDef_out::IR_ModuleDef_out (IR_ModuleDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ModuleDef::_nil ();
+}
+
+ACE_INLINE
+IR_ModuleDef_out::IR_ModuleDef_out (const IR_ModuleDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ModuleDef_out&,p).ptr_)
{}
+ACE_INLINE IR_ModuleDef_out &
+IR_ModuleDef_out::operator= (const IR_ModuleDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_ModuleDef_out&,p).ptr_;
+ return *this;
+}
-#if !defined (_IR_IDLTYPE___VAR_CI_)
-#define _IR_IDLTYPE___VAR_CI_
+ACE_INLINE IR_ModuleDef_out &
+IR_ModuleDef_out::operator= (const IR_ModuleDef_var &p)
+{
+ this->ptr_ = IR_ModuleDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_ModuleDef_out &
+IR_ModuleDef_out::operator= (IR_ModuleDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_ModuleDef_out::operator IR_ModuleDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ModuleDef_ptr &
+IR_ModuleDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ModuleDef_ptr
+IR_ModuleDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ConstantDef::IR_ConstantDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
// *************************************************************
-// Inline operations for class IR_IDLType_var
+// Inline operations for class IR_ConstantDef_var
// *************************************************************
ACE_INLINE
-IR_IDLType_var::IR_IDLType_var (void) // default constructor
- : ptr_ (IR_IDLType::_nil ())
+IR_ConstantDef_var::IR_ConstantDef_var (void) // default constructor
+ : ptr_ (IR_ConstantDef::_nil ())
{}
+ACE_INLINE IR_ConstantDef_ptr
+IR_ConstantDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
ACE_INLINE
-IR_IDLType_var::IR_IDLType_var (IR_IDLType_ptr p)
+IR_ConstantDef_var::IR_ConstantDef_var (const IR_ConstantDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_ConstantDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_ConstantDef_var::~IR_ConstantDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_ConstantDef_var &
+IR_ConstantDef_var::operator= (IR_ConstantDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_ConstantDef_var &
+IR_ConstantDef_var::operator= (const IR_ConstantDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ConstantDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_ConstantDef_var::operator const IR_ConstantDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ConstantDef_var::operator IR_ConstantDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConstantDef_ptr
+IR_ConstantDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConstantDef_ptr
+IR_ConstantDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConstantDef_ptr &
+IR_ConstantDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConstantDef_ptr &
+IR_ConstantDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ConstantDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConstantDef_ptr
+IR_ConstantDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_ConstantDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ConstantDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_ConstantDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_ConstantDef_out::IR_ConstantDef_out (IR_ConstantDef_ptr &p)
: ptr_ (p)
+{
+ this->ptr_ = IR_ConstantDef::_nil ();
+}
+
+ACE_INLINE
+IR_ConstantDef_out::IR_ConstantDef_out (IR_ConstantDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ConstantDef::_nil ();
+}
+
+ACE_INLINE
+IR_ConstantDef_out::IR_ConstantDef_out (const IR_ConstantDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ConstantDef_out&,p).ptr_)
{}
-ACE_INLINE ::IR_IDLType_ptr
+ACE_INLINE IR_ConstantDef_out &
+IR_ConstantDef_out::operator= (const IR_ConstantDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_ConstantDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_ConstantDef_out &
+IR_ConstantDef_out::operator= (const IR_ConstantDef_var &p)
+{
+ this->ptr_ = IR_ConstantDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_ConstantDef_out &
+IR_ConstantDef_out::operator= (IR_ConstantDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_ConstantDef_out::operator IR_ConstantDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConstantDef_ptr &
+IR_ConstantDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConstantDef_ptr
+IR_ConstantDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_IDLType::IR_IDLType (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_IDLType_var
+// *************************************************************
+
+ACE_INLINE
+IR_IDLType_var::IR_IDLType_var (void) // default constructor
+ : ptr_ (IR_IDLType::_nil ())
+{}
+
+ACE_INLINE IR_IDLType_ptr
IR_IDLType_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_IDLType_var::IR_IDLType_var (const ::IR_IDLType_var &p) // copy constructor
+IR_IDLType_var::IR_IDLType_var (const IR_IDLType_var &p) // copy constructor
: TAO_Base_var (),
ptr_ (IR_IDLType::_duplicate (p.ptr ()))
{}
@@ -619,70 +1244,63 @@ IR_IDLType_var::operator= (IR_IDLType_ptr p)
}
ACE_INLINE IR_IDLType_var &
-IR_IDLType_var::operator= (const ::IR_IDLType_var &p)
+IR_IDLType_var::operator= (const IR_IDLType_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_IDLType::_duplicate (p.ptr ());
+ this->ptr_ = IR_IDLType::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_IDLType_var::operator const ::IR_IDLType_ptr &() const // cast
+ACE_INLINE
+IR_IDLType_var::operator const IR_IDLType_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_IDLType_var::operator ::IR_IDLType_ptr &() // cast
+ACE_INLINE
+IR_IDLType_var::operator IR_IDLType_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_IDLType_ptr
+ACE_INLINE IR_IDLType_ptr
IR_IDLType_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_IDLType_ptr
+ACE_INLINE IR_IDLType_ptr
IR_IDLType_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_IDLType_ptr &
+ACE_INLINE IR_IDLType_ptr &
IR_IDLType_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_IDLType_ptr &
+ACE_INLINE IR_IDLType_ptr &
IR_IDLType_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_IDLType::_nil ();
+ this->ptr_ = IR_IDLType::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_IDLType_ptr
+ACE_INLINE IR_IDLType_ptr
IR_IDLType_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_IDLType_ptr val = this->ptr_;
- this->ptr_ = ::IR_IDLType::_nil ();
+ IR_IDLType_ptr val = this->ptr_;
+ this->ptr_ = IR_IDLType::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_IDLTYPE___OUT_CI_)
-#define _IR_IDLTYPE___OUT_CI_
-
// *************************************************************
// Inline operations for class IR_IDLType_out
// *************************************************************
@@ -691,7 +1309,7 @@ ACE_INLINE
IR_IDLType_out::IR_IDLType_out (IR_IDLType_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_IDLType::_nil ();
+ this->ptr_ = IR_IDLType::_nil ();
}
ACE_INLINE
@@ -699,25 +1317,25 @@ IR_IDLType_out::IR_IDLType_out (IR_IDLType_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_IDLType::_nil ();
+ this->ptr_ = IR_IDLType::_nil ();
}
ACE_INLINE
-IR_IDLType_out::IR_IDLType_out (const ::IR_IDLType_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_IDLType_out &, p).ptr_)
+IR_IDLType_out::IR_IDLType_out (const IR_IDLType_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_IDLType_out&,p).ptr_)
{}
-ACE_INLINE ::IR_IDLType_out &
-IR_IDLType_out::operator= (const ::IR_IDLType_out &p)
+ACE_INLINE IR_IDLType_out &
+IR_IDLType_out::operator= (const IR_IDLType_out &p)
{
- this->ptr_ = ACE_const_cast (IR_IDLType_out&, p).ptr_;
+ this->ptr_ = ACE_const_cast (IR_IDLType_out&,p).ptr_;
return *this;
}
ACE_INLINE IR_IDLType_out &
-IR_IDLType_out::operator= (const ::IR_IDLType_var &p)
+IR_IDLType_out::operator= (const IR_IDLType_var &p)
{
- this->ptr_ = ::IR_IDLType::_duplicate (p.ptr ());
+ this->ptr_ = IR_IDLType::_duplicate (p.ptr ());
return *this;
}
@@ -728,85 +1346,1248 @@ IR_IDLType_out::operator= (IR_IDLType_ptr p)
return *this;
}
-ACE_INLINE
-IR_IDLType_out::operator ::IR_IDLType_ptr &() // cast
+ACE_INLINE
+IR_IDLType_out::operator IR_IDLType_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_IDLType_ptr &
+ACE_INLINE IR_IDLType_ptr &
IR_IDLType_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_IDLType_ptr
+ACE_INLINE IR_IDLType_ptr
IR_IDLType_out::operator-> (void)
{
return this->ptr_;
}
+ACE_INLINE
+IR_StructDef::IR_StructDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
-#endif /* end #if !defined */
+// *************************************************************
+// Inline operations for class IR_StructDef_var
+// *************************************************************
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE
+IR_StructDef_var::IR_StructDef_var (void) // default constructor
+ : ptr_ (IR_StructDef::_nil ())
+{}
+
+ACE_INLINE IR_StructDef_ptr
+IR_StructDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_StructDef_var::IR_StructDef_var (const IR_StructDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_StructDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_StructDef_var::~IR_StructDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_StructDef_var &
+IR_StructDef_var::operator= (IR_StructDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_StructDef_var &
+IR_StructDef_var::operator= (const IR_StructDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_StructDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_StructDef_var::operator const IR_StructDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_StructDef_var::operator IR_StructDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_StructDef_ptr
+IR_StructDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_StructDef_ptr
+IR_StructDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_StructDef_ptr &
+IR_StructDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_StructDef_ptr &
+IR_StructDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_StructDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_StructDef_ptr
+IR_StructDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_StructDef_ptr val = this->ptr_;
+ this->ptr_ = IR_StructDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_StructDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_StructDef_out::IR_StructDef_out (IR_StructDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_StructDef::_nil ();
+}
+
+ACE_INLINE
+IR_StructDef_out::IR_StructDef_out (IR_StructDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_StructDef::_nil ();
+}
+
+ACE_INLINE
+IR_StructDef_out::IR_StructDef_out (const IR_StructDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_StructDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_StructDef_out &
+IR_StructDef_out::operator= (const IR_StructDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_StructDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_StructDef_out &
+IR_StructDef_out::operator= (const IR_StructDef_var &p)
+{
+ this->ptr_ = IR_StructDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_StructDef_out &
+IR_StructDef_out::operator= (IR_StructDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_StructDef_out::operator IR_StructDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_StructDef_ptr &
+IR_StructDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_StructDef_ptr
+IR_StructDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_UnionDef::IR_UnionDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_UnionDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_UnionDef_var::IR_UnionDef_var (void) // default constructor
+ : ptr_ (IR_UnionDef::_nil ())
+{}
+
+ACE_INLINE IR_UnionDef_ptr
+IR_UnionDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_UnionDef_var::IR_UnionDef_var (const IR_UnionDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_UnionDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_UnionDef_var::~IR_UnionDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_UnionDef_var &
+IR_UnionDef_var::operator= (IR_UnionDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_UnionDef_var &
+IR_UnionDef_var::operator= (const IR_UnionDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_UnionDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_UnionDef_var::operator const IR_UnionDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_UnionDef_var::operator IR_UnionDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UnionDef_ptr
+IR_UnionDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UnionDef_ptr
+IR_UnionDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UnionDef_ptr &
+IR_UnionDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UnionDef_ptr &
+IR_UnionDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_UnionDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UnionDef_ptr
+IR_UnionDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_UnionDef_ptr val = this->ptr_;
+ this->ptr_ = IR_UnionDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_UnionDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_UnionDef_out::IR_UnionDef_out (IR_UnionDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_UnionDef::_nil ();
+}
+
+ACE_INLINE
+IR_UnionDef_out::IR_UnionDef_out (IR_UnionDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_UnionDef::_nil ();
+}
+
+ACE_INLINE
+IR_UnionDef_out::IR_UnionDef_out (const IR_UnionDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_UnionDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_UnionDef_out &
+IR_UnionDef_out::operator= (const IR_UnionDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_UnionDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_UnionDef_out &
+IR_UnionDef_out::operator= (const IR_UnionDef_var &p)
+{
+ this->ptr_ = IR_UnionDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_UnionDef_out &
+IR_UnionDef_out::operator= (IR_UnionDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_UnionDef_out::operator IR_UnionDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UnionDef_ptr &
+IR_UnionDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UnionDef_ptr
+IR_UnionDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_EnumDef::IR_EnumDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_EnumDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_EnumDef_var::IR_EnumDef_var (void) // default constructor
+ : ptr_ (IR_EnumDef::_nil ())
+{}
+
+ACE_INLINE IR_EnumDef_ptr
+IR_EnumDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_EnumDef_var::IR_EnumDef_var (const IR_EnumDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_EnumDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_EnumDef_var::~IR_EnumDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_EnumDef_var &
+IR_EnumDef_var::operator= (IR_EnumDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_EnumDef_var &
+IR_EnumDef_var::operator= (const IR_EnumDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EnumDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_EnumDef_var::operator const IR_EnumDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_EnumDef_var::operator IR_EnumDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EnumDef_ptr
+IR_EnumDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EnumDef_ptr
+IR_EnumDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EnumDef_ptr &
+IR_EnumDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EnumDef_ptr &
+IR_EnumDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EnumDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EnumDef_ptr
+IR_EnumDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_EnumDef_ptr val = this->ptr_;
+ this->ptr_ = IR_EnumDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_EnumDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_EnumDef_out::IR_EnumDef_out (IR_EnumDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_EnumDef::_nil ();
+}
+
+ACE_INLINE
+IR_EnumDef_out::IR_EnumDef_out (IR_EnumDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EnumDef::_nil ();
+}
+
+ACE_INLINE
+IR_EnumDef_out::IR_EnumDef_out (const IR_EnumDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_EnumDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_EnumDef_out &
+IR_EnumDef_out::operator= (const IR_EnumDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_EnumDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_EnumDef_out &
+IR_EnumDef_out::operator= (const IR_EnumDef_var &p)
+{
+ this->ptr_ = IR_EnumDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_EnumDef_out &
+IR_EnumDef_out::operator= (IR_EnumDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_EnumDef_out::operator IR_EnumDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EnumDef_ptr &
+IR_EnumDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EnumDef_ptr
+IR_EnumDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_AliasDef::IR_AliasDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_AliasDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_AliasDef_var::IR_AliasDef_var (void) // default constructor
+ : ptr_ (IR_AliasDef::_nil ())
+{}
+
+ACE_INLINE IR_AliasDef_ptr
+IR_AliasDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_AliasDef_var::IR_AliasDef_var (const IR_AliasDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_AliasDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_AliasDef_var::~IR_AliasDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_AliasDef_var &
+IR_AliasDef_var::operator= (IR_AliasDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_AliasDef_var &
+IR_AliasDef_var::operator= (const IR_AliasDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_AliasDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_AliasDef_var::operator const IR_AliasDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_AliasDef_var::operator IR_AliasDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_AliasDef_ptr
+IR_AliasDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_AliasDef_ptr
+IR_AliasDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_AliasDef_ptr &
+IR_AliasDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_AliasDef_ptr &
+IR_AliasDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_AliasDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_AliasDef_ptr
+IR_AliasDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_AliasDef_ptr val = this->ptr_;
+ this->ptr_ = IR_AliasDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_AliasDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_AliasDef_out::IR_AliasDef_out (IR_AliasDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_AliasDef::_nil ();
+}
+
+ACE_INLINE
+IR_AliasDef_out::IR_AliasDef_out (IR_AliasDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_AliasDef::_nil ();
+}
+
+ACE_INLINE
+IR_AliasDef_out::IR_AliasDef_out (const IR_AliasDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_AliasDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_AliasDef_out &
+IR_AliasDef_out::operator= (const IR_AliasDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_AliasDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_AliasDef_out &
+IR_AliasDef_out::operator= (const IR_AliasDef_var &p)
+{
+ this->ptr_ = IR_AliasDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_AliasDef_out &
+IR_AliasDef_out::operator= (IR_AliasDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_AliasDef_out::operator IR_AliasDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_AliasDef_ptr &
+IR_AliasDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_AliasDef_ptr
+IR_AliasDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_InterfaceDef::IR_InterfaceDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_InterfaceDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_InterfaceDef_var::IR_InterfaceDef_var (void) // default constructor
+ : ptr_ (IR_InterfaceDef::_nil ())
+{}
+
+ACE_INLINE IR_InterfaceDef_ptr
+IR_InterfaceDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_InterfaceDef_var::IR_InterfaceDef_var (const IR_InterfaceDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_InterfaceDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_InterfaceDef_var::~IR_InterfaceDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_InterfaceDef_var &
+IR_InterfaceDef_var::operator= (IR_InterfaceDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_InterfaceDef_var &
+IR_InterfaceDef_var::operator= (const IR_InterfaceDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_InterfaceDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_InterfaceDef_var::operator const IR_InterfaceDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_InterfaceDef_var::operator IR_InterfaceDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_InterfaceDef_ptr
+IR_InterfaceDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_InterfaceDef_ptr
+IR_InterfaceDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_InterfaceDef_ptr &
+IR_InterfaceDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_InterfaceDef_ptr &
+IR_InterfaceDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_InterfaceDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_InterfaceDef_ptr
+IR_InterfaceDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_InterfaceDef_ptr val = this->ptr_;
+ this->ptr_ = IR_InterfaceDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_InterfaceDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_InterfaceDef_out::IR_InterfaceDef_out (IR_InterfaceDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_InterfaceDef::_nil ();
+}
+
+ACE_INLINE
+IR_InterfaceDef_out::IR_InterfaceDef_out (IR_InterfaceDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_InterfaceDef::_nil ();
+}
+
+ACE_INLINE
+IR_InterfaceDef_out::IR_InterfaceDef_out (const IR_InterfaceDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_InterfaceDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_InterfaceDef_out &
+IR_InterfaceDef_out::operator= (const IR_InterfaceDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_InterfaceDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_InterfaceDef_out &
+IR_InterfaceDef_out::operator= (const IR_InterfaceDef_var &p)
+{
+ this->ptr_ = IR_InterfaceDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_InterfaceDef_out &
+IR_InterfaceDef_out::operator= (IR_InterfaceDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_InterfaceDef_out::operator IR_InterfaceDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_InterfaceDef_ptr &
+IR_InterfaceDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_InterfaceDef_ptr
+IR_InterfaceDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ExceptionDef::IR_ExceptionDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_ExceptionDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_ExceptionDef_var::IR_ExceptionDef_var (void) // default constructor
+ : ptr_ (IR_ExceptionDef::_nil ())
+{}
+
+ACE_INLINE IR_ExceptionDef_ptr
+IR_ExceptionDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ExceptionDef_var::IR_ExceptionDef_var (const IR_ExceptionDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_ExceptionDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_ExceptionDef_var::~IR_ExceptionDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_ExceptionDef_var &
+IR_ExceptionDef_var::operator= (IR_ExceptionDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_ExceptionDef_var &
+IR_ExceptionDef_var::operator= (const IR_ExceptionDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ExceptionDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_ExceptionDef_var::operator const IR_ExceptionDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ExceptionDef_var::operator IR_ExceptionDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ExceptionDef_ptr
+IR_ExceptionDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ExceptionDef_ptr
+IR_ExceptionDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ExceptionDef_ptr &
+IR_ExceptionDef_var::inout (void)
+{
+ return this->ptr_;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_
+ACE_INLINE IR_ExceptionDef_ptr &
+IR_ExceptionDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ExceptionDef::_nil ();
+ return this->ptr_;
+}
+ACE_INLINE IR_ExceptionDef_ptr
+IR_ExceptionDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_ExceptionDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ExceptionDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_ExceptionDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_ExceptionDef_out::IR_ExceptionDef_out (IR_ExceptionDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_ExceptionDef::_nil ();
+}
+
+ACE_INLINE
+IR_ExceptionDef_out::IR_ExceptionDef_out (IR_ExceptionDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ExceptionDef::_nil ();
+}
+
+ACE_INLINE
+IR_ExceptionDef_out::IR_ExceptionDef_out (const IR_ExceptionDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ExceptionDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_ExceptionDef_out &
+IR_ExceptionDef_out::operator= (const IR_ExceptionDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_ExceptionDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_ExceptionDef_out &
+IR_ExceptionDef_out::operator= (const IR_ExceptionDef_var &p)
+{
+ this->ptr_ = IR_ExceptionDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_ExceptionDef_out &
+IR_ExceptionDef_out::operator= (IR_ExceptionDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_ExceptionDef_out::operator IR_ExceptionDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ExceptionDef_ptr &
+IR_ExceptionDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ExceptionDef_ptr
+IR_ExceptionDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_NativeDef::IR_NativeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_NativeDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_NativeDef_var::IR_NativeDef_var (void) // default constructor
+ : ptr_ (IR_NativeDef::_nil ())
+{}
+
+ACE_INLINE IR_NativeDef_ptr
+IR_NativeDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_NativeDef_var::IR_NativeDef_var (const IR_NativeDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_NativeDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_NativeDef_var::~IR_NativeDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_NativeDef_var &
+IR_NativeDef_var::operator= (IR_NativeDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_NativeDef_var &
+IR_NativeDef_var::operator= (const IR_NativeDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_NativeDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_NativeDef_var::operator const IR_NativeDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_NativeDef_var::operator IR_NativeDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_NativeDef_ptr
+IR_NativeDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_NativeDef_ptr
+IR_NativeDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_NativeDef_ptr &
+IR_NativeDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_NativeDef_ptr &
+IR_NativeDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_NativeDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_NativeDef_ptr
+IR_NativeDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_NativeDef_ptr val = this->ptr_;
+ this->ptr_ = IR_NativeDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_NativeDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_NativeDef_out::IR_NativeDef_out (IR_NativeDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_NativeDef::_nil ();
+}
+
+ACE_INLINE
+IR_NativeDef_out::IR_NativeDef_out (IR_NativeDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_NativeDef::_nil ();
+}
+
+ACE_INLINE
+IR_NativeDef_out::IR_NativeDef_out (const IR_NativeDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_NativeDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_NativeDef_out &
+IR_NativeDef_out::operator= (const IR_NativeDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_NativeDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_NativeDef_out &
+IR_NativeDef_out::operator= (const IR_NativeDef_var &p)
+{
+ this->ptr_ = IR_NativeDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_NativeDef_out &
+IR_NativeDef_out::operator= (IR_NativeDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_NativeDef_out::operator IR_NativeDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_NativeDef_ptr &
+IR_NativeDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_NativeDef_ptr
+IR_NativeDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_InterfaceDef **
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_InterfaceDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_InterfaceDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_InterfaceDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (IR_InterfaceDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (IR_InterfaceDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_InterfaceDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (this->maximum_);
IR_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_InterfaceDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -814,17 +2595,17 @@ IR_IDLType_out::operator-> (void)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -838,29 +2619,29 @@ IR_IDLType_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_InterfaceDef **tmp1 = ACE_reinterpret_cast (IR_InterfaceDef **, this->buffer_);
IR_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_InterfaceDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_InterfaceDef ** const tmp = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_InterfaceDef* *
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_InterfaceDef **result = 0;
if (orphan == 0)
@@ -892,21 +2673,14 @@ IR_IDLType_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_InterfaceDef* *
- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_INTERFACEDEFSEQ_CI_)
-#define _IR_INTERFACEDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_InterfaceDefSeq_var
@@ -968,27 +2742,27 @@ IR_InterfaceDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_InterfaceDefSeq_var::operator const ::IR_InterfaceDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() // cast
+ACE_INLINE
+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() const // cast
+ACE_INLINE
+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq *&() // cast
+IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq *&() // cast
{
return this->ptr_;
}
@@ -1011,7 +2785,7 @@ IR_InterfaceDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_InterfaceDefSeq *&
IR_InterfaceDefSeq_var::out (void)
{
@@ -1072,7 +2846,7 @@ IR_InterfaceDefSeq_out::operator= (IR_InterfaceDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_InterfaceDefSeq_out::operator ::IR_InterfaceDefSeq *&() // cast
{
return this->ptr_;
@@ -1096,68 +2870,228 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_ValueDef::IR_ValueDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
-#endif /* end #if !defined */
+// *************************************************************
+// Inline operations for class IR_ValueDef_var
+// *************************************************************
+ACE_INLINE
+IR_ValueDef_var::IR_ValueDef_var (void) // default constructor
+ : ptr_ (IR_ValueDef::_nil ())
+{}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE IR_ValueDef_ptr
+IR_ValueDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ValueDef_var::IR_ValueDef_var (const IR_ValueDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_ValueDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_ValueDef_var::~IR_ValueDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_
+ACE_INLINE IR_ValueDef_var &
+IR_ValueDef_var::operator= (IR_ValueDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+ACE_INLINE IR_ValueDef_var &
+IR_ValueDef_var::operator= (const IR_ValueDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ValueDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_ValueDef_var::operator const IR_ValueDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ValueDef_var::operator IR_ValueDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueDef_ptr
+IR_ValueDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueDef_ptr
+IR_ValueDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueDef_ptr &
+IR_ValueDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueDef_ptr &
+IR_ValueDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ValueDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueDef_ptr
+IR_ValueDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_ValueDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ValueDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_ValueDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_ValueDef_out::IR_ValueDef_out (IR_ValueDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_ValueDef::_nil ();
+}
+
+ACE_INLINE
+IR_ValueDef_out::IR_ValueDef_out (IR_ValueDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ValueDef::_nil ();
+}
+
+ACE_INLINE
+IR_ValueDef_out::IR_ValueDef_out (const IR_ValueDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ValueDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_ValueDef_out &
+IR_ValueDef_out::operator= (const IR_ValueDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_ValueDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_ValueDef_out &
+IR_ValueDef_out::operator= (const IR_ValueDef_var &p)
+{
+ this->ptr_ = IR_ValueDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_ValueDef_out &
+IR_ValueDef_out::operator= (IR_ValueDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_ValueDef_out::operator IR_ValueDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueDef_ptr &
+IR_ValueDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueDef_ptr
+IR_ValueDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_ValueDef **
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_ValueDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_ValueDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_ValueDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (IR_ValueDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (IR_ValueDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ValueDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (this->maximum_);
IR_ValueDef ** const tmp2 = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ValueDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -1165,17 +3099,17 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -1189,29 +3123,29 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ValueDef **tmp1 = ACE_reinterpret_cast (IR_ValueDef **, this->buffer_);
IR_ValueDef ** const tmp2 = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ValueDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_ValueDef ** const tmp = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_ValueDef* *
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ValueDef **result = 0;
if (orphan == 0)
@@ -1243,21 +3177,14 @@ IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_ValueDef* *
- _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ValueDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_VALUEDEFSEQ_CI_)
-#define _IR_VALUEDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ValueDefSeq_var
@@ -1319,27 +3246,27 @@ IR_ValueDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ValueDefSeq_var::operator const ::IR_ValueDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() // cast
+ACE_INLINE
+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() const // cast
+ACE_INLINE
+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ValueDefSeq_var::operator ::IR_ValueDefSeq *&() // cast
+IR_ValueDefSeq_var::operator ::IR_ValueDefSeq *&() // cast
{
return this->ptr_;
}
@@ -1362,7 +3289,7 @@ IR_ValueDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ValueDefSeq *&
IR_ValueDefSeq_var::out (void)
{
@@ -1423,7 +3350,7 @@ IR_ValueDefSeq_out::operator= (IR_ValueDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ValueDefSeq_out::operator ::IR_ValueDefSeq *&() // cast
{
return this->ptr_;
@@ -1447,68 +3374,395 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_ValueBoxDef::IR_ValueBoxDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_ValueBoxDef_var
+// *************************************************************
-#endif /* end #if !defined */
+ACE_INLINE
+IR_ValueBoxDef_var::IR_ValueBoxDef_var (void) // default constructor
+ : ptr_ (IR_ValueBoxDef::_nil ())
+{}
+ACE_INLINE IR_ValueBoxDef_ptr
+IR_ValueBoxDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE
+IR_ValueBoxDef_var::IR_ValueBoxDef_var (const IR_ValueBoxDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_ValueBoxDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_ValueBoxDef_var::~IR_ValueBoxDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_ValueBoxDef_var &
+IR_ValueBoxDef_var::operator= (IR_ValueBoxDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_ValueBoxDef_var &
+IR_ValueBoxDef_var::operator= (const IR_ValueBoxDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ValueBoxDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_ValueBoxDef_var::operator const IR_ValueBoxDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ValueBoxDef_var::operator IR_ValueBoxDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueBoxDef_ptr
+IR_ValueBoxDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueBoxDef_ptr
+IR_ValueBoxDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueBoxDef_ptr &
+IR_ValueBoxDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueBoxDef_ptr &
+IR_ValueBoxDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ValueBoxDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueBoxDef_ptr
+IR_ValueBoxDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_ValueBoxDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ValueBoxDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_ValueBoxDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_ValueBoxDef_out::IR_ValueBoxDef_out (IR_ValueBoxDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_ValueBoxDef::_nil ();
+}
+
+ACE_INLINE
+IR_ValueBoxDef_out::IR_ValueBoxDef_out (IR_ValueBoxDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ValueBoxDef::_nil ();
+}
+
+ACE_INLINE
+IR_ValueBoxDef_out::IR_ValueBoxDef_out (const IR_ValueBoxDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ValueBoxDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_ValueBoxDef_out &
+IR_ValueBoxDef_out::operator= (const IR_ValueBoxDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_ValueBoxDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_ValueBoxDef_out &
+IR_ValueBoxDef_out::operator= (const IR_ValueBoxDef_var &p)
+{
+ this->ptr_ = IR_ValueBoxDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_ValueBoxDef_out &
+IR_ValueBoxDef_out::operator= (IR_ValueBoxDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_ValueBoxDef_out::operator IR_ValueBoxDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueBoxDef_ptr &
+IR_ValueBoxDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ValueBoxDef_ptr
+IR_ValueBoxDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ComponentDef::IR_ComponentDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_ComponentDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_ComponentDef_var::IR_ComponentDef_var (void) // default constructor
+ : ptr_ (IR_ComponentDef::_nil ())
+{}
+
+ACE_INLINE IR_ComponentDef_ptr
+IR_ComponentDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ComponentDef_var::IR_ComponentDef_var (const IR_ComponentDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_ComponentDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_ComponentDef_var::~IR_ComponentDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_ComponentDef_var &
+IR_ComponentDef_var::operator= (IR_ComponentDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_ComponentDef_var &
+IR_ComponentDef_var::operator= (const IR_ComponentDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ComponentDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_ComponentDef_var::operator const IR_ComponentDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ComponentDef_var::operator IR_ComponentDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ComponentDef_ptr
+IR_ComponentDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ComponentDef_ptr
+IR_ComponentDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ComponentDef_ptr &
+IR_ComponentDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ComponentDef_ptr &
+IR_ComponentDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ComponentDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ComponentDef_ptr
+IR_ComponentDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_ComponentDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ComponentDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_ComponentDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_ComponentDef_out::IR_ComponentDef_out (IR_ComponentDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_ComponentDef::_nil ();
+}
+
+ACE_INLINE
+IR_ComponentDef_out::IR_ComponentDef_out (IR_ComponentDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ComponentDef::_nil ();
+}
+
+ACE_INLINE
+IR_ComponentDef_out::IR_ComponentDef_out (const IR_ComponentDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ComponentDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_ComponentDef_out &
+IR_ComponentDef_out::operator= (const IR_ComponentDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_ComponentDef_out&,p).ptr_;
+ return *this;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_
+ACE_INLINE IR_ComponentDef_out &
+IR_ComponentDef_out::operator= (const IR_ComponentDef_var &p)
+{
+ this->ptr_ = IR_ComponentDef::_duplicate (p.ptr ());
+ return *this;
+}
+ACE_INLINE IR_ComponentDef_out &
+IR_ComponentDef_out::operator= (IR_ComponentDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_ComponentDef_out::operator IR_ComponentDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ComponentDef_ptr &
+IR_ComponentDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ComponentDef_ptr
+IR_ComponentDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_ComponentDef **
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_ComponentDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_ComponentDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_ComponentDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR_ComponentDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR_ComponentDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ComponentDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_ComponentDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
IR_ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ComponentDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -1516,17 +3770,17 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -1540,29 +3794,29 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ComponentDef **tmp1 = ACE_reinterpret_cast (IR_ComponentDef **, this->buffer_);
IR_ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ComponentDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_ComponentDef ** const tmp = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_ComponentDef* *
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ComponentDef **result = 0;
if (orphan == 0)
@@ -1594,21 +3848,14 @@ IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_ComponentDef* *
- _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ComponentDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_COMPONENTDEFSEQ_CI_)
-#define _IR_COMPONENTDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ComponentDefSeq_var
@@ -1670,27 +3917,27 @@ IR_ComponentDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ComponentDefSeq_var::operator const ::IR_ComponentDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() // cast
+ACE_INLINE
+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() const // cast
+ACE_INLINE
+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq *&() // cast
+IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq *&() // cast
{
return this->ptr_;
}
@@ -1713,7 +3960,7 @@ IR_ComponentDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ComponentDefSeq *&
IR_ComponentDefSeq_var::out (void)
{
@@ -1774,7 +4021,7 @@ IR_ComponentDefSeq_out::operator= (IR_ComponentDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ComponentDefSeq_out::operator ::IR_ComponentDefSeq *&() // cast
{
return this->ptr_;
@@ -1798,68 +4045,228 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_ProvidesDef::IR_ProvidesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
-#endif /* end #if !defined */
+// *************************************************************
+// Inline operations for class IR_ProvidesDef_var
+// *************************************************************
+ACE_INLINE
+IR_ProvidesDef_var::IR_ProvidesDef_var (void) // default constructor
+ : ptr_ (IR_ProvidesDef::_nil ())
+{}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE IR_ProvidesDef_ptr
+IR_ProvidesDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_
+ACE_INLINE
+IR_ProvidesDef_var::IR_ProvidesDef_var (const IR_ProvidesDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_ProvidesDef::_duplicate (p.ptr ()))
+{}
+ACE_INLINE
+IR_ProvidesDef_var::~IR_ProvidesDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_ProvidesDef_var &
+IR_ProvidesDef_var::operator= (IR_ProvidesDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_ProvidesDef_var &
+IR_ProvidesDef_var::operator= (const IR_ProvidesDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ProvidesDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_ProvidesDef_var::operator const IR_ProvidesDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ProvidesDef_var::operator IR_ProvidesDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ProvidesDef_ptr
+IR_ProvidesDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ProvidesDef_ptr
+IR_ProvidesDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ProvidesDef_ptr &
+IR_ProvidesDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ProvidesDef_ptr &
+IR_ProvidesDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ProvidesDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ProvidesDef_ptr
+IR_ProvidesDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_ProvidesDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ProvidesDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_ProvidesDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_ProvidesDef_out::IR_ProvidesDef_out (IR_ProvidesDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_ProvidesDef::_nil ();
+}
+
+ACE_INLINE
+IR_ProvidesDef_out::IR_ProvidesDef_out (IR_ProvidesDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ProvidesDef::_nil ();
+}
+
+ACE_INLINE
+IR_ProvidesDef_out::IR_ProvidesDef_out (const IR_ProvidesDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ProvidesDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_ProvidesDef_out &
+IR_ProvidesDef_out::operator= (const IR_ProvidesDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_ProvidesDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_ProvidesDef_out &
+IR_ProvidesDef_out::operator= (const IR_ProvidesDef_var &p)
+{
+ this->ptr_ = IR_ProvidesDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_ProvidesDef_out &
+IR_ProvidesDef_out::operator= (IR_ProvidesDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_ProvidesDef_out::operator IR_ProvidesDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ProvidesDef_ptr &
+IR_ProvidesDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ProvidesDef_ptr
+IR_ProvidesDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_ProvidesDef **
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_ProvidesDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_ProvidesDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_ProvidesDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR_ProvidesDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR_ProvidesDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ProvidesDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_ProvidesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
IR_ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ProvidesDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -1867,17 +4274,17 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -1891,29 +4298,29 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ProvidesDef **tmp1 = ACE_reinterpret_cast (IR_ProvidesDef **, this->buffer_);
IR_ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ProvidesDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_ProvidesDef ** const tmp = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_ProvidesDef* *
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ProvidesDef **result = 0;
if (orphan == 0)
@@ -1945,21 +4352,14 @@ IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_ProvidesDef* *
- _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ProvidesDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PROVIDESDEFSEQ_CI_)
-#define _IR_PROVIDESDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ProvidesDefSeq_var
@@ -2021,27 +4421,27 @@ IR_ProvidesDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ProvidesDefSeq_var::operator const ::IR_ProvidesDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() // cast
+ACE_INLINE
+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() const // cast
+ACE_INLINE
+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq *&() // cast
+IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq *&() // cast
{
return this->ptr_;
}
@@ -2064,7 +4464,7 @@ IR_ProvidesDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ProvidesDefSeq *&
IR_ProvidesDefSeq_var::out (void)
{
@@ -2125,7 +4525,7 @@ IR_ProvidesDefSeq_out::operator= (IR_ProvidesDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ProvidesDefSeq_out::operator ::IR_ProvidesDefSeq *&() // cast
{
return this->ptr_;
@@ -2149,68 +4549,228 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_UsesDef::IR_UsesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
-#endif /* end #if !defined */
+// *************************************************************
+// Inline operations for class IR_UsesDef_var
+// *************************************************************
+ACE_INLINE
+IR_UsesDef_var::IR_UsesDef_var (void) // default constructor
+ : ptr_ (IR_UsesDef::_nil ())
+{}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE IR_UsesDef_ptr
+IR_UsesDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_UsesDef_var::IR_UsesDef_var (const IR_UsesDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_UsesDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_UsesDef_var::~IR_UsesDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_UsesDef_var &
+IR_UsesDef_var::operator= (IR_UsesDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_UsesDef_var &
+IR_UsesDef_var::operator= (const IR_UsesDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_UsesDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_UsesDef_var::operator const IR_UsesDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_UsesDef_var::operator IR_UsesDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UsesDef_ptr
+IR_UsesDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UsesDef_ptr
+IR_UsesDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UsesDef_ptr &
+IR_UsesDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UsesDef_ptr &
+IR_UsesDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_UsesDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UsesDef_ptr
+IR_UsesDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_UsesDef_ptr val = this->ptr_;
+ this->ptr_ = IR_UsesDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_UsesDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_UsesDef_out::IR_UsesDef_out (IR_UsesDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_UsesDef::_nil ();
+}
+
+ACE_INLINE
+IR_UsesDef_out::IR_UsesDef_out (IR_UsesDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_UsesDef::_nil ();
+}
+
+ACE_INLINE
+IR_UsesDef_out::IR_UsesDef_out (const IR_UsesDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_UsesDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_UsesDef_out &
+IR_UsesDef_out::operator= (const IR_UsesDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_UsesDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_UsesDef_out &
+IR_UsesDef_out::operator= (const IR_UsesDef_var &p)
+{
+ this->ptr_ = IR_UsesDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_UsesDef_out &
+IR_UsesDef_out::operator= (IR_UsesDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_UsesDef_out::operator IR_UsesDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_UsesDef_ptr &
+IR_UsesDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_
+ACE_INLINE IR_UsesDef_ptr
+IR_UsesDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_UsesDef **
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_UsesDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_UsesDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_UsesDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR_UsesDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR_UsesDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_UsesDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_UsesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
IR_UsesDef ** const tmp2 = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_UsesDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -2218,17 +4778,17 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -2242,29 +4802,29 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_UsesDef **tmp1 = ACE_reinterpret_cast (IR_UsesDef **, this->buffer_);
IR_UsesDef ** const tmp2 = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_UsesDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_UsesDef ** const tmp = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_UsesDef* *
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_UsesDef **result = 0;
if (orphan == 0)
@@ -2296,21 +4856,14 @@ IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_UsesDef* *
- _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_UsesDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_USESDEFSEQ_CI_)
-#define _IR_USESDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_UsesDefSeq_var
@@ -2372,27 +4925,27 @@ IR_UsesDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_UsesDefSeq_var::operator const ::IR_UsesDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() // cast
+ACE_INLINE
+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() const // cast
+ACE_INLINE
+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_UsesDefSeq_var::operator ::IR_UsesDefSeq *&() // cast
+IR_UsesDefSeq_var::operator ::IR_UsesDefSeq *&() // cast
{
return this->ptr_;
}
@@ -2415,7 +4968,7 @@ IR_UsesDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_UsesDefSeq *&
IR_UsesDefSeq_var::out (void)
{
@@ -2476,7 +5029,7 @@ IR_UsesDefSeq_out::operator= (IR_UsesDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_UsesDefSeq_out::operator ::IR_UsesDefSeq *&() // cast
{
return this->ptr_;
@@ -2500,68 +5053,228 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_HomeDef::IR_HomeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_HomeDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_HomeDef_var::IR_HomeDef_var (void) // default constructor
+ : ptr_ (IR_HomeDef::_nil ())
+{}
-#endif /* end #if !defined */
+ACE_INLINE IR_HomeDef_ptr
+IR_HomeDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+ACE_INLINE
+IR_HomeDef_var::IR_HomeDef_var (const IR_HomeDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_HomeDef::_duplicate (p.ptr ()))
+{}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE
+IR_HomeDef_var::~IR_HomeDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_HomeDef_var &
+IR_HomeDef_var::operator= (IR_HomeDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_HomeDef_var &
+IR_HomeDef_var::operator= (const IR_HomeDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_HomeDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_HomeDef_var::operator const IR_HomeDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_HomeDef_var::operator IR_HomeDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_HomeDef_ptr
+IR_HomeDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_HomeDef_ptr
+IR_HomeDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_HomeDef_ptr &
+IR_HomeDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_HomeDef_ptr &
+IR_HomeDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_HomeDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_HomeDef_ptr
+IR_HomeDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_HomeDef_ptr val = this->ptr_;
+ this->ptr_ = IR_HomeDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_HomeDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_HomeDef_out::IR_HomeDef_out (IR_HomeDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_HomeDef::_nil ();
+}
+
+ACE_INLINE
+IR_HomeDef_out::IR_HomeDef_out (IR_HomeDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_HomeDef::_nil ();
+}
+
+ACE_INLINE
+IR_HomeDef_out::IR_HomeDef_out (const IR_HomeDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_HomeDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_HomeDef_out &
+IR_HomeDef_out::operator= (const IR_HomeDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_HomeDef_out&,p).ptr_;
+ return *this;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_
+ACE_INLINE IR_HomeDef_out &
+IR_HomeDef_out::operator= (const IR_HomeDef_var &p)
+{
+ this->ptr_ = IR_HomeDef::_duplicate (p.ptr ());
+ return *this;
+}
+ACE_INLINE IR_HomeDef_out &
+IR_HomeDef_out::operator= (IR_HomeDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_HomeDef_out::operator IR_HomeDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_HomeDef_ptr &
+IR_HomeDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_HomeDef_ptr
+IR_HomeDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_HomeDef **
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_HomeDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_HomeDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_HomeDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR_HomeDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR_HomeDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_HomeDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_HomeDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
IR_HomeDef ** const tmp2 = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_HomeDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -2569,17 +5282,17 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -2593,29 +5306,29 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_HomeDef **tmp1 = ACE_reinterpret_cast (IR_HomeDef **, this->buffer_);
IR_HomeDef ** const tmp2 = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_HomeDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_HomeDef ** const tmp = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_HomeDef* *
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_HomeDef **result = 0;
if (orphan == 0)
@@ -2647,21 +5360,14 @@ IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_HomeDef* *
- _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_HomeDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_HOMEDEFSEQ_CI_)
-#define _IR_HOMEDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_HomeDefSeq_var
@@ -2723,27 +5429,27 @@ IR_HomeDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_HomeDefSeq_var::operator const ::IR_HomeDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() // cast
+ACE_INLINE
+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() const // cast
+ACE_INLINE
+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_HomeDefSeq_var::operator ::IR_HomeDefSeq *&() // cast
+IR_HomeDefSeq_var::operator ::IR_HomeDefSeq *&() // cast
{
return this->ptr_;
}
@@ -2766,7 +5472,7 @@ IR_HomeDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_HomeDefSeq *&
IR_HomeDefSeq_var::out (void)
{
@@ -2827,7 +5533,7 @@ IR_HomeDefSeq_out::operator= (IR_HomeDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_HomeDefSeq_out::operator ::IR_HomeDefSeq *&() // cast
{
return this->ptr_;
@@ -2851,68 +5557,395 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_EventDef::IR_EventDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
-#endif /* end #if !defined */
+// *************************************************************
+// Inline operations for class IR_EventDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_EventDef_var::IR_EventDef_var (void) // default constructor
+ : ptr_ (IR_EventDef::_nil ())
+{}
+ACE_INLINE IR_EventDef_ptr
+IR_EventDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE
+IR_EventDef_var::IR_EventDef_var (const IR_EventDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_EventDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_EventDef_var::~IR_EventDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_EventDef_var &
+IR_EventDef_var::operator= (IR_EventDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_EventDef_var &
+IR_EventDef_var::operator= (const IR_EventDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EventDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_EventDef_var::operator const IR_EventDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_EventDef_var::operator IR_EventDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EventDef_ptr
+IR_EventDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EventDef_ptr
+IR_EventDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EventDef_ptr &
+IR_EventDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EventDef_ptr &
+IR_EventDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EventDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EventDef_ptr
+IR_EventDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_EventDef_ptr val = this->ptr_;
+ this->ptr_ = IR_EventDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_EventDef_out
+// *************************************************************
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_
+ACE_INLINE
+IR_EventDef_out::IR_EventDef_out (IR_EventDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_EventDef::_nil ();
+}
+ACE_INLINE
+IR_EventDef_out::IR_EventDef_out (IR_EventDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EventDef::_nil ();
+}
+
+ACE_INLINE
+IR_EventDef_out::IR_EventDef_out (const IR_EventDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_EventDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_EventDef_out &
+IR_EventDef_out::operator= (const IR_EventDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_EventDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_EventDef_out &
+IR_EventDef_out::operator= (const IR_EventDef_var &p)
+{
+ this->ptr_ = IR_EventDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_EventDef_out &
+IR_EventDef_out::operator= (IR_EventDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_EventDef_out::operator IR_EventDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EventDef_ptr &
+IR_EventDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EventDef_ptr
+IR_EventDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_EmitsDef::IR_EmitsDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_EmitsDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_EmitsDef_var::IR_EmitsDef_var (void) // default constructor
+ : ptr_ (IR_EmitsDef::_nil ())
+{}
+
+ACE_INLINE IR_EmitsDef_ptr
+IR_EmitsDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_EmitsDef_var::IR_EmitsDef_var (const IR_EmitsDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_EmitsDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_EmitsDef_var::~IR_EmitsDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_EmitsDef_var &
+IR_EmitsDef_var::operator= (IR_EmitsDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_EmitsDef_var &
+IR_EmitsDef_var::operator= (const IR_EmitsDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EmitsDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_EmitsDef_var::operator const IR_EmitsDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_EmitsDef_var::operator IR_EmitsDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EmitsDef_ptr
+IR_EmitsDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EmitsDef_ptr
+IR_EmitsDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EmitsDef_ptr &
+IR_EmitsDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EmitsDef_ptr &
+IR_EmitsDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EmitsDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EmitsDef_ptr
+IR_EmitsDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_EmitsDef_ptr val = this->ptr_;
+ this->ptr_ = IR_EmitsDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_EmitsDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_EmitsDef_out::IR_EmitsDef_out (IR_EmitsDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_EmitsDef::_nil ();
+}
+
+ACE_INLINE
+IR_EmitsDef_out::IR_EmitsDef_out (IR_EmitsDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_EmitsDef::_nil ();
+}
+
+ACE_INLINE
+IR_EmitsDef_out::IR_EmitsDef_out (const IR_EmitsDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_EmitsDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_EmitsDef_out &
+IR_EmitsDef_out::operator= (const IR_EmitsDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_EmitsDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_EmitsDef_out &
+IR_EmitsDef_out::operator= (const IR_EmitsDef_var &p)
+{
+ this->ptr_ = IR_EmitsDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_EmitsDef_out &
+IR_EmitsDef_out::operator= (IR_EmitsDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_EmitsDef_out::operator IR_EmitsDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EmitsDef_ptr &
+IR_EmitsDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_EmitsDef_ptr
+IR_EmitsDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_EmitsDef **
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_EmitsDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_EmitsDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_EmitsDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR_EmitsDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR_EmitsDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_EmitsDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_EmitsDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
IR_EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_EmitsDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -2920,17 +5953,17 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -2944,29 +5977,29 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_EmitsDef **tmp1 = ACE_reinterpret_cast (IR_EmitsDef **, this->buffer_);
IR_EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_EmitsDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_EmitsDef ** const tmp = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_EmitsDef* *
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_EmitsDef **result = 0;
if (orphan == 0)
@@ -2998,21 +6031,14 @@ IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_EmitsDef* *
- _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_EmitsDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_EMITSDEFSEQ_CI_)
-#define _IR_EMITSDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_EmitsDefSeq_var
@@ -3074,27 +6100,27 @@ IR_EmitsDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_EmitsDefSeq_var::operator const ::IR_EmitsDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() // cast
+ACE_INLINE
+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() const // cast
+ACE_INLINE
+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq *&() // cast
+IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq *&() // cast
{
return this->ptr_;
}
@@ -3117,7 +6143,7 @@ IR_EmitsDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_EmitsDefSeq *&
IR_EmitsDefSeq_var::out (void)
{
@@ -3178,7 +6204,7 @@ IR_EmitsDefSeq_out::operator= (IR_EmitsDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_EmitsDefSeq_out::operator ::IR_EmitsDefSeq *&() // cast
{
return this->ptr_;
@@ -3202,68 +6228,228 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_PublishesDef::IR_PublishesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
-#endif /* end #if !defined */
+// *************************************************************
+// Inline operations for class IR_PublishesDef_var
+// *************************************************************
+ACE_INLINE
+IR_PublishesDef_var::IR_PublishesDef_var (void) // default constructor
+ : ptr_ (IR_PublishesDef::_nil ())
+{}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE IR_PublishesDef_ptr
+IR_PublishesDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_PublishesDef_var::IR_PublishesDef_var (const IR_PublishesDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_PublishesDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_PublishesDef_var::~IR_PublishesDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_PublishesDef_var &
+IR_PublishesDef_var::operator= (IR_PublishesDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_PublishesDef_var &
+IR_PublishesDef_var::operator= (const IR_PublishesDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_PublishesDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_PublishesDef_var::operator const IR_PublishesDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_PublishesDef_var::operator IR_PublishesDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PublishesDef_ptr
+IR_PublishesDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PublishesDef_ptr
+IR_PublishesDef_var::in (void) const
+{
+ return this->ptr_;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_
+ACE_INLINE IR_PublishesDef_ptr &
+IR_PublishesDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PublishesDef_ptr &
+IR_PublishesDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_PublishesDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PublishesDef_ptr
+IR_PublishesDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_PublishesDef_ptr val = this->ptr_;
+ this->ptr_ = IR_PublishesDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_PublishesDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_PublishesDef_out::IR_PublishesDef_out (IR_PublishesDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_PublishesDef::_nil ();
+}
+ACE_INLINE
+IR_PublishesDef_out::IR_PublishesDef_out (IR_PublishesDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_PublishesDef::_nil ();
+}
+
+ACE_INLINE
+IR_PublishesDef_out::IR_PublishesDef_out (const IR_PublishesDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_PublishesDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_PublishesDef_out &
+IR_PublishesDef_out::operator= (const IR_PublishesDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_PublishesDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_PublishesDef_out &
+IR_PublishesDef_out::operator= (const IR_PublishesDef_var &p)
+{
+ this->ptr_ = IR_PublishesDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_PublishesDef_out &
+IR_PublishesDef_out::operator= (IR_PublishesDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_PublishesDef_out::operator IR_PublishesDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PublishesDef_ptr &
+IR_PublishesDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PublishesDef_ptr
+IR_PublishesDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_PublishesDef **
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_PublishesDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_PublishesDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_PublishesDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR_PublishesDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR_PublishesDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_PublishesDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_PublishesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
IR_PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_PublishesDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -3271,17 +6457,17 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -3295,29 +6481,29 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_PublishesDef **tmp1 = ACE_reinterpret_cast (IR_PublishesDef **, this->buffer_);
IR_PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_PublishesDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_PublishesDef ** const tmp = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_PublishesDef* *
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_PublishesDef **result = 0;
if (orphan == 0)
@@ -3349,21 +6535,14 @@ IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_PublishesDef* *
- _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_PublishesDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PUBLISHESDEFSEQ_CI_)
-#define _IR_PUBLISHESDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_PublishesDefSeq_var
@@ -3425,27 +6604,27 @@ IR_PublishesDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_PublishesDefSeq_var::operator const ::IR_PublishesDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() // cast
+ACE_INLINE
+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() const // cast
+ACE_INLINE
+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq *&() // cast
+IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq *&() // cast
{
return this->ptr_;
}
@@ -3468,7 +6647,7 @@ IR_PublishesDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_PublishesDefSeq *&
IR_PublishesDefSeq_var::out (void)
{
@@ -3529,7 +6708,7 @@ IR_PublishesDefSeq_out::operator= (IR_PublishesDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_PublishesDefSeq_out::operator ::IR_PublishesDefSeq *&() // cast
{
return this->ptr_;
@@ -3553,68 +6732,228 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_ConsumesDef::IR_ConsumesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
-#endif /* end #if !defined */
+// *************************************************************
+// Inline operations for class IR_ConsumesDef_var
+// *************************************************************
+ACE_INLINE
+IR_ConsumesDef_var::IR_ConsumesDef_var (void) // default constructor
+ : ptr_ (IR_ConsumesDef::_nil ())
+{}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE IR_ConsumesDef_ptr
+IR_ConsumesDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ConsumesDef_var::IR_ConsumesDef_var (const IR_ConsumesDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_ConsumesDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_ConsumesDef_var::~IR_ConsumesDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_ConsumesDef_var &
+IR_ConsumesDef_var::operator= (IR_ConsumesDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_ConsumesDef_var &
+IR_ConsumesDef_var::operator= (const IR_ConsumesDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ConsumesDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_ConsumesDef_var::operator const IR_ConsumesDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_ConsumesDef_var::operator IR_ConsumesDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConsumesDef_ptr
+IR_ConsumesDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConsumesDef_ptr
+IR_ConsumesDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConsumesDef_ptr &
+IR_ConsumesDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConsumesDef_ptr &
+IR_ConsumesDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ConsumesDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConsumesDef_ptr
+IR_ConsumesDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_ConsumesDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ConsumesDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_ConsumesDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_ConsumesDef_out::IR_ConsumesDef_out (IR_ConsumesDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_ConsumesDef::_nil ();
+}
+
+ACE_INLINE
+IR_ConsumesDef_out::IR_ConsumesDef_out (IR_ConsumesDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_ConsumesDef::_nil ();
+}
+
+ACE_INLINE
+IR_ConsumesDef_out::IR_ConsumesDef_out (const IR_ConsumesDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ConsumesDef_out&,p).ptr_)
+{}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_
+ACE_INLINE IR_ConsumesDef_out &
+IR_ConsumesDef_out::operator= (const IR_ConsumesDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_ConsumesDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_ConsumesDef_out &
+IR_ConsumesDef_out::operator= (const IR_ConsumesDef_var &p)
+{
+ this->ptr_ = IR_ConsumesDef::_duplicate (p.ptr ());
+ return *this;
+}
+ACE_INLINE IR_ConsumesDef_out &
+IR_ConsumesDef_out::operator= (IR_ConsumesDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_ConsumesDef_out::operator IR_ConsumesDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConsumesDef_ptr &
+IR_ConsumesDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_ConsumesDef_ptr
+IR_ConsumesDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_ConsumesDef **
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_ConsumesDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_ConsumesDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_ConsumesDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR_ConsumesDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR_ConsumesDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ConsumesDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_ConsumesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
IR_ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ConsumesDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -3622,17 +6961,17 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -3646,29 +6985,29 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ConsumesDef **tmp1 = ACE_reinterpret_cast (IR_ConsumesDef **, this->buffer_);
IR_ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ConsumesDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_ConsumesDef ** const tmp = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_ConsumesDef* *
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ConsumesDef **result = 0;
if (orphan == 0)
@@ -3700,21 +7039,14 @@ IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_ConsumesDef* *
- _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ConsumesDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_CONSUMESDEFSEQ_CI_)
-#define _IR_CONSUMESDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ConsumesDefSeq_var
@@ -3776,27 +7108,27 @@ IR_ConsumesDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ConsumesDefSeq_var::operator const ::IR_ConsumesDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() // cast
+ACE_INLINE
+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() const // cast
+ACE_INLINE
+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq *&() // cast
+IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq *&() // cast
{
return this->ptr_;
}
@@ -3819,7 +7151,7 @@ IR_ConsumesDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ConsumesDefSeq *&
IR_ConsumesDefSeq_var::out (void)
{
@@ -3880,7 +7212,7 @@ IR_ConsumesDefSeq_out::operator= (IR_ConsumesDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ConsumesDefSeq_out::operator ::IR_ConsumesDefSeq *&() // cast
{
return this->ptr_;
@@ -3904,68 +7236,228 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_FactoryDef::IR_FactoryDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_FactoryDef_var
+// *************************************************************
+
+ACE_INLINE
+IR_FactoryDef_var::IR_FactoryDef_var (void) // default constructor
+ : ptr_ (IR_FactoryDef::_nil ())
+{}
+
+ACE_INLINE IR_FactoryDef_ptr
+IR_FactoryDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_FactoryDef_var::IR_FactoryDef_var (const IR_FactoryDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_FactoryDef::_duplicate (p.ptr ()))
+{}
-#endif /* end #if !defined */
+ACE_INLINE
+IR_FactoryDef_var::~IR_FactoryDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+ACE_INLINE IR_FactoryDef_var &
+IR_FactoryDef_var::operator= (IR_FactoryDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE IR_FactoryDef_var &
+IR_FactoryDef_var::operator= (const IR_FactoryDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_FactoryDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_FactoryDef_var::operator const IR_FactoryDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_FactoryDef_var::operator IR_FactoryDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FactoryDef_ptr
+IR_FactoryDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FactoryDef_ptr
+IR_FactoryDef_var::in (void) const
+{
+ return this->ptr_;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_
+ACE_INLINE IR_FactoryDef_ptr &
+IR_FactoryDef_var::inout (void)
+{
+ return this->ptr_;
+}
+ACE_INLINE IR_FactoryDef_ptr &
+IR_FactoryDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_FactoryDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FactoryDef_ptr
+IR_FactoryDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_FactoryDef_ptr val = this->ptr_;
+ this->ptr_ = IR_FactoryDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_FactoryDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_FactoryDef_out::IR_FactoryDef_out (IR_FactoryDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_FactoryDef::_nil ();
+}
+
+ACE_INLINE
+IR_FactoryDef_out::IR_FactoryDef_out (IR_FactoryDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_FactoryDef::_nil ();
+}
+
+ACE_INLINE
+IR_FactoryDef_out::IR_FactoryDef_out (const IR_FactoryDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_FactoryDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_FactoryDef_out &
+IR_FactoryDef_out::operator= (const IR_FactoryDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_FactoryDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_FactoryDef_out &
+IR_FactoryDef_out::operator= (const IR_FactoryDef_var &p)
+{
+ this->ptr_ = IR_FactoryDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_FactoryDef_out &
+IR_FactoryDef_out::operator= (IR_FactoryDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_FactoryDef_out::operator IR_FactoryDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FactoryDef_ptr &
+IR_FactoryDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FactoryDef_ptr
+IR_FactoryDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_FactoryDef **
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_FactoryDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_FactoryDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_FactoryDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR_FactoryDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR_FactoryDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_FactoryDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_FactoryDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
IR_FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_FactoryDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -3973,17 +7465,17 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -3997,29 +7489,29 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_FactoryDef **tmp1 = ACE_reinterpret_cast (IR_FactoryDef **, this->buffer_);
IR_FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_FactoryDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_FactoryDef ** const tmp = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_FactoryDef* *
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_FactoryDef **result = 0;
if (orphan == 0)
@@ -4051,21 +7543,14 @@ IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_FactoryDef* *
- _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_FactoryDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_FACTORYDEFSEQ_CI_)
-#define _IR_FACTORYDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_FactoryDefSeq_var
@@ -4127,27 +7612,27 @@ IR_FactoryDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_FactoryDefSeq_var::operator const ::IR_FactoryDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() // cast
+ACE_INLINE
+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() const // cast
+ACE_INLINE
+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq *&() // cast
+IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq *&() // cast
{
return this->ptr_;
}
@@ -4170,7 +7655,7 @@ IR_FactoryDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_FactoryDefSeq *&
IR_FactoryDefSeq_var::out (void)
{
@@ -4231,7 +7716,7 @@ IR_FactoryDefSeq_out::operator= (IR_FactoryDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_FactoryDefSeq_out::operator ::IR_FactoryDefSeq *&() // cast
{
return this->ptr_;
@@ -4255,68 +7740,228 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_FinderDef::IR_FinderDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
+
+// *************************************************************
+// Inline operations for class IR_FinderDef_var
+// *************************************************************
-#endif /* end #if !defined */
+ACE_INLINE
+IR_FinderDef_var::IR_FinderDef_var (void) // default constructor
+ : ptr_ (IR_FinderDef::_nil ())
+{}
+ACE_INLINE IR_FinderDef_ptr
+IR_FinderDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE
+IR_FinderDef_var::IR_FinderDef_var (const IR_FinderDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_FinderDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_FinderDef_var::~IR_FinderDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_FinderDef_var &
+IR_FinderDef_var::operator= (IR_FinderDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_FinderDef_var &
+IR_FinderDef_var::operator= (const IR_FinderDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_FinderDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_FinderDef_var::operator const IR_FinderDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_FinderDef_var::operator IR_FinderDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FinderDef_ptr
+IR_FinderDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FinderDef_ptr
+IR_FinderDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FinderDef_ptr &
+IR_FinderDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FinderDef_ptr &
+IR_FinderDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_FinderDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FinderDef_ptr
+IR_FinderDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_FinderDef_ptr val = this->ptr_;
+ this->ptr_ = IR_FinderDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_FinderDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_FinderDef_out::IR_FinderDef_out (IR_FinderDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_FinderDef::_nil ();
+}
+
+ACE_INLINE
+IR_FinderDef_out::IR_FinderDef_out (IR_FinderDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_FinderDef::_nil ();
+}
+
+ACE_INLINE
+IR_FinderDef_out::IR_FinderDef_out (const IR_FinderDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_FinderDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_FinderDef_out &
+IR_FinderDef_out::operator= (const IR_FinderDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_FinderDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_FinderDef_out &
+IR_FinderDef_out::operator= (const IR_FinderDef_var &p)
+{
+ this->ptr_ = IR_FinderDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_FinderDef_out &
+IR_FinderDef_out::operator= (IR_FinderDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE
+IR_FinderDef_out::operator IR_FinderDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_FinderDef_ptr &
+IR_FinderDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_
+ACE_INLINE IR_FinderDef_ptr
+IR_FinderDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_FinderDef **
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_FinderDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_FinderDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_FinderDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR_FinderDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR_FinderDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_FinderDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_FinderDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
IR_FinderDef ** const tmp2 = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_FinderDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -4324,17 +7969,17 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -4348,29 +7993,29 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_FinderDef **tmp1 = ACE_reinterpret_cast (IR_FinderDef **, this->buffer_);
IR_FinderDef ** const tmp2 = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_FinderDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_FinderDef ** const tmp = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_FinderDef* *
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_FinderDef **result = 0;
if (orphan == 0)
@@ -4402,21 +8047,14 @@ IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_FinderDef* *
- _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_FinderDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_FINDERDEFSEQ_CI_)
-#define _IR_FINDERDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_FinderDefSeq_var
@@ -4478,27 +8116,27 @@ IR_FinderDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_FinderDefSeq_var::operator const ::IR_FinderDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() // cast
+ACE_INLINE
+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() const // cast
+ACE_INLINE
+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_FinderDefSeq_var::operator ::IR_FinderDefSeq *&() // cast
+IR_FinderDefSeq_var::operator ::IR_FinderDefSeq *&() // cast
{
return this->ptr_;
}
@@ -4521,7 +8159,7 @@ IR_FinderDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_FinderDefSeq *&
IR_FinderDefSeq_var::out (void)
{
@@ -4582,7 +8220,7 @@ IR_FinderDefSeq_out::operator= (IR_FinderDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_FinderDefSeq_out::operator ::IR_FinderDefSeq *&() // cast
{
return this->ptr_;
@@ -4606,68 +8244,228 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE
+IR_PrimaryKeyDef::IR_PrimaryKeyDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
-#endif /* end #if !defined */
+// *************************************************************
+// Inline operations for class IR_PrimaryKeyDef_var
+// *************************************************************
+ACE_INLINE
+IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (void) // default constructor
+ : ptr_ (IR_PrimaryKeyDef::_nil ())
+{}
-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ACE_INLINE IR_PrimaryKeyDef_ptr
+IR_PrimaryKeyDef_var::ptr (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (const IR_PrimaryKeyDef_var &p) // copy constructor
+ : TAO_Base_var (),
+ ptr_ (IR_PrimaryKeyDef::_duplicate (p.ptr ()))
+{}
+
+ACE_INLINE
+IR_PrimaryKeyDef_var::~IR_PrimaryKeyDef_var (void) // destructor
+{
+ CORBA::release (this->ptr_);
+}
+
+ACE_INLINE IR_PrimaryKeyDef_var &
+IR_PrimaryKeyDef_var::operator= (IR_PrimaryKeyDef_ptr p)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_var &
+IR_PrimaryKeyDef_var::operator= (const IR_PrimaryKeyDef_var &p)
+{
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_PrimaryKeyDef::_duplicate (p.ptr ());
+ }
+ return *this;
+}
+
+ACE_INLINE
+IR_PrimaryKeyDef_var::operator const IR_PrimaryKeyDef_ptr &() const // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE
+IR_PrimaryKeyDef_var::operator IR_PrimaryKeyDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_ptr
+IR_PrimaryKeyDef_var::operator-> (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_ptr
+IR_PrimaryKeyDef_var::in (void) const
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_ptr &
+IR_PrimaryKeyDef_var::inout (void)
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_ptr &
+IR_PrimaryKeyDef_var::out (void)
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_PrimaryKeyDef::_nil ();
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_ptr
+IR_PrimaryKeyDef_var::_retn (void)
+{
+ // yield ownership of managed obj reference
+ IR_PrimaryKeyDef_ptr val = this->ptr_;
+ this->ptr_ = IR_PrimaryKeyDef::_nil ();
+ return val;
+}
+
+// *************************************************************
+// Inline operations for class IR_PrimaryKeyDef_out
+// *************************************************************
+
+ACE_INLINE
+IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_ptr &p)
+ : ptr_ (p)
+{
+ this->ptr_ = IR_PrimaryKeyDef::_nil ();
+}
+
+ACE_INLINE
+IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+{
+ CORBA::release (this->ptr_);
+ this->ptr_ = IR_PrimaryKeyDef::_nil ();
+}
+
+ACE_INLINE
+IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (const IR_PrimaryKeyDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_PrimaryKeyDef_out&,p).ptr_)
+{}
+
+ACE_INLINE IR_PrimaryKeyDef_out &
+IR_PrimaryKeyDef_out::operator= (const IR_PrimaryKeyDef_out &p)
+{
+ this->ptr_ = ACE_const_cast (IR_PrimaryKeyDef_out&,p).ptr_;
+ return *this;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_out &
+IR_PrimaryKeyDef_out::operator= (const IR_PrimaryKeyDef_var &p)
+{
+ this->ptr_ = IR_PrimaryKeyDef::_duplicate (p.ptr ());
+ return *this;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_out &
+IR_PrimaryKeyDef_out::operator= (IR_PrimaryKeyDef_ptr p)
+{
+ this->ptr_ = p;
+ return *this;
+}
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_
+ACE_INLINE
+IR_PrimaryKeyDef_out::operator IR_PrimaryKeyDef_ptr &() // cast
+{
+ return this->ptr_;
+}
+ACE_INLINE IR_PrimaryKeyDef_ptr &
+IR_PrimaryKeyDef_out::ptr (void) // ptr
+{
+ return this->ptr_;
+}
+
+ACE_INLINE IR_PrimaryKeyDef_ptr
+IR_PrimaryKeyDef_out::operator-> (void)
+{
+ return this->ptr_;
+}
+
+#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
ACE_INLINE IR_Contained **
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (CORBA::ULong nelems)
{
IR_Contained **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_Contained*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_Contained::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (IR_Contained **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (IR_Contained **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_Contained* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_Contained **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (this->maximum_);
IR_Contained ** const tmp2 = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_Contained::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -4675,17 +8473,17 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -4699,29 +8497,29 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_Contained **tmp1 = ACE_reinterpret_cast (IR_Contained **, this->buffer_);
IR_Contained ** const tmp2 = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_Contained::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_Contained,IR_Contained_var>
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_Contained ** const tmp = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_Contained,IR_Contained_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_Contained* *
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (CORBA::Boolean orphan)
{
IR_Contained **result = 0;
if (orphan == 0)
@@ -4753,21 +8551,14 @@ IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_Contained* *
- _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_Contained ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_CONTAINEDSEQ_CI_)
-#define _IR_CONTAINEDSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ContainedSeq_var
@@ -4829,27 +8620,27 @@ IR_ContainedSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ContainedSeq_var::operator const ::IR_ContainedSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ContainedSeq_var::operator ::IR_ContainedSeq &() // cast
+ACE_INLINE
+IR_ContainedSeq_var::operator ::IR_ContainedSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ContainedSeq_var::operator ::IR_ContainedSeq &() const // cast
+ACE_INLINE
+IR_ContainedSeq_var::operator ::IR_ContainedSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ContainedSeq_var::operator ::IR_ContainedSeq *&() // cast
+IR_ContainedSeq_var::operator ::IR_ContainedSeq *&() // cast
{
return this->ptr_;
}
@@ -4872,7 +8663,7 @@ IR_ContainedSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ContainedSeq *&
IR_ContainedSeq_var::out (void)
{
@@ -4933,7 +8724,7 @@ IR_ContainedSeq_out::operator= (IR_ContainedSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ContainedSeq_out::operator ::IR_ContainedSeq *&() // cast
{
return this->ptr_;
@@ -4957,9 +8748,6 @@ IR_ContainedSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_StructMember_var
// *************************************************************
@@ -5027,20 +8815,20 @@ IR_StructMember_var::operator const ::IR_StructMember &() const // cast
}
ACE_INLINE
-IR_StructMember_var::operator ::IR_StructMember &() // cast
+IR_StructMember_var::operator ::IR_StructMember &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_StructMember_var::operator ::IR_StructMember &() const // cast
+IR_StructMember_var::operator ::IR_StructMember &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_StructMember_var::operator ::IR_StructMember *&() // cast
+IR_StructMember_var::operator ::IR_StructMember *&() // cast
{
return this->ptr_;
}
@@ -5057,7 +8845,7 @@ IR_StructMember_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_StructMember *&
IR_StructMember_var::out (void)
{
@@ -5118,7 +8906,7 @@ IR_StructMember_out::operator= (IR_StructMember *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_StructMember_out::operator ::IR_StructMember *&() // cast
{
return this->ptr_;
@@ -5138,48 +8926,45 @@ IR_StructMember_out::operator-> (void)
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_StructMember *
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_StructMember *retval = 0;
ACE_NEW_RETURN (retval, IR_StructMember[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (IR_StructMember *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (IR_StructMember *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_StructMember *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -5187,10 +8972,10 @@ IR_StructMember_out::operator-> (void)
{
IR_StructMember *tmp1 = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (this->maximum_);
IR_StructMember * const tmp2 = ACE_reinterpret_cast (IR_StructMember * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -5198,14 +8983,14 @@ IR_StructMember_out::operator-> (void)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_StructMemberSeq &
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_StructMemberSeq &
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -5218,41 +9003,41 @@ IR_StructMember_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_StructMember *tmp1 = ACE_reinterpret_cast (IR_StructMember *, this->buffer_);
IR_StructMember * const tmp2 = ACE_reinterpret_cast (IR_StructMember * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_StructMember &
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_StructMember* tmp = ACE_reinterpret_cast(IR_StructMember*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_StructMember &
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_StructMember * const tmp = ACE_reinterpret_cast (IR_StructMember* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_StructMember *
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
{
IR_StructMember *result = 0;
if (orphan == 0)
@@ -5284,15 +9069,15 @@ IR_StructMember_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_StructMember *
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_StructMember * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_StructMemberSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_StructMember *data,
CORBA::Boolean release)
@@ -5307,14 +9092,8 @@ IR_StructMember_out::operator-> (void)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_STRUCTMEMBERSEQ_CI_)
-#define _IR_STRUCTMEMBERSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_StructMemberSeq_var
@@ -5376,27 +9155,27 @@ IR_StructMemberSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_StructMemberSeq_var::operator const ::IR_StructMemberSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() // cast
+ACE_INLINE
+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() const // cast
+ACE_INLINE
+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_StructMemberSeq_var::operator ::IR_StructMemberSeq *&() // cast
+IR_StructMemberSeq_var::operator ::IR_StructMemberSeq *&() // cast
{
return this->ptr_;
}
@@ -5407,6 +9186,12 @@ IR_StructMemberSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_StructMember &
+IR_StructMemberSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_StructMember &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_StructMemberSeq &
IR_StructMemberSeq_var::in (void) const
{
@@ -5419,7 +9204,7 @@ IR_StructMemberSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_StructMemberSeq *&
IR_StructMemberSeq_var::out (void)
{
@@ -5480,7 +9265,7 @@ IR_StructMemberSeq_out::operator= (IR_StructMemberSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_StructMemberSeq_out::operator ::IR_StructMemberSeq *&() // cast
{
return this->ptr_;
@@ -5504,9 +9289,6 @@ IR_StructMemberSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_Initializer_var
// *************************************************************
@@ -5574,20 +9356,20 @@ IR_Initializer_var::operator const ::IR_Initializer &() const // cast
}
ACE_INLINE
-IR_Initializer_var::operator ::IR_Initializer &() // cast
+IR_Initializer_var::operator ::IR_Initializer &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_Initializer_var::operator ::IR_Initializer &() const // cast
+IR_Initializer_var::operator ::IR_Initializer &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_Initializer_var::operator ::IR_Initializer *&() // cast
+IR_Initializer_var::operator ::IR_Initializer *&() // cast
{
return this->ptr_;
}
@@ -5604,7 +9386,7 @@ IR_Initializer_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_Initializer *&
IR_Initializer_var::out (void)
{
@@ -5665,7 +9447,7 @@ IR_Initializer_out::operator= (IR_Initializer *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_Initializer_out::operator ::IR_Initializer *&() // cast
{
return this->ptr_;
@@ -5683,50 +9465,46 @@ IR_Initializer_out::operator-> (void)
return this->ptr_;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_Initializer *
- _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_Initializer *retval = 0;
ACE_NEW_RETURN (retval, IR_Initializer[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (IR_Initializer *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (IR_Initializer *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_Initializer *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -5734,10 +9512,10 @@ IR_Initializer_out::operator-> (void)
{
IR_Initializer *tmp1 = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (this->maximum_);
IR_Initializer * const tmp2 = ACE_reinterpret_cast (IR_Initializer * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -5745,14 +9523,14 @@ IR_Initializer_out::operator-> (void)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_InitializerSeq &
- _TAO_Unbounded_Sequence_IR_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_InitializerSeq &
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -5765,41 +9543,41 @@ IR_Initializer_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_Initializer *tmp1 = ACE_reinterpret_cast (IR_Initializer *, this->buffer_);
IR_Initializer * const tmp2 = ACE_reinterpret_cast (IR_Initializer * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_Initializer &
- _TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_Initializer* tmp = ACE_reinterpret_cast(IR_Initializer*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_Initializer &
- _TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_Initializer * const tmp = ACE_reinterpret_cast (IR_Initializer* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_Initializer *
- _TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (CORBA::Boolean orphan)
{
IR_Initializer *result = 0;
if (orphan == 0)
@@ -5831,15 +9609,15 @@ IR_Initializer_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_Initializer *
- _TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_Initializer * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_InitializerSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_Initializer *data,
CORBA::Boolean release)
@@ -5854,14 +9632,8 @@ IR_Initializer_out::operator-> (void)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_INITIALIZERSEQ_CI_)
-#define _IR_INITIALIZERSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_InitializerSeq_var
@@ -5923,27 +9695,27 @@ IR_InitializerSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_InitializerSeq_var::operator const ::IR_InitializerSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_InitializerSeq_var::operator ::IR_InitializerSeq &() // cast
+ACE_INLINE
+IR_InitializerSeq_var::operator ::IR_InitializerSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_InitializerSeq_var::operator ::IR_InitializerSeq &() const // cast
+ACE_INLINE
+IR_InitializerSeq_var::operator ::IR_InitializerSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_InitializerSeq_var::operator ::IR_InitializerSeq *&() // cast
+IR_InitializerSeq_var::operator ::IR_InitializerSeq *&() // cast
{
return this->ptr_;
}
@@ -5954,6 +9726,12 @@ IR_InitializerSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_Initializer &
+IR_InitializerSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_Initializer &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_InitializerSeq &
IR_InitializerSeq_var::in (void) const
{
@@ -5966,7 +9744,7 @@ IR_InitializerSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_InitializerSeq *&
IR_InitializerSeq_var::out (void)
{
@@ -6027,7 +9805,7 @@ IR_InitializerSeq_out::operator= (IR_InitializerSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_InitializerSeq_out::operator ::IR_InitializerSeq *&() // cast
{
return this->ptr_;
@@ -6051,9 +9829,6 @@ IR_InitializerSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_UnionMember_var
// *************************************************************
@@ -6121,20 +9896,20 @@ IR_UnionMember_var::operator const ::IR_UnionMember &() const // cast
}
ACE_INLINE
-IR_UnionMember_var::operator ::IR_UnionMember &() // cast
+IR_UnionMember_var::operator ::IR_UnionMember &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_UnionMember_var::operator ::IR_UnionMember &() const // cast
+IR_UnionMember_var::operator ::IR_UnionMember &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_UnionMember_var::operator ::IR_UnionMember *&() // cast
+IR_UnionMember_var::operator ::IR_UnionMember *&() // cast
{
return this->ptr_;
}
@@ -6151,7 +9926,7 @@ IR_UnionMember_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_UnionMember *&
IR_UnionMember_var::out (void)
{
@@ -6212,7 +9987,7 @@ IR_UnionMember_out::operator= (IR_UnionMember *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_UnionMember_out::operator ::IR_UnionMember *&() // cast
{
return this->ptr_;
@@ -6230,50 +10005,46 @@ IR_UnionMember_out::operator-> (void)
return this->ptr_;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_UnionMember *
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_UnionMember *retval = 0;
ACE_NEW_RETURN (retval, IR_UnionMember[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (IR_UnionMember *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (IR_UnionMember *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_UnionMember *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -6281,10 +10052,10 @@ IR_UnionMember_out::operator-> (void)
{
IR_UnionMember *tmp1 = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (this->maximum_);
IR_UnionMember * const tmp2 = ACE_reinterpret_cast (IR_UnionMember * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -6292,14 +10063,14 @@ IR_UnionMember_out::operator-> (void)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_UnionMemberSeq &
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq &
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -6312,41 +10083,41 @@ IR_UnionMember_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_UnionMember *tmp1 = ACE_reinterpret_cast (IR_UnionMember *, this->buffer_);
IR_UnionMember * const tmp2 = ACE_reinterpret_cast (IR_UnionMember * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_UnionMember &
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_UnionMember* tmp = ACE_reinterpret_cast(IR_UnionMember*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_UnionMember &
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_UnionMember * const tmp = ACE_reinterpret_cast (IR_UnionMember* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_UnionMember *
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
{
IR_UnionMember *result = 0;
if (orphan == 0)
@@ -6378,15 +10149,15 @@ IR_UnionMember_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_UnionMember *
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_UnionMember * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_UnionMemberSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_UnionMember *data,
CORBA::Boolean release)
@@ -6401,14 +10172,8 @@ IR_UnionMember_out::operator-> (void)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_UNIONMEMBERSEQ_CI_)
-#define _IR_UNIONMEMBERSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_UnionMemberSeq_var
@@ -6470,27 +10235,27 @@ IR_UnionMemberSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_UnionMemberSeq_var::operator const ::IR_UnionMemberSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() // cast
+ACE_INLINE
+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() const // cast
+ACE_INLINE
+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq *&() // cast
+IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq *&() // cast
{
return this->ptr_;
}
@@ -6501,6 +10266,12 @@ IR_UnionMemberSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_UnionMember &
+IR_UnionMemberSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_UnionMember &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_UnionMemberSeq &
IR_UnionMemberSeq_var::in (void) const
{
@@ -6513,7 +10284,7 @@ IR_UnionMemberSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_UnionMemberSeq *&
IR_UnionMemberSeq_var::out (void)
{
@@ -6574,7 +10345,7 @@ IR_UnionMemberSeq_out::operator= (IR_UnionMemberSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_UnionMemberSeq_out::operator ::IR_UnionMemberSeq *&() // cast
{
return this->ptr_;
@@ -6598,13 +10369,6 @@ IR_UnionMemberSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_ENUMMEMBERSEQ_CI_)
-#define _IR_ENUMMEMBERSEQ_CI_
-
// *************************************************************
// Inline operations for class IR_EnumMemberSeq_var
// *************************************************************
@@ -6665,27 +10429,27 @@ IR_EnumMemberSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_EnumMemberSeq_var::operator const ::IR_EnumMemberSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() // cast
+ACE_INLINE
+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() const // cast
+ACE_INLINE
+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq *&() // cast
+IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq *&() // cast
{
return this->ptr_;
}
@@ -6708,7 +10472,7 @@ IR_EnumMemberSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_EnumMemberSeq *&
IR_EnumMemberSeq_var::out (void)
{
@@ -6769,7 +10533,7 @@ IR_EnumMemberSeq_out::operator= (IR_EnumMemberSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_EnumMemberSeq_out::operator ::IR_EnumMemberSeq *&() // cast
{
return this->ptr_;
@@ -6793,197 +10557,6 @@ IR_EnumMemberSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_Container::IR_Container (void) // default constructor
-{}
-
-ACE_INLINE
-IR_Container::IR_Container (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_Container::~IR_Container (void) // destructor
-{}
-
-
-#if !defined (_IR_CONTAINER___VAR_CI_)
-#define _IR_CONTAINER___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_Container_var
-// *************************************************************
-
-ACE_INLINE
-IR_Container_var::IR_Container_var (void) // default constructor
- : ptr_ (IR_Container::_nil ())
-{}
-
-ACE_INLINE
-IR_Container_var::IR_Container_var (IR_Container_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_Container_ptr
-IR_Container_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_Container_var::IR_Container_var (const ::IR_Container_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_Container::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_Container_var::~IR_Container_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_Container_var &
-IR_Container_var::operator= (IR_Container_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_Container_var &
-IR_Container_var::operator= (const ::IR_Container_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Container::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_Container_var::operator const ::IR_Container_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_Container_var::operator ::IR_Container_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Container_ptr
-IR_Container_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Container_ptr
-IR_Container_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Container_ptr &
-IR_Container_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Container_ptr &
-IR_Container_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Container::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Container_ptr
-IR_Container_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_Container_ptr val = this->ptr_;
- this->ptr_ = ::IR_Container::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONTAINER___OUT_CI_)
-#define _IR_CONTAINER___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_Container_out
-// *************************************************************
-
-ACE_INLINE
-IR_Container_out::IR_Container_out (IR_Container_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_Container::_nil ();
-}
-
-ACE_INLINE
-IR_Container_out::IR_Container_out (IR_Container_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Container::_nil ();
-}
-
-ACE_INLINE
-IR_Container_out::IR_Container_out (const ::IR_Container_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_Container_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_Container_out &
-IR_Container_out::operator= (const ::IR_Container_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_Container_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_Container_out &
-IR_Container_out::operator= (const ::IR_Container_var &p)
-{
- this->ptr_ = ::IR_Container::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_Container_out &
-IR_Container_out::operator= (IR_Container_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_Container_out::operator ::IR_Container_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Container_ptr &
-IR_Container_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Container_ptr
-IR_Container_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_Container::Description_var
// *************************************************************
@@ -7051,20 +10624,20 @@ IR_Container::Description_var::operator const ::IR_Container::Description &() co
}
ACE_INLINE
-IR_Container::Description_var::operator ::IR_Container::Description &() // cast
+IR_Container::Description_var::operator ::IR_Container::Description &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_Container::Description_var::operator ::IR_Container::Description &() const // cast
+IR_Container::Description_var::operator ::IR_Container::Description &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_Container::Description_var::operator ::IR_Container::Description *&() // cast
+IR_Container::Description_var::operator ::IR_Container::Description *&() // cast
{
return this->ptr_;
}
@@ -7081,7 +10654,7 @@ IR_Container::Description_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_Container::Description *&
IR_Container::Description_var::out (void)
{
@@ -7142,7 +10715,7 @@ IR_Container::Description_out::operator= (Description *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_Container::Description_out::operator ::IR_Container::Description *&() // cast
{
return this->ptr_;
@@ -7160,12 +10733,8 @@ IR_Container::Description_out::operator-> (void)
return this->ptr_;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_Container::Description *
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
@@ -7175,24 +10744,24 @@ IR_Container::Description_out::operator-> (void)
ACE_NEW_RETURN (retval, IR_Container::Description[size], 0);
return retval;
}
-
+
ACE_INLINE void IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (IR_Container::Description *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
@@ -7201,7 +10770,7 @@ IR_Container::Description_out::operator-> (void)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
// Copy constructor.
@@ -7211,10 +10780,10 @@ IR_Container::Description_out::operator-> (void)
{
IR_Container::Description *tmp1 = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (this->maximum_);
IR_Container::Description * const tmp2 = ACE_reinterpret_cast (IR_Container::Description * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -7222,14 +10791,14 @@ IR_Container::Description_out::operator-> (void)
this->buffer_ = 0;
}
}
-
+
ACE_INLINE IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -7242,18 +10811,18 @@ IR_Container::Description_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_Container::Description *tmp1 = ACE_reinterpret_cast (IR_Container::Description *, this->buffer_);
IR_Container::Description * const tmp2 = ACE_reinterpret_cast (IR_Container::Description * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_Container::Description &
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i)
@@ -7263,7 +10832,7 @@ IR_Container::Description_out::operator-> (void)
IR_Container::Description* tmp = ACE_reinterpret_cast(IR_Container::Description*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_Container::Description &
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
// operator []
@@ -7272,9 +10841,9 @@ IR_Container::Description_out::operator-> (void)
IR_Container::Description * const tmp = ACE_reinterpret_cast (IR_Container::Description* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_Container::Description *
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
{
@@ -7308,13 +10877,13 @@ IR_Container::Description_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_Container::Description *
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_Container::Description * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::replace (CORBA::ULong max,
CORBA::ULong length,
@@ -7331,14 +10900,8 @@ IR_Container::Description_out::operator-> (void)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
-#define _IR_CONTAINER_DESCRIPTIONSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_Container::DescriptionSeq_var
@@ -7400,27 +10963,27 @@ IR_Container::DescriptionSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_Container::DescriptionSeq_var::operator const ::IR_Container::DescriptionSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() // cast
+ACE_INLINE
+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() const // cast
+ACE_INLINE
+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq *&() // cast
+IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq *&() // cast
{
return this->ptr_;
}
@@ -7431,6 +10994,12 @@ IR_Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_Container::Description &
+IR_Container::DescriptionSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_Container::Description &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_Container::DescriptionSeq &
IR_Container::DescriptionSeq_var::in (void) const
{
@@ -7443,7 +11012,7 @@ IR_Container::DescriptionSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_Container::DescriptionSeq *&
IR_Container::DescriptionSeq_var::out (void)
{
@@ -7504,7 +11073,7 @@ IR_Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_Container::DescriptionSeq_out::operator ::IR_Container::DescriptionSeq *&() // cast
{
return this->ptr_;
@@ -7528,3733 +11097,1870 @@ IR_Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_Repository::IR_Repository (void) // default constructor
-{}
-
-ACE_INLINE
-IR_Repository::IR_Repository (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_Repository::~IR_Repository (void) // destructor
-{}
-
-
-#if !defined (_IR_REPOSITORY___VAR_CI_)
-#define _IR_REPOSITORY___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_Repository_var
-// *************************************************************
-
-ACE_INLINE
-IR_Repository_var::IR_Repository_var (void) // default constructor
- : ptr_ (IR_Repository::_nil ())
-{}
-
-ACE_INLINE
-IR_Repository_var::IR_Repository_var (IR_Repository_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_Repository_ptr
-IR_Repository_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_Repository_var::IR_Repository_var (const ::IR_Repository_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_Repository::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_Repository_var::~IR_Repository_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_Repository_var &
-IR_Repository_var::operator= (IR_Repository_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_Repository_var &
-IR_Repository_var::operator= (const ::IR_Repository_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Repository::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_Repository_var::operator const ::IR_Repository_ptr &() const // cast
-{
- return this->ptr_;
-}
-
ACE_INLINE
-IR_Repository_var::operator ::IR_Repository_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Repository_ptr
-IR_Repository_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Repository_ptr
-IR_Repository_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Repository_ptr &
-IR_Repository_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Repository_ptr &
-IR_Repository_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Repository::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Repository_ptr
-IR_Repository_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_Repository_ptr val = this->ptr_;
- this->ptr_ = ::IR_Repository::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_REPOSITORY___OUT_CI_)
-#define _IR_REPOSITORY___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_Repository_out
-// *************************************************************
-
-ACE_INLINE
-IR_Repository_out::IR_Repository_out (IR_Repository_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_Repository::_nil ();
-}
-
-ACE_INLINE
-IR_Repository_out::IR_Repository_out (IR_Repository_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_Repository::_nil ();
-}
-
-ACE_INLINE
-IR_Repository_out::IR_Repository_out (const ::IR_Repository_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_Repository_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_Repository_out &
-IR_Repository_out::operator= (const ::IR_Repository_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_Repository_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_Repository_out &
-IR_Repository_out::operator= (const ::IR_Repository_var &p)
-{
- this->ptr_ = ::IR_Repository::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_Repository_out &
-IR_Repository_out::operator= (IR_Repository_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_Repository_out::operator ::IR_Repository_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Repository_ptr &
-IR_Repository_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_Repository_ptr
-IR_Repository_out::operator-> (void)
+IR_PrimitiveDef::IR_PrimitiveDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
{
- return this->ptr_;
+ this->_tao_setup_collocation (_tao_collocated);
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_ComponentRepository::IR_ComponentRepository (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ComponentRepository::IR_ComponentRepository (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ComponentRepository::~IR_ComponentRepository (void) // destructor
-{}
-
-
-#if !defined (_IR_COMPONENTREPOSITORY___VAR_CI_)
-#define _IR_COMPONENTREPOSITORY___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_ComponentRepository_var
+// Inline operations for class IR_PrimitiveDef_var
// *************************************************************
ACE_INLINE
-IR_ComponentRepository_var::IR_ComponentRepository_var (void) // default constructor
- : ptr_ (IR_ComponentRepository::_nil ())
-{}
-
-ACE_INLINE
-IR_ComponentRepository_var::IR_ComponentRepository_var (IR_ComponentRepository_ptr p)
- : ptr_ (p)
+IR_PrimitiveDef_var::IR_PrimitiveDef_var (void) // default constructor
+ : ptr_ (IR_PrimitiveDef::_nil ())
{}
-ACE_INLINE ::IR_ComponentRepository_ptr
-IR_ComponentRepository_var::ptr (void) const
+ACE_INLINE IR_PrimitiveDef_ptr
+IR_PrimitiveDef_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_ComponentRepository_var::IR_ComponentRepository_var (const ::IR_ComponentRepository_var &p) // copy constructor
+IR_PrimitiveDef_var::IR_PrimitiveDef_var (const IR_PrimitiveDef_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (IR_ComponentRepository::_duplicate (p.ptr ()))
+ ptr_ (IR_PrimitiveDef::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_ComponentRepository_var::~IR_ComponentRepository_var (void) // destructor
+IR_PrimitiveDef_var::~IR_PrimitiveDef_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE IR_ComponentRepository_var &
-IR_ComponentRepository_var::operator= (IR_ComponentRepository_ptr p)
+ACE_INLINE IR_PrimitiveDef_var &
+IR_PrimitiveDef_var::operator= (IR_PrimitiveDef_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_ComponentRepository_var &
-IR_ComponentRepository_var::operator= (const ::IR_ComponentRepository_var &p)
+ACE_INLINE IR_PrimitiveDef_var &
+IR_PrimitiveDef_var::operator= (const IR_PrimitiveDef_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ComponentRepository::_duplicate (p.ptr ());
+ this->ptr_ = IR_PrimitiveDef::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_ComponentRepository_var::operator const ::IR_ComponentRepository_ptr &() const // cast
+ACE_INLINE
+IR_PrimitiveDef_var::operator const IR_PrimitiveDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_ComponentRepository_var::operator ::IR_ComponentRepository_ptr &() // cast
+ACE_INLINE
+IR_PrimitiveDef_var::operator IR_PrimitiveDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_ComponentRepository_ptr
-IR_ComponentRepository_var::operator-> (void) const
+ACE_INLINE IR_PrimitiveDef_ptr
+IR_PrimitiveDef_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_ComponentRepository_ptr
-IR_ComponentRepository_var::in (void) const
+ACE_INLINE IR_PrimitiveDef_ptr
+IR_PrimitiveDef_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_ComponentRepository_ptr &
-IR_ComponentRepository_var::inout (void)
+ACE_INLINE IR_PrimitiveDef_ptr &
+IR_PrimitiveDef_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_ComponentRepository_ptr &
-IR_ComponentRepository_var::out (void)
+ACE_INLINE IR_PrimitiveDef_ptr &
+IR_PrimitiveDef_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ComponentRepository::_nil ();
+ this->ptr_ = IR_PrimitiveDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_ComponentRepository_ptr
-IR_ComponentRepository_var::_retn (void)
+ACE_INLINE IR_PrimitiveDef_ptr
+IR_PrimitiveDef_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_ComponentRepository_ptr val = this->ptr_;
- this->ptr_ = ::IR_ComponentRepository::_nil ();
+ IR_PrimitiveDef_ptr val = this->ptr_;
+ this->ptr_ = IR_PrimitiveDef::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_COMPONENTREPOSITORY___OUT_CI_)
-#define _IR_COMPONENTREPOSITORY___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_ComponentRepository_out
+// Inline operations for class IR_PrimitiveDef_out
// *************************************************************
ACE_INLINE
-IR_ComponentRepository_out::IR_ComponentRepository_out (IR_ComponentRepository_ptr &p)
+IR_PrimitiveDef_out::IR_PrimitiveDef_out (IR_PrimitiveDef_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_ComponentRepository::_nil ();
+ this->ptr_ = IR_PrimitiveDef::_nil ();
}
ACE_INLINE
-IR_ComponentRepository_out::IR_ComponentRepository_out (IR_ComponentRepository_var &p) // constructor from _var
+IR_PrimitiveDef_out::IR_PrimitiveDef_out (IR_PrimitiveDef_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ComponentRepository::_nil ();
+ this->ptr_ = IR_PrimitiveDef::_nil ();
}
ACE_INLINE
-IR_ComponentRepository_out::IR_ComponentRepository_out (const ::IR_ComponentRepository_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ComponentRepository_out &, p).ptr_)
+IR_PrimitiveDef_out::IR_PrimitiveDef_out (const IR_PrimitiveDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_PrimitiveDef_out&,p).ptr_)
{}
-ACE_INLINE ::IR_ComponentRepository_out &
-IR_ComponentRepository_out::operator= (const ::IR_ComponentRepository_out &p)
+ACE_INLINE IR_PrimitiveDef_out &
+IR_PrimitiveDef_out::operator= (const IR_PrimitiveDef_out &p)
{
- this->ptr_ = ACE_const_cast (IR_ComponentRepository_out&, p).ptr_;
+ this->ptr_ = ACE_const_cast (IR_PrimitiveDef_out&,p).ptr_;
return *this;
}
-ACE_INLINE IR_ComponentRepository_out &
-IR_ComponentRepository_out::operator= (const ::IR_ComponentRepository_var &p)
+ACE_INLINE IR_PrimitiveDef_out &
+IR_PrimitiveDef_out::operator= (const IR_PrimitiveDef_var &p)
{
- this->ptr_ = ::IR_ComponentRepository::_duplicate (p.ptr ());
+ this->ptr_ = IR_PrimitiveDef::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE IR_ComponentRepository_out &
-IR_ComponentRepository_out::operator= (IR_ComponentRepository_ptr p)
+ACE_INLINE IR_PrimitiveDef_out &
+IR_PrimitiveDef_out::operator= (IR_PrimitiveDef_ptr p)
{
this->ptr_ = p;
return *this;
}
-ACE_INLINE
-IR_ComponentRepository_out::operator ::IR_ComponentRepository_ptr &() // cast
+ACE_INLINE
+IR_PrimitiveDef_out::operator IR_PrimitiveDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_ComponentRepository_ptr &
-IR_ComponentRepository_out::ptr (void) // ptr
+ACE_INLINE IR_PrimitiveDef_ptr &
+IR_PrimitiveDef_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_ComponentRepository_ptr
-IR_ComponentRepository_out::operator-> (void)
+ACE_INLINE IR_PrimitiveDef_ptr
+IR_PrimitiveDef_out::operator-> (void)
{
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_ModuleDef::IR_ModuleDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ModuleDef::IR_ModuleDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
ACE_INLINE
-IR_ModuleDef::~IR_ModuleDef (void) // destructor
-{}
-
-
-#if !defined (_IR_MODULEDEF___VAR_CI_)
-#define _IR_MODULEDEF___VAR_CI_
+IR_StringDef::IR_StringDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
// *************************************************************
-// Inline operations for class IR_ModuleDef_var
+// Inline operations for class IR_StringDef_var
// *************************************************************
ACE_INLINE
-IR_ModuleDef_var::IR_ModuleDef_var (void) // default constructor
- : ptr_ (IR_ModuleDef::_nil ())
-{}
-
-ACE_INLINE
-IR_ModuleDef_var::IR_ModuleDef_var (IR_ModuleDef_ptr p)
- : ptr_ (p)
+IR_StringDef_var::IR_StringDef_var (void) // default constructor
+ : ptr_ (IR_StringDef::_nil ())
{}
-ACE_INLINE ::IR_ModuleDef_ptr
-IR_ModuleDef_var::ptr (void) const
+ACE_INLINE IR_StringDef_ptr
+IR_StringDef_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_ModuleDef_var::IR_ModuleDef_var (const ::IR_ModuleDef_var &p) // copy constructor
+IR_StringDef_var::IR_StringDef_var (const IR_StringDef_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (IR_ModuleDef::_duplicate (p.ptr ()))
+ ptr_ (IR_StringDef::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_ModuleDef_var::~IR_ModuleDef_var (void) // destructor
+IR_StringDef_var::~IR_StringDef_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE IR_ModuleDef_var &
-IR_ModuleDef_var::operator= (IR_ModuleDef_ptr p)
+ACE_INLINE IR_StringDef_var &
+IR_StringDef_var::operator= (IR_StringDef_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_ModuleDef_var &
-IR_ModuleDef_var::operator= (const ::IR_ModuleDef_var &p)
+ACE_INLINE IR_StringDef_var &
+IR_StringDef_var::operator= (const IR_StringDef_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ModuleDef::_duplicate (p.ptr ());
+ this->ptr_ = IR_StringDef::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_ModuleDef_var::operator const ::IR_ModuleDef_ptr &() const // cast
+ACE_INLINE
+IR_StringDef_var::operator const IR_StringDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_ModuleDef_var::operator ::IR_ModuleDef_ptr &() // cast
+ACE_INLINE
+IR_StringDef_var::operator IR_StringDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_ModuleDef_ptr
-IR_ModuleDef_var::operator-> (void) const
+ACE_INLINE IR_StringDef_ptr
+IR_StringDef_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_ModuleDef_ptr
-IR_ModuleDef_var::in (void) const
+ACE_INLINE IR_StringDef_ptr
+IR_StringDef_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_ModuleDef_ptr &
-IR_ModuleDef_var::inout (void)
+ACE_INLINE IR_StringDef_ptr &
+IR_StringDef_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_ModuleDef_ptr &
-IR_ModuleDef_var::out (void)
+ACE_INLINE IR_StringDef_ptr &
+IR_StringDef_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ModuleDef::_nil ();
+ this->ptr_ = IR_StringDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_ModuleDef_ptr
-IR_ModuleDef_var::_retn (void)
+ACE_INLINE IR_StringDef_ptr
+IR_StringDef_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_ModuleDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ModuleDef::_nil ();
+ IR_StringDef_ptr val = this->ptr_;
+ this->ptr_ = IR_StringDef::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_MODULEDEF___OUT_CI_)
-#define _IR_MODULEDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_ModuleDef_out
+// Inline operations for class IR_StringDef_out
// *************************************************************
ACE_INLINE
-IR_ModuleDef_out::IR_ModuleDef_out (IR_ModuleDef_ptr &p)
+IR_StringDef_out::IR_StringDef_out (IR_StringDef_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_ModuleDef::_nil ();
+ this->ptr_ = IR_StringDef::_nil ();
}
ACE_INLINE
-IR_ModuleDef_out::IR_ModuleDef_out (IR_ModuleDef_var &p) // constructor from _var
+IR_StringDef_out::IR_StringDef_out (IR_StringDef_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ModuleDef::_nil ();
+ this->ptr_ = IR_StringDef::_nil ();
}
ACE_INLINE
-IR_ModuleDef_out::IR_ModuleDef_out (const ::IR_ModuleDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ModuleDef_out &, p).ptr_)
+IR_StringDef_out::IR_StringDef_out (const IR_StringDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_StringDef_out&,p).ptr_)
{}
-ACE_INLINE ::IR_ModuleDef_out &
-IR_ModuleDef_out::operator= (const ::IR_ModuleDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ModuleDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ModuleDef_out &
-IR_ModuleDef_out::operator= (const ::IR_ModuleDef_var &p)
+ACE_INLINE IR_StringDef_out &
+IR_StringDef_out::operator= (const IR_StringDef_out &p)
{
- this->ptr_ = ::IR_ModuleDef::_duplicate (p.ptr ());
+ this->ptr_ = ACE_const_cast (IR_StringDef_out&,p).ptr_;
return *this;
}
-ACE_INLINE IR_ModuleDef_out &
-IR_ModuleDef_out::operator= (IR_ModuleDef_ptr p)
+ACE_INLINE IR_StringDef_out &
+IR_StringDef_out::operator= (const IR_StringDef_var &p)
{
- this->ptr_ = p;
+ this->ptr_ = IR_StringDef::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE
-IR_ModuleDef_out::operator ::IR_ModuleDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ModuleDef_ptr &
-IR_ModuleDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ModuleDef_ptr
-IR_ModuleDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class IR_ModuleDescription_var
-// *************************************************************
-
-ACE_INLINE
-IR_ModuleDescription_var::IR_ModuleDescription_var (void) // default constructor
- : ptr_ (0)
-{}
-
-ACE_INLINE
-IR_ModuleDescription_var::IR_ModuleDescription_var (IR_ModuleDescription *p)
- : ptr_ (p)
-{}
-
-ACE_INLINE
-IR_ModuleDescription_var::IR_ModuleDescription_var (const ::IR_ModuleDescription_var &p) // copy constructor
-{
- if (p.ptr_)
- ACE_NEW (this->ptr_, ::IR_ModuleDescription (*p.ptr_));
- else
- this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR_ModuleDescription_var::~IR_ModuleDescription_var (void) // destructor
-{
- delete this->ptr_;
-}
-
-ACE_INLINE IR_ModuleDescription_var &
-IR_ModuleDescription_var::operator= (IR_ModuleDescription *p)
+ACE_INLINE IR_StringDef_out &
+IR_StringDef_out::operator= (IR_StringDef_ptr p)
{
- delete this->ptr_;
this->ptr_ = p;
return *this;
}
-ACE_INLINE ::IR_ModuleDescription_var &
-IR_ModuleDescription_var::operator= (const ::IR_ModuleDescription_var &p)
-{
- if (this != &p)
- {
- delete this->ptr_;
- ACE_NEW_RETURN (this->ptr_, ::IR_ModuleDescription (*p.ptr_), *this);
- }
- return *this;
-}
-
-ACE_INLINE const ::IR_ModuleDescription *
-IR_ModuleDescription_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ModuleDescription *
-IR_ModuleDescription_var::operator-> (void)
+ACE_INLINE
+IR_StringDef_out::operator IR_StringDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_ModuleDescription_var::operator const ::IR_ModuleDescription &() const // cast
-{
- return *this->ptr_;
-}
-
-ACE_INLINE
-IR_ModuleDescription_var::operator ::IR_ModuleDescription &() // cast
-{
- return *this->ptr_;
-}
-
-ACE_INLINE
-IR_ModuleDescription_var::operator ::IR_ModuleDescription &() const // cast
-{
- return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-IR_ModuleDescription_var::operator ::IR_ModuleDescription *&() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE const ::IR_ModuleDescription &
-IR_ModuleDescription_var::in (void) const
-{
- return *this->ptr_;
-}
-
-ACE_INLINE ::IR_ModuleDescription &
-IR_ModuleDescription_var::inout (void)
-{
- return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE ::IR_ModuleDescription *&
-IR_ModuleDescription_var::out (void)
+ACE_INLINE IR_StringDef_ptr &
+IR_StringDef_out::ptr (void) // ptr
{
- delete this->ptr_;
- this->ptr_ = 0;
return this->ptr_;
}
-ACE_INLINE ::IR_ModuleDescription *
-IR_ModuleDescription_var::_retn (void)
-{
- ::IR_ModuleDescription *tmp = this->ptr_;
- this->ptr_ = 0;
- return tmp;
-}
-
-ACE_INLINE ::IR_ModuleDescription *
-IR_ModuleDescription_var::ptr (void) const
+ACE_INLINE IR_StringDef_ptr
+IR_StringDef_out::operator-> (void)
{
return this->ptr_;
}
-// *************************************************************
-// Inline operations for class IR_ModuleDescription_out
-// *************************************************************
-
-ACE_INLINE
-IR_ModuleDescription_out::IR_ModuleDescription_out (::IR_ModuleDescription *&p)
- : ptr_ (p)
-{
- this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR_ModuleDescription_out::IR_ModuleDescription_out (IR_ModuleDescription_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- delete this->ptr_;
- this->ptr_ = 0;
-}
-
ACE_INLINE
-IR_ModuleDescription_out::IR_ModuleDescription_out (const ::IR_ModuleDescription_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ModuleDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE IR_ModuleDescription_out &
-IR_ModuleDescription_out::operator= (const ::IR_ModuleDescription_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ModuleDescription_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ModuleDescription_out &
-IR_ModuleDescription_out::operator= (IR_ModuleDescription *p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_ModuleDescription_out::operator ::IR_ModuleDescription *&() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ModuleDescription *&
-IR_ModuleDescription_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ModuleDescription *
-IR_ModuleDescription_out::operator-> (void)
+IR_SequenceDef::IR_SequenceDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
{
- return this->ptr_;
+ this->_tao_setup_collocation (_tao_collocated);
}
-ACE_INLINE
-IR_ConstantDef::IR_ConstantDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ConstantDef::IR_ConstantDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ConstantDef::~IR_ConstantDef (void) // destructor
-{}
-
-
-#if !defined (_IR_CONSTANTDEF___VAR_CI_)
-#define _IR_CONSTANTDEF___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_ConstantDef_var
+// Inline operations for class IR_SequenceDef_var
// *************************************************************
ACE_INLINE
-IR_ConstantDef_var::IR_ConstantDef_var (void) // default constructor
- : ptr_ (IR_ConstantDef::_nil ())
-{}
-
-ACE_INLINE
-IR_ConstantDef_var::IR_ConstantDef_var (IR_ConstantDef_ptr p)
- : ptr_ (p)
+IR_SequenceDef_var::IR_SequenceDef_var (void) // default constructor
+ : ptr_ (IR_SequenceDef::_nil ())
{}
-ACE_INLINE ::IR_ConstantDef_ptr
-IR_ConstantDef_var::ptr (void) const
+ACE_INLINE IR_SequenceDef_ptr
+IR_SequenceDef_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_ConstantDef_var::IR_ConstantDef_var (const ::IR_ConstantDef_var &p) // copy constructor
+IR_SequenceDef_var::IR_SequenceDef_var (const IR_SequenceDef_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (IR_ConstantDef::_duplicate (p.ptr ()))
+ ptr_ (IR_SequenceDef::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_ConstantDef_var::~IR_ConstantDef_var (void) // destructor
+IR_SequenceDef_var::~IR_SequenceDef_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE IR_ConstantDef_var &
-IR_ConstantDef_var::operator= (IR_ConstantDef_ptr p)
+ACE_INLINE IR_SequenceDef_var &
+IR_SequenceDef_var::operator= (IR_SequenceDef_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_ConstantDef_var &
-IR_ConstantDef_var::operator= (const ::IR_ConstantDef_var &p)
+ACE_INLINE IR_SequenceDef_var &
+IR_SequenceDef_var::operator= (const IR_SequenceDef_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ConstantDef::_duplicate (p.ptr ());
+ this->ptr_ = IR_SequenceDef::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_ConstantDef_var::operator const ::IR_ConstantDef_ptr &() const // cast
+ACE_INLINE
+IR_SequenceDef_var::operator const IR_SequenceDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_ConstantDef_var::operator ::IR_ConstantDef_ptr &() // cast
+ACE_INLINE
+IR_SequenceDef_var::operator IR_SequenceDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_ConstantDef_ptr
-IR_ConstantDef_var::operator-> (void) const
+ACE_INLINE IR_SequenceDef_ptr
+IR_SequenceDef_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_ConstantDef_ptr
-IR_ConstantDef_var::in (void) const
+ACE_INLINE IR_SequenceDef_ptr
+IR_SequenceDef_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_ConstantDef_ptr &
-IR_ConstantDef_var::inout (void)
+ACE_INLINE IR_SequenceDef_ptr &
+IR_SequenceDef_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_ConstantDef_ptr &
-IR_ConstantDef_var::out (void)
+ACE_INLINE IR_SequenceDef_ptr &
+IR_SequenceDef_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ConstantDef::_nil ();
+ this->ptr_ = IR_SequenceDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_ConstantDef_ptr
-IR_ConstantDef_var::_retn (void)
+ACE_INLINE IR_SequenceDef_ptr
+IR_SequenceDef_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_ConstantDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ConstantDef::_nil ();
+ IR_SequenceDef_ptr val = this->ptr_;
+ this->ptr_ = IR_SequenceDef::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONSTANTDEF___OUT_CI_)
-#define _IR_CONSTANTDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_ConstantDef_out
+// Inline operations for class IR_SequenceDef_out
// *************************************************************
ACE_INLINE
-IR_ConstantDef_out::IR_ConstantDef_out (IR_ConstantDef_ptr &p)
+IR_SequenceDef_out::IR_SequenceDef_out (IR_SequenceDef_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_ConstantDef::_nil ();
+ this->ptr_ = IR_SequenceDef::_nil ();
}
ACE_INLINE
-IR_ConstantDef_out::IR_ConstantDef_out (IR_ConstantDef_var &p) // constructor from _var
+IR_SequenceDef_out::IR_SequenceDef_out (IR_SequenceDef_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ConstantDef::_nil ();
+ this->ptr_ = IR_SequenceDef::_nil ();
}
ACE_INLINE
-IR_ConstantDef_out::IR_ConstantDef_out (const ::IR_ConstantDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ConstantDef_out &, p).ptr_)
+IR_SequenceDef_out::IR_SequenceDef_out (const IR_SequenceDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_SequenceDef_out&,p).ptr_)
{}
-ACE_INLINE ::IR_ConstantDef_out &
-IR_ConstantDef_out::operator= (const ::IR_ConstantDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ConstantDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ConstantDef_out &
-IR_ConstantDef_out::operator= (const ::IR_ConstantDef_var &p)
+ACE_INLINE IR_SequenceDef_out &
+IR_SequenceDef_out::operator= (const IR_SequenceDef_out &p)
{
- this->ptr_ = ::IR_ConstantDef::_duplicate (p.ptr ());
+ this->ptr_ = ACE_const_cast (IR_SequenceDef_out&,p).ptr_;
return *this;
}
-ACE_INLINE IR_ConstantDef_out &
-IR_ConstantDef_out::operator= (IR_ConstantDef_ptr p)
+ACE_INLINE IR_SequenceDef_out &
+IR_SequenceDef_out::operator= (const IR_SequenceDef_var &p)
{
- this->ptr_ = p;
+ this->ptr_ = IR_SequenceDef::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE
-IR_ConstantDef_out::operator ::IR_ConstantDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConstantDef_ptr &
-IR_ConstantDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConstantDef_ptr
-IR_ConstantDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class IR_ConstantDescription_var
-// *************************************************************
-
-ACE_INLINE
-IR_ConstantDescription_var::IR_ConstantDescription_var (void) // default constructor
- : ptr_ (0)
-{}
-
-ACE_INLINE
-IR_ConstantDescription_var::IR_ConstantDescription_var (IR_ConstantDescription *p)
- : ptr_ (p)
-{}
-
-ACE_INLINE
-IR_ConstantDescription_var::IR_ConstantDescription_var (const ::IR_ConstantDescription_var &p) // copy constructor
-{
- if (p.ptr_)
- ACE_NEW (this->ptr_, ::IR_ConstantDescription (*p.ptr_));
- else
- this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR_ConstantDescription_var::~IR_ConstantDescription_var (void) // destructor
-{
- delete this->ptr_;
-}
-
-ACE_INLINE IR_ConstantDescription_var &
-IR_ConstantDescription_var::operator= (IR_ConstantDescription *p)
+ACE_INLINE IR_SequenceDef_out &
+IR_SequenceDef_out::operator= (IR_SequenceDef_ptr p)
{
- delete this->ptr_;
this->ptr_ = p;
return *this;
}
-ACE_INLINE ::IR_ConstantDescription_var &
-IR_ConstantDescription_var::operator= (const ::IR_ConstantDescription_var &p)
-{
- if (this != &p)
- {
- delete this->ptr_;
- ACE_NEW_RETURN (this->ptr_, ::IR_ConstantDescription (*p.ptr_), *this);
- }
- return *this;
-}
-
-ACE_INLINE const ::IR_ConstantDescription *
-IR_ConstantDescription_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConstantDescription *
-IR_ConstantDescription_var::operator-> (void)
+ACE_INLINE
+IR_SequenceDef_out::operator IR_SequenceDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_ConstantDescription_var::operator const ::IR_ConstantDescription &() const // cast
-{
- return *this->ptr_;
-}
-
-ACE_INLINE
-IR_ConstantDescription_var::operator ::IR_ConstantDescription &() // cast
-{
- return *this->ptr_;
-}
-
-ACE_INLINE
-IR_ConstantDescription_var::operator ::IR_ConstantDescription &() const // cast
-{
- return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-IR_ConstantDescription_var::operator ::IR_ConstantDescription *&() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE const ::IR_ConstantDescription &
-IR_ConstantDescription_var::in (void) const
-{
- return *this->ptr_;
-}
-
-ACE_INLINE ::IR_ConstantDescription &
-IR_ConstantDescription_var::inout (void)
-{
- return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE ::IR_ConstantDescription *&
-IR_ConstantDescription_var::out (void)
+ACE_INLINE IR_SequenceDef_ptr &
+IR_SequenceDef_out::ptr (void) // ptr
{
- delete this->ptr_;
- this->ptr_ = 0;
return this->ptr_;
}
-ACE_INLINE ::IR_ConstantDescription *
-IR_ConstantDescription_var::_retn (void)
-{
- ::IR_ConstantDescription *tmp = this->ptr_;
- this->ptr_ = 0;
- return tmp;
-}
-
-ACE_INLINE ::IR_ConstantDescription *
-IR_ConstantDescription_var::ptr (void) const
+ACE_INLINE IR_SequenceDef_ptr
+IR_SequenceDef_out::operator-> (void)
{
return this->ptr_;
}
-// *************************************************************
-// Inline operations for class IR_ConstantDescription_out
-// *************************************************************
-
-ACE_INLINE
-IR_ConstantDescription_out::IR_ConstantDescription_out (::IR_ConstantDescription *&p)
- : ptr_ (p)
-{
- this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR_ConstantDescription_out::IR_ConstantDescription_out (IR_ConstantDescription_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- delete this->ptr_;
- this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR_ConstantDescription_out::IR_ConstantDescription_out (const ::IR_ConstantDescription_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ConstantDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE IR_ConstantDescription_out &
-IR_ConstantDescription_out::operator= (const ::IR_ConstantDescription_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ConstantDescription_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ConstantDescription_out &
-IR_ConstantDescription_out::operator= (IR_ConstantDescription *p)
-{
- this->ptr_ = p;
- return *this;
-}
-
ACE_INLINE
-IR_ConstantDescription_out::operator ::IR_ConstantDescription *&() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConstantDescription *&
-IR_ConstantDescription_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConstantDescription *
-IR_ConstantDescription_out::operator-> (void)
+IR_ArrayDef::IR_ArrayDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
{
- return this->ptr_;
+ this->_tao_setup_collocation (_tao_collocated);
}
-ACE_INLINE
-IR_TypedefDef::IR_TypedefDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_TypedefDef::IR_TypedefDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_TypedefDef::~IR_TypedefDef (void) // destructor
-{}
-
-
-#if !defined (_IR_TYPEDEFDEF___VAR_CI_)
-#define _IR_TYPEDEFDEF___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_TypedefDef_var
+// Inline operations for class IR_ArrayDef_var
// *************************************************************
ACE_INLINE
-IR_TypedefDef_var::IR_TypedefDef_var (void) // default constructor
- : ptr_ (IR_TypedefDef::_nil ())
-{}
-
-ACE_INLINE
-IR_TypedefDef_var::IR_TypedefDef_var (IR_TypedefDef_ptr p)
- : ptr_ (p)
+IR_ArrayDef_var::IR_ArrayDef_var (void) // default constructor
+ : ptr_ (IR_ArrayDef::_nil ())
{}
-ACE_INLINE ::IR_TypedefDef_ptr
-IR_TypedefDef_var::ptr (void) const
+ACE_INLINE IR_ArrayDef_ptr
+IR_ArrayDef_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_TypedefDef_var::IR_TypedefDef_var (const ::IR_TypedefDef_var &p) // copy constructor
+IR_ArrayDef_var::IR_ArrayDef_var (const IR_ArrayDef_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (IR_TypedefDef::_duplicate (p.ptr ()))
+ ptr_ (IR_ArrayDef::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_TypedefDef_var::~IR_TypedefDef_var (void) // destructor
+IR_ArrayDef_var::~IR_ArrayDef_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE IR_TypedefDef_var &
-IR_TypedefDef_var::operator= (IR_TypedefDef_ptr p)
+ACE_INLINE IR_ArrayDef_var &
+IR_ArrayDef_var::operator= (IR_ArrayDef_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_TypedefDef_var &
-IR_TypedefDef_var::operator= (const ::IR_TypedefDef_var &p)
+ACE_INLINE IR_ArrayDef_var &
+IR_ArrayDef_var::operator= (const IR_ArrayDef_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_TypedefDef::_duplicate (p.ptr ());
+ this->ptr_ = IR_ArrayDef::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_TypedefDef_var::operator const ::IR_TypedefDef_ptr &() const // cast
+ACE_INLINE
+IR_ArrayDef_var::operator const IR_ArrayDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_TypedefDef_var::operator ::IR_TypedefDef_ptr &() // cast
+ACE_INLINE
+IR_ArrayDef_var::operator IR_ArrayDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_TypedefDef_ptr
-IR_TypedefDef_var::operator-> (void) const
+ACE_INLINE IR_ArrayDef_ptr
+IR_ArrayDef_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_TypedefDef_ptr
-IR_TypedefDef_var::in (void) const
+ACE_INLINE IR_ArrayDef_ptr
+IR_ArrayDef_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_TypedefDef_ptr &
-IR_TypedefDef_var::inout (void)
+ACE_INLINE IR_ArrayDef_ptr &
+IR_ArrayDef_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_TypedefDef_ptr &
-IR_TypedefDef_var::out (void)
+ACE_INLINE IR_ArrayDef_ptr &
+IR_ArrayDef_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_TypedefDef::_nil ();
+ this->ptr_ = IR_ArrayDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_TypedefDef_ptr
-IR_TypedefDef_var::_retn (void)
+ACE_INLINE IR_ArrayDef_ptr
+IR_ArrayDef_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_TypedefDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_TypedefDef::_nil ();
+ IR_ArrayDef_ptr val = this->ptr_;
+ this->ptr_ = IR_ArrayDef::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_TYPEDEFDEF___OUT_CI_)
-#define _IR_TYPEDEFDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_TypedefDef_out
+// Inline operations for class IR_ArrayDef_out
// *************************************************************
ACE_INLINE
-IR_TypedefDef_out::IR_TypedefDef_out (IR_TypedefDef_ptr &p)
+IR_ArrayDef_out::IR_ArrayDef_out (IR_ArrayDef_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_TypedefDef::_nil ();
+ this->ptr_ = IR_ArrayDef::_nil ();
}
ACE_INLINE
-IR_TypedefDef_out::IR_TypedefDef_out (IR_TypedefDef_var &p) // constructor from _var
+IR_ArrayDef_out::IR_ArrayDef_out (IR_ArrayDef_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_TypedefDef::_nil ();
+ this->ptr_ = IR_ArrayDef::_nil ();
}
ACE_INLINE
-IR_TypedefDef_out::IR_TypedefDef_out (const ::IR_TypedefDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_TypedefDef_out &, p).ptr_)
+IR_ArrayDef_out::IR_ArrayDef_out (const IR_ArrayDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ArrayDef_out&,p).ptr_)
{}
-ACE_INLINE ::IR_TypedefDef_out &
-IR_TypedefDef_out::operator= (const ::IR_TypedefDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_TypedefDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_TypedefDef_out &
-IR_TypedefDef_out::operator= (const ::IR_TypedefDef_var &p)
+ACE_INLINE IR_ArrayDef_out &
+IR_ArrayDef_out::operator= (const IR_ArrayDef_out &p)
{
- this->ptr_ = ::IR_TypedefDef::_duplicate (p.ptr ());
+ this->ptr_ = ACE_const_cast (IR_ArrayDef_out&,p).ptr_;
return *this;
}
-ACE_INLINE IR_TypedefDef_out &
-IR_TypedefDef_out::operator= (IR_TypedefDef_ptr p)
+ACE_INLINE IR_ArrayDef_out &
+IR_ArrayDef_out::operator= (const IR_ArrayDef_var &p)
{
- this->ptr_ = p;
+ this->ptr_ = IR_ArrayDef::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE
-IR_TypedefDef_out::operator ::IR_TypedefDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_TypedefDef_ptr &
-IR_TypedefDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_TypedefDef_ptr
-IR_TypedefDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-// *************************************************************
-// Inline operations for class IR_TypeDescription_var
-// *************************************************************
-
-ACE_INLINE
-IR_TypeDescription_var::IR_TypeDescription_var (void) // default constructor
- : ptr_ (0)
-{}
-
-ACE_INLINE
-IR_TypeDescription_var::IR_TypeDescription_var (IR_TypeDescription *p)
- : ptr_ (p)
-{}
-
-ACE_INLINE
-IR_TypeDescription_var::IR_TypeDescription_var (const ::IR_TypeDescription_var &p) // copy constructor
-{
- if (p.ptr_)
- ACE_NEW (this->ptr_, ::IR_TypeDescription (*p.ptr_));
- else
- this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR_TypeDescription_var::~IR_TypeDescription_var (void) // destructor
-{
- delete this->ptr_;
-}
-
-ACE_INLINE IR_TypeDescription_var &
-IR_TypeDescription_var::operator= (IR_TypeDescription *p)
+ACE_INLINE IR_ArrayDef_out &
+IR_ArrayDef_out::operator= (IR_ArrayDef_ptr p)
{
- delete this->ptr_;
this->ptr_ = p;
return *this;
}
-ACE_INLINE ::IR_TypeDescription_var &
-IR_TypeDescription_var::operator= (const ::IR_TypeDescription_var &p)
-{
- if (this != &p)
- {
- delete this->ptr_;
- ACE_NEW_RETURN (this->ptr_, ::IR_TypeDescription (*p.ptr_), *this);
- }
- return *this;
-}
-
-ACE_INLINE const ::IR_TypeDescription *
-IR_TypeDescription_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_TypeDescription *
-IR_TypeDescription_var::operator-> (void)
+ACE_INLINE
+IR_ArrayDef_out::operator IR_ArrayDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_TypeDescription_var::operator const ::IR_TypeDescription &() const // cast
-{
- return *this->ptr_;
-}
-
-ACE_INLINE
-IR_TypeDescription_var::operator ::IR_TypeDescription &() // cast
-{
- return *this->ptr_;
-}
-
-ACE_INLINE
-IR_TypeDescription_var::operator ::IR_TypeDescription &() const // cast
-{
- return *this->ptr_;
-}
-
-// variable-size types only
-ACE_INLINE
-IR_TypeDescription_var::operator ::IR_TypeDescription *&() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE const ::IR_TypeDescription &
-IR_TypeDescription_var::in (void) const
-{
- return *this->ptr_;
-}
-
-ACE_INLINE ::IR_TypeDescription &
-IR_TypeDescription_var::inout (void)
-{
- return *this->ptr_;
-}
-
-// mapping for variable size
-ACE_INLINE ::IR_TypeDescription *&
-IR_TypeDescription_var::out (void)
+ACE_INLINE IR_ArrayDef_ptr &
+IR_ArrayDef_out::ptr (void) // ptr
{
- delete this->ptr_;
- this->ptr_ = 0;
return this->ptr_;
}
-ACE_INLINE ::IR_TypeDescription *
-IR_TypeDescription_var::_retn (void)
-{
- ::IR_TypeDescription *tmp = this->ptr_;
- this->ptr_ = 0;
- return tmp;
-}
-
-ACE_INLINE ::IR_TypeDescription *
-IR_TypeDescription_var::ptr (void) const
+ACE_INLINE IR_ArrayDef_ptr
+IR_ArrayDef_out::operator-> (void)
{
return this->ptr_;
}
-// *************************************************************
-// Inline operations for class IR_TypeDescription_out
-// *************************************************************
-
ACE_INLINE
-IR_TypeDescription_out::IR_TypeDescription_out (::IR_TypeDescription *&p)
- : ptr_ (p)
-{
- this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR_TypeDescription_out::IR_TypeDescription_out (IR_TypeDescription_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- delete this->ptr_;
- this->ptr_ = 0;
-}
-
-ACE_INLINE
-IR_TypeDescription_out::IR_TypeDescription_out (const ::IR_TypeDescription_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_TypeDescription_out&, p).ptr_)
-{}
-
-ACE_INLINE IR_TypeDescription_out &
-IR_TypeDescription_out::operator= (const ::IR_TypeDescription_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_TypeDescription_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_TypeDescription_out &
-IR_TypeDescription_out::operator= (IR_TypeDescription *p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_TypeDescription_out::operator ::IR_TypeDescription *&() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_TypeDescription *&
-IR_TypeDescription_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_TypeDescription *
-IR_TypeDescription_out::operator-> (void)
+IR_WstringDef::IR_WstringDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
{
- return this->ptr_;
+ this->_tao_setup_collocation (_tao_collocated);
}
-ACE_INLINE
-IR_StructDef::IR_StructDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_StructDef::IR_StructDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_StructDef::~IR_StructDef (void) // destructor
-{}
-
-
-#if !defined (_IR_STRUCTDEF___VAR_CI_)
-#define _IR_STRUCTDEF___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_StructDef_var
+// Inline operations for class IR_WstringDef_var
// *************************************************************
ACE_INLINE
-IR_StructDef_var::IR_StructDef_var (void) // default constructor
- : ptr_ (IR_StructDef::_nil ())
-{}
-
-ACE_INLINE
-IR_StructDef_var::IR_StructDef_var (IR_StructDef_ptr p)
- : ptr_ (p)
+IR_WstringDef_var::IR_WstringDef_var (void) // default constructor
+ : ptr_ (IR_WstringDef::_nil ())
{}
-ACE_INLINE ::IR_StructDef_ptr
-IR_StructDef_var::ptr (void) const
+ACE_INLINE IR_WstringDef_ptr
+IR_WstringDef_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_StructDef_var::IR_StructDef_var (const ::IR_StructDef_var &p) // copy constructor
+IR_WstringDef_var::IR_WstringDef_var (const IR_WstringDef_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (IR_StructDef::_duplicate (p.ptr ()))
+ ptr_ (IR_WstringDef::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_StructDef_var::~IR_StructDef_var (void) // destructor
+IR_WstringDef_var::~IR_WstringDef_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE IR_StructDef_var &
-IR_StructDef_var::operator= (IR_StructDef_ptr p)
+ACE_INLINE IR_WstringDef_var &
+IR_WstringDef_var::operator= (IR_WstringDef_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_StructDef_var &
-IR_StructDef_var::operator= (const ::IR_StructDef_var &p)
+ACE_INLINE IR_WstringDef_var &
+IR_WstringDef_var::operator= (const IR_WstringDef_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_StructDef::_duplicate (p.ptr ());
+ this->ptr_ = IR_WstringDef::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_StructDef_var::operator const ::IR_StructDef_ptr &() const // cast
+ACE_INLINE
+IR_WstringDef_var::operator const IR_WstringDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_StructDef_var::operator ::IR_StructDef_ptr &() // cast
+ACE_INLINE
+IR_WstringDef_var::operator IR_WstringDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_StructDef_ptr
-IR_StructDef_var::operator-> (void) const
+ACE_INLINE IR_WstringDef_ptr
+IR_WstringDef_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_StructDef_ptr
-IR_StructDef_var::in (void) const
+ACE_INLINE IR_WstringDef_ptr
+IR_WstringDef_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_StructDef_ptr &
-IR_StructDef_var::inout (void)
+ACE_INLINE IR_WstringDef_ptr &
+IR_WstringDef_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_StructDef_ptr &
-IR_StructDef_var::out (void)
+ACE_INLINE IR_WstringDef_ptr &
+IR_WstringDef_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_StructDef::_nil ();
+ this->ptr_ = IR_WstringDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_StructDef_ptr
-IR_StructDef_var::_retn (void)
+ACE_INLINE IR_WstringDef_ptr
+IR_WstringDef_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_StructDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_StructDef::_nil ();
+ IR_WstringDef_ptr val = this->ptr_;
+ this->ptr_ = IR_WstringDef::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_STRUCTDEF___OUT_CI_)
-#define _IR_STRUCTDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_StructDef_out
+// Inline operations for class IR_WstringDef_out
// *************************************************************
ACE_INLINE
-IR_StructDef_out::IR_StructDef_out (IR_StructDef_ptr &p)
+IR_WstringDef_out::IR_WstringDef_out (IR_WstringDef_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_StructDef::_nil ();
+ this->ptr_ = IR_WstringDef::_nil ();
}
ACE_INLINE
-IR_StructDef_out::IR_StructDef_out (IR_StructDef_var &p) // constructor from _var
+IR_WstringDef_out::IR_WstringDef_out (IR_WstringDef_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_StructDef::_nil ();
+ this->ptr_ = IR_WstringDef::_nil ();
}
ACE_INLINE
-IR_StructDef_out::IR_StructDef_out (const ::IR_StructDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_StructDef_out &, p).ptr_)
+IR_WstringDef_out::IR_WstringDef_out (const IR_WstringDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_WstringDef_out&,p).ptr_)
{}
-ACE_INLINE ::IR_StructDef_out &
-IR_StructDef_out::operator= (const ::IR_StructDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_StructDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_StructDef_out &
-IR_StructDef_out::operator= (const ::IR_StructDef_var &p)
+ACE_INLINE IR_WstringDef_out &
+IR_WstringDef_out::operator= (const IR_WstringDef_out &p)
{
- this->ptr_ = ::IR_StructDef::_duplicate (p.ptr ());
+ this->ptr_ = ACE_const_cast (IR_WstringDef_out&,p).ptr_;
return *this;
}
-ACE_INLINE IR_StructDef_out &
-IR_StructDef_out::operator= (IR_StructDef_ptr p)
+ACE_INLINE IR_WstringDef_out &
+IR_WstringDef_out::operator= (const IR_WstringDef_var &p)
{
- this->ptr_ = p;
+ this->ptr_ = IR_WstringDef::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE
-IR_StructDef_out::operator ::IR_StructDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_StructDef_ptr &
-IR_StructDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_StructDef_ptr
-IR_StructDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_UnionDef::IR_UnionDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_UnionDef::IR_UnionDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_UnionDef::~IR_UnionDef (void) // destructor
-{}
-
-
-#if !defined (_IR_UNIONDEF___VAR_CI_)
-#define _IR_UNIONDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_UnionDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_UnionDef_var::IR_UnionDef_var (void) // default constructor
- : ptr_ (IR_UnionDef::_nil ())
-{}
-
-ACE_INLINE
-IR_UnionDef_var::IR_UnionDef_var (IR_UnionDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_UnionDef_ptr
-IR_UnionDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_UnionDef_var::IR_UnionDef_var (const ::IR_UnionDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_UnionDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_UnionDef_var::~IR_UnionDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_UnionDef_var &
-IR_UnionDef_var::operator= (IR_UnionDef_ptr p)
+ACE_INLINE IR_WstringDef_out &
+IR_WstringDef_out::operator= (IR_WstringDef_ptr p)
{
- CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_UnionDef_var &
-IR_UnionDef_var::operator= (const ::IR_UnionDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_UnionDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_UnionDef_var::operator const ::IR_UnionDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_UnionDef_var::operator ::IR_UnionDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UnionDef_ptr
-IR_UnionDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UnionDef_ptr
-IR_UnionDef_var::in (void) const
+ACE_INLINE
+IR_WstringDef_out::operator IR_WstringDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_UnionDef_ptr &
-IR_UnionDef_var::inout (void)
+ACE_INLINE IR_WstringDef_ptr &
+IR_WstringDef_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_UnionDef_ptr &
-IR_UnionDef_var::out (void)
+ACE_INLINE IR_WstringDef_ptr
+IR_WstringDef_out::operator-> (void)
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_UnionDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_UnionDef_ptr
-IR_UnionDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_UnionDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_UnionDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_UNIONDEF___OUT_CI_)
-#define _IR_UNIONDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_UnionDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_UnionDef_out::IR_UnionDef_out (IR_UnionDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_UnionDef::_nil ();
-}
-
-ACE_INLINE
-IR_UnionDef_out::IR_UnionDef_out (IR_UnionDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_UnionDef::_nil ();
-}
-
ACE_INLINE
-IR_UnionDef_out::IR_UnionDef_out (const ::IR_UnionDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_UnionDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_UnionDef_out &
-IR_UnionDef_out::operator= (const ::IR_UnionDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_UnionDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_UnionDef_out &
-IR_UnionDef_out::operator= (const ::IR_UnionDef_var &p)
-{
- this->ptr_ = ::IR_UnionDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_UnionDef_out &
-IR_UnionDef_out::operator= (IR_UnionDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_UnionDef_out::operator ::IR_UnionDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UnionDef_ptr &
-IR_UnionDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UnionDef_ptr
-IR_UnionDef_out::operator-> (void)
+IR_FixedDef::IR_FixedDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
{
- return this->ptr_;
+ this->_tao_setup_collocation (_tao_collocated);
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_EnumDef::IR_EnumDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_EnumDef::IR_EnumDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_EnumDef::~IR_EnumDef (void) // destructor
-{}
-
-
-#if !defined (_IR_ENUMDEF___VAR_CI_)
-#define _IR_ENUMDEF___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_EnumDef_var
+// Inline operations for class IR_FixedDef_var
// *************************************************************
ACE_INLINE
-IR_EnumDef_var::IR_EnumDef_var (void) // default constructor
- : ptr_ (IR_EnumDef::_nil ())
-{}
-
-ACE_INLINE
-IR_EnumDef_var::IR_EnumDef_var (IR_EnumDef_ptr p)
- : ptr_ (p)
+IR_FixedDef_var::IR_FixedDef_var (void) // default constructor
+ : ptr_ (IR_FixedDef::_nil ())
{}
-ACE_INLINE ::IR_EnumDef_ptr
-IR_EnumDef_var::ptr (void) const
+ACE_INLINE IR_FixedDef_ptr
+IR_FixedDef_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_EnumDef_var::IR_EnumDef_var (const ::IR_EnumDef_var &p) // copy constructor
+IR_FixedDef_var::IR_FixedDef_var (const IR_FixedDef_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (IR_EnumDef::_duplicate (p.ptr ()))
+ ptr_ (IR_FixedDef::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_EnumDef_var::~IR_EnumDef_var (void) // destructor
+IR_FixedDef_var::~IR_FixedDef_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE IR_EnumDef_var &
-IR_EnumDef_var::operator= (IR_EnumDef_ptr p)
+ACE_INLINE IR_FixedDef_var &
+IR_FixedDef_var::operator= (IR_FixedDef_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_EnumDef_var &
-IR_EnumDef_var::operator= (const ::IR_EnumDef_var &p)
+ACE_INLINE IR_FixedDef_var &
+IR_FixedDef_var::operator= (const IR_FixedDef_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EnumDef::_duplicate (p.ptr ());
+ this->ptr_ = IR_FixedDef::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_EnumDef_var::operator const ::IR_EnumDef_ptr &() const // cast
+ACE_INLINE
+IR_FixedDef_var::operator const IR_FixedDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_EnumDef_var::operator ::IR_EnumDef_ptr &() // cast
+ACE_INLINE
+IR_FixedDef_var::operator IR_FixedDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_EnumDef_ptr
-IR_EnumDef_var::operator-> (void) const
+ACE_INLINE IR_FixedDef_ptr
+IR_FixedDef_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_EnumDef_ptr
-IR_EnumDef_var::in (void) const
+ACE_INLINE IR_FixedDef_ptr
+IR_FixedDef_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_EnumDef_ptr &
-IR_EnumDef_var::inout (void)
+ACE_INLINE IR_FixedDef_ptr &
+IR_FixedDef_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_EnumDef_ptr &
-IR_EnumDef_var::out (void)
+ACE_INLINE IR_FixedDef_ptr &
+IR_FixedDef_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EnumDef::_nil ();
+ this->ptr_ = IR_FixedDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_EnumDef_ptr
-IR_EnumDef_var::_retn (void)
+ACE_INLINE IR_FixedDef_ptr
+IR_FixedDef_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_EnumDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_EnumDef::_nil ();
+ IR_FixedDef_ptr val = this->ptr_;
+ this->ptr_ = IR_FixedDef::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_ENUMDEF___OUT_CI_)
-#define _IR_ENUMDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_EnumDef_out
+// Inline operations for class IR_FixedDef_out
// *************************************************************
ACE_INLINE
-IR_EnumDef_out::IR_EnumDef_out (IR_EnumDef_ptr &p)
+IR_FixedDef_out::IR_FixedDef_out (IR_FixedDef_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_EnumDef::_nil ();
+ this->ptr_ = IR_FixedDef::_nil ();
}
ACE_INLINE
-IR_EnumDef_out::IR_EnumDef_out (IR_EnumDef_var &p) // constructor from _var
+IR_FixedDef_out::IR_FixedDef_out (IR_FixedDef_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EnumDef::_nil ();
+ this->ptr_ = IR_FixedDef::_nil ();
}
ACE_INLINE
-IR_EnumDef_out::IR_EnumDef_out (const ::IR_EnumDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_EnumDef_out &, p).ptr_)
+IR_FixedDef_out::IR_FixedDef_out (const IR_FixedDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_FixedDef_out&,p).ptr_)
{}
-ACE_INLINE ::IR_EnumDef_out &
-IR_EnumDef_out::operator= (const ::IR_EnumDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_EnumDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_EnumDef_out &
-IR_EnumDef_out::operator= (const ::IR_EnumDef_var &p)
+ACE_INLINE IR_FixedDef_out &
+IR_FixedDef_out::operator= (const IR_FixedDef_out &p)
{
- this->ptr_ = ::IR_EnumDef::_duplicate (p.ptr ());
+ this->ptr_ = ACE_const_cast (IR_FixedDef_out&,p).ptr_;
return *this;
}
-ACE_INLINE IR_EnumDef_out &
-IR_EnumDef_out::operator= (IR_EnumDef_ptr p)
+ACE_INLINE IR_FixedDef_out &
+IR_FixedDef_out::operator= (const IR_FixedDef_var &p)
{
- this->ptr_ = p;
+ this->ptr_ = IR_FixedDef::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE
-IR_EnumDef_out::operator ::IR_EnumDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EnumDef_ptr &
-IR_EnumDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EnumDef_ptr
-IR_EnumDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_AliasDef::IR_AliasDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_AliasDef::IR_AliasDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_AliasDef::~IR_AliasDef (void) // destructor
-{}
-
-
-#if !defined (_IR_ALIASDEF___VAR_CI_)
-#define _IR_ALIASDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_AliasDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_AliasDef_var::IR_AliasDef_var (void) // default constructor
- : ptr_ (IR_AliasDef::_nil ())
-{}
-
-ACE_INLINE
-IR_AliasDef_var::IR_AliasDef_var (IR_AliasDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_AliasDef_ptr
-IR_AliasDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_AliasDef_var::IR_AliasDef_var (const ::IR_AliasDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_AliasDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_AliasDef_var::~IR_AliasDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_AliasDef_var &
-IR_AliasDef_var::operator= (IR_AliasDef_ptr p)
+ACE_INLINE IR_FixedDef_out &
+IR_FixedDef_out::operator= (IR_FixedDef_ptr p)
{
- CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_AliasDef_var &
-IR_AliasDef_var::operator= (const ::IR_AliasDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_AliasDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_AliasDef_var::operator const ::IR_AliasDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_AliasDef_var::operator ::IR_AliasDef_ptr &() // cast
+ACE_INLINE
+IR_FixedDef_out::operator IR_FixedDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_AliasDef_ptr
-IR_AliasDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_AliasDef_ptr
-IR_AliasDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_AliasDef_ptr &
-IR_AliasDef_var::inout (void)
+ACE_INLINE IR_FixedDef_ptr &
+IR_FixedDef_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_AliasDef_ptr &
-IR_AliasDef_var::out (void)
+ACE_INLINE IR_FixedDef_ptr
+IR_FixedDef_out::operator-> (void)
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_AliasDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_AliasDef_ptr
-IR_AliasDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_AliasDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_AliasDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_ALIASDEF___OUT_CI_)
-#define _IR_ALIASDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_AliasDef_out
-// *************************************************************
-
ACE_INLINE
-IR_AliasDef_out::IR_AliasDef_out (IR_AliasDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_AliasDef::_nil ();
-}
-
-ACE_INLINE
-IR_AliasDef_out::IR_AliasDef_out (IR_AliasDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_AliasDef::_nil ();
-}
-
-ACE_INLINE
-IR_AliasDef_out::IR_AliasDef_out (const ::IR_AliasDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_AliasDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_AliasDef_out &
-IR_AliasDef_out::operator= (const ::IR_AliasDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_AliasDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_AliasDef_out &
-IR_AliasDef_out::operator= (const ::IR_AliasDef_var &p)
-{
- this->ptr_ = ::IR_AliasDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_AliasDef_out &
-IR_AliasDef_out::operator= (IR_AliasDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_AliasDef_out::operator ::IR_AliasDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_AliasDef_ptr &
-IR_AliasDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_AliasDef_ptr
-IR_AliasDef_out::operator-> (void)
+IR_ComponentRepository::IR_ComponentRepository (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
{
- return this->ptr_;
+ this->_tao_setup_collocation (_tao_collocated);
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_NativeDef::IR_NativeDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_NativeDef::IR_NativeDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_NativeDef::~IR_NativeDef (void) // destructor
-{}
-
-
-#if !defined (_IR_NATIVEDEF___VAR_CI_)
-#define _IR_NATIVEDEF___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_NativeDef_var
+// Inline operations for class IR_ComponentRepository_var
// *************************************************************
ACE_INLINE
-IR_NativeDef_var::IR_NativeDef_var (void) // default constructor
- : ptr_ (IR_NativeDef::_nil ())
-{}
-
-ACE_INLINE
-IR_NativeDef_var::IR_NativeDef_var (IR_NativeDef_ptr p)
- : ptr_ (p)
+IR_ComponentRepository_var::IR_ComponentRepository_var (void) // default constructor
+ : ptr_ (IR_ComponentRepository::_nil ())
{}
-ACE_INLINE ::IR_NativeDef_ptr
-IR_NativeDef_var::ptr (void) const
+ACE_INLINE ::IR_ComponentRepository_ptr
+IR_ComponentRepository_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_NativeDef_var::IR_NativeDef_var (const ::IR_NativeDef_var &p) // copy constructor
+IR_ComponentRepository_var::IR_ComponentRepository_var (const ::IR_ComponentRepository_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (IR_NativeDef::_duplicate (p.ptr ()))
+ ptr_ (IR_ComponentRepository::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_NativeDef_var::~IR_NativeDef_var (void) // destructor
+IR_ComponentRepository_var::~IR_ComponentRepository_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE IR_NativeDef_var &
-IR_NativeDef_var::operator= (IR_NativeDef_ptr p)
+ACE_INLINE IR_ComponentRepository_var &
+IR_ComponentRepository_var::operator= (IR_ComponentRepository_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_NativeDef_var &
-IR_NativeDef_var::operator= (const ::IR_NativeDef_var &p)
+ACE_INLINE IR_ComponentRepository_var &
+IR_ComponentRepository_var::operator= (const ::IR_ComponentRepository_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_NativeDef::_duplicate (p.ptr ());
+ this->ptr_ = ::IR_ComponentRepository::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_NativeDef_var::operator const ::IR_NativeDef_ptr &() const // cast
+ACE_INLINE
+IR_ComponentRepository_var::operator const ::IR_ComponentRepository_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_NativeDef_var::operator ::IR_NativeDef_ptr &() // cast
+ACE_INLINE
+IR_ComponentRepository_var::operator ::IR_ComponentRepository_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_NativeDef_ptr
-IR_NativeDef_var::operator-> (void) const
+ACE_INLINE ::IR_ComponentRepository_ptr
+IR_ComponentRepository_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_NativeDef_ptr
-IR_NativeDef_var::in (void) const
+ACE_INLINE ::IR_ComponentRepository_ptr
+IR_ComponentRepository_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_NativeDef_ptr &
-IR_NativeDef_var::inout (void)
+ACE_INLINE ::IR_ComponentRepository_ptr &
+IR_ComponentRepository_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_NativeDef_ptr &
-IR_NativeDef_var::out (void)
+ACE_INLINE ::IR_ComponentRepository_ptr &
+IR_ComponentRepository_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_NativeDef::_nil ();
+ this->ptr_ = ::IR_ComponentRepository::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_NativeDef_ptr
-IR_NativeDef_var::_retn (void)
+ACE_INLINE ::IR_ComponentRepository_ptr
+IR_ComponentRepository_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_NativeDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_NativeDef::_nil ();
+ ::IR_ComponentRepository_ptr val = this->ptr_;
+ this->ptr_ = ::IR_ComponentRepository::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_NATIVEDEF___OUT_CI_)
-#define _IR_NATIVEDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_NativeDef_out
+// Inline operations for class IR_ComponentRepository_out
// *************************************************************
ACE_INLINE
-IR_NativeDef_out::IR_NativeDef_out (IR_NativeDef_ptr &p)
+IR_ComponentRepository_out::IR_ComponentRepository_out (IR_ComponentRepository_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_NativeDef::_nil ();
+ this->ptr_ = ::IR_ComponentRepository::_nil ();
}
ACE_INLINE
-IR_NativeDef_out::IR_NativeDef_out (IR_NativeDef_var &p) // constructor from _var
+IR_ComponentRepository_out::IR_ComponentRepository_out (IR_ComponentRepository_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_NativeDef::_nil ();
+ this->ptr_ = ::IR_ComponentRepository::_nil ();
}
ACE_INLINE
-IR_NativeDef_out::IR_NativeDef_out (const ::IR_NativeDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_NativeDef_out &, p).ptr_)
+IR_ComponentRepository_out::IR_ComponentRepository_out (const ::IR_ComponentRepository_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ComponentRepository_out &, p).ptr_)
{}
-ACE_INLINE ::IR_NativeDef_out &
-IR_NativeDef_out::operator= (const ::IR_NativeDef_out &p)
+ACE_INLINE ::IR_ComponentRepository_out &
+IR_ComponentRepository_out::operator= (const ::IR_ComponentRepository_out &p)
{
- this->ptr_ = ACE_const_cast (IR_NativeDef_out&, p).ptr_;
+ this->ptr_ = ACE_const_cast (IR_ComponentRepository_out&, p).ptr_;
return *this;
}
-ACE_INLINE IR_NativeDef_out &
-IR_NativeDef_out::operator= (const ::IR_NativeDef_var &p)
+ACE_INLINE IR_ComponentRepository_out &
+IR_ComponentRepository_out::operator= (const ::IR_ComponentRepository_var &p)
{
- this->ptr_ = ::IR_NativeDef::_duplicate (p.ptr ());
+ this->ptr_ = ::IR_ComponentRepository::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE IR_NativeDef_out &
-IR_NativeDef_out::operator= (IR_NativeDef_ptr p)
+ACE_INLINE IR_ComponentRepository_out &
+IR_ComponentRepository_out::operator= (IR_ComponentRepository_ptr p)
{
this->ptr_ = p;
return *this;
}
-ACE_INLINE
-IR_NativeDef_out::operator ::IR_NativeDef_ptr &() // cast
+ACE_INLINE
+IR_ComponentRepository_out::operator ::IR_ComponentRepository_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_NativeDef_ptr &
-IR_NativeDef_out::ptr (void) // ptr
+ACE_INLINE ::IR_ComponentRepository_ptr &
+IR_ComponentRepository_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_NativeDef_ptr
-IR_NativeDef_out::operator-> (void)
+ACE_INLINE ::IR_ComponentRepository_ptr
+IR_ComponentRepository_out::operator-> (void)
{
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_PrimitiveDef::IR_PrimitiveDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_PrimitiveDef::IR_PrimitiveDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_PrimitiveDef::~IR_PrimitiveDef (void) // destructor
-{}
-
-
-#if !defined (_IR_PRIMITIVEDEF___VAR_CI_)
-#define _IR_PRIMITIVEDEF___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_PrimitiveDef_var
+// Inline operations for class IR_ModuleDescription_var
// *************************************************************
ACE_INLINE
-IR_PrimitiveDef_var::IR_PrimitiveDef_var (void) // default constructor
- : ptr_ (IR_PrimitiveDef::_nil ())
+IR_ModuleDescription_var::IR_ModuleDescription_var (void) // default constructor
+ : ptr_ (0)
{}
ACE_INLINE
-IR_PrimitiveDef_var::IR_PrimitiveDef_var (IR_PrimitiveDef_ptr p)
+IR_ModuleDescription_var::IR_ModuleDescription_var (IR_ModuleDescription *p)
: ptr_ (p)
{}
-ACE_INLINE ::IR_PrimitiveDef_ptr
-IR_PrimitiveDef_var::ptr (void) const
+ACE_INLINE
+IR_ModuleDescription_var::IR_ModuleDescription_var (const ::IR_ModuleDescription_var &p) // copy constructor
{
- return this->ptr_;
+ if (p.ptr_)
+ ACE_NEW (this->ptr_, ::IR_ModuleDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_PrimitiveDef_var::IR_PrimitiveDef_var (const ::IR_PrimitiveDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_PrimitiveDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_PrimitiveDef_var::~IR_PrimitiveDef_var (void) // destructor
+IR_ModuleDescription_var::~IR_ModuleDescription_var (void) // destructor
{
- CORBA::release (this->ptr_);
+ delete this->ptr_;
}
-ACE_INLINE IR_PrimitiveDef_var &
-IR_PrimitiveDef_var::operator= (IR_PrimitiveDef_ptr p)
+ACE_INLINE IR_ModuleDescription_var &
+IR_ModuleDescription_var::operator= (IR_ModuleDescription *p)
{
- CORBA::release (this->ptr_);
+ delete this->ptr_;
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_PrimitiveDef_var &
-IR_PrimitiveDef_var::operator= (const ::IR_PrimitiveDef_var &p)
+ACE_INLINE ::IR_ModuleDescription_var &
+IR_ModuleDescription_var::operator= (const ::IR_ModuleDescription_var &p)
{
if (this != &p)
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PrimitiveDef::_duplicate (p.ptr ());
+ delete this->ptr_;
+ ACE_NEW_RETURN (this->ptr_, ::IR_ModuleDescription (*p.ptr_), *this);
}
return *this;
}
-ACE_INLINE
-IR_PrimitiveDef_var::operator const ::IR_PrimitiveDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_PrimitiveDef_var::operator ::IR_PrimitiveDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimitiveDef_ptr
-IR_PrimitiveDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimitiveDef_ptr
-IR_PrimitiveDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimitiveDef_ptr &
-IR_PrimitiveDef_var::inout (void)
+ACE_INLINE const ::IR_ModuleDescription *
+IR_ModuleDescription_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_PrimitiveDef_ptr &
-IR_PrimitiveDef_var::out (void)
+ACE_INLINE ::IR_ModuleDescription *
+IR_ModuleDescription_var::operator-> (void)
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PrimitiveDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_PrimitiveDef_ptr
-IR_PrimitiveDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_PrimitiveDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_PrimitiveDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PRIMITIVEDEF___OUT_CI_)
-#define _IR_PRIMITIVEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_PrimitiveDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_PrimitiveDef_out::IR_PrimitiveDef_out (IR_PrimitiveDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_PrimitiveDef::_nil ();
-}
-
-ACE_INLINE
-IR_PrimitiveDef_out::IR_PrimitiveDef_out (IR_PrimitiveDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PrimitiveDef::_nil ();
-}
-
-ACE_INLINE
-IR_PrimitiveDef_out::IR_PrimitiveDef_out (const ::IR_PrimitiveDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_PrimitiveDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_PrimitiveDef_out &
-IR_PrimitiveDef_out::operator= (const ::IR_PrimitiveDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_PrimitiveDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_PrimitiveDef_out &
-IR_PrimitiveDef_out::operator= (const ::IR_PrimitiveDef_var &p)
-{
- this->ptr_ = ::IR_PrimitiveDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_PrimitiveDef_out &
-IR_PrimitiveDef_out::operator= (IR_PrimitiveDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
ACE_INLINE
-IR_PrimitiveDef_out::operator ::IR_PrimitiveDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimitiveDef_ptr &
-IR_PrimitiveDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimitiveDef_ptr
-IR_PrimitiveDef_out::operator-> (void)
+IR_ModuleDescription_var::operator const ::IR_ModuleDescription &() const // cast
{
- return this->ptr_;
+ return *this->ptr_;
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_StringDef::IR_StringDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_StringDef::IR_StringDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
ACE_INLINE
-IR_StringDef::~IR_StringDef (void) // destructor
-{}
-
-
-#if !defined (_IR_STRINGDEF___VAR_CI_)
-#define _IR_STRINGDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_StringDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_StringDef_var::IR_StringDef_var (void) // default constructor
- : ptr_ (IR_StringDef::_nil ())
-{}
-
-ACE_INLINE
-IR_StringDef_var::IR_StringDef_var (IR_StringDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_StringDef_ptr
-IR_StringDef_var::ptr (void) const
+IR_ModuleDescription_var::operator ::IR_ModuleDescription &() // cast
{
- return this->ptr_;
+ return *this->ptr_;
}
ACE_INLINE
-IR_StringDef_var::IR_StringDef_var (const ::IR_StringDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_StringDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_StringDef_var::~IR_StringDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_StringDef_var &
-IR_StringDef_var::operator= (IR_StringDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_StringDef_var &
-IR_StringDef_var::operator= (const ::IR_StringDef_var &p)
+IR_ModuleDescription_var::operator ::IR_ModuleDescription &() const // cast
{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_StringDef::_duplicate (p.ptr ());
- }
- return *this;
+ return *this->ptr_;
}
+// variable-size types only
ACE_INLINE
-IR_StringDef_var::operator const ::IR_StringDef_ptr &() const // cast
+IR_ModuleDescription_var::operator ::IR_ModuleDescription *&() // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_StringDef_var::operator ::IR_StringDef_ptr &() // cast
+ACE_INLINE const ::IR_ModuleDescription &
+IR_ModuleDescription_var::in (void) const
{
- return this->ptr_;
+ return *this->ptr_;
}
-ACE_INLINE ::IR_StringDef_ptr
-IR_StringDef_var::operator-> (void) const
+ACE_INLINE ::IR_ModuleDescription &
+IR_ModuleDescription_var::inout (void)
{
- return this->ptr_;
+ return *this->ptr_;
}
-ACE_INLINE ::IR_StringDef_ptr
-IR_StringDef_var::in (void) const
+// mapping for variable size
+ACE_INLINE ::IR_ModuleDescription *&
+IR_ModuleDescription_var::out (void)
{
+ delete this->ptr_;
+ this->ptr_ = 0;
return this->ptr_;
}
-ACE_INLINE ::IR_StringDef_ptr &
-IR_StringDef_var::inout (void)
+ACE_INLINE ::IR_ModuleDescription *
+IR_ModuleDescription_var::_retn (void)
{
- return this->ptr_;
+ ::IR_ModuleDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
}
-ACE_INLINE ::IR_StringDef_ptr &
-IR_StringDef_var::out (void)
+ACE_INLINE ::IR_ModuleDescription *
+IR_ModuleDescription_var::ptr (void) const
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_StringDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_StringDef_ptr
-IR_StringDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_StringDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_StringDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_STRINGDEF___OUT_CI_)
-#define _IR_STRINGDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_StringDef_out
+// Inline operations for class IR_ModuleDescription_out
// *************************************************************
ACE_INLINE
-IR_StringDef_out::IR_StringDef_out (IR_StringDef_ptr &p)
+IR_ModuleDescription_out::IR_ModuleDescription_out (::IR_ModuleDescription *&p)
: ptr_ (p)
{
- this->ptr_ = ::IR_StringDef::_nil ();
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_StringDef_out::IR_StringDef_out (IR_StringDef_var &p) // constructor from _var
+IR_ModuleDescription_out::IR_ModuleDescription_out (IR_ModuleDescription_var &p) // constructor from _var
: ptr_ (p.out ())
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_StringDef::_nil ();
+ delete this->ptr_;
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_StringDef_out::IR_StringDef_out (const ::IR_StringDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_StringDef_out &, p).ptr_)
+IR_ModuleDescription_out::IR_ModuleDescription_out (const ::IR_ModuleDescription_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ModuleDescription_out&, p).ptr_)
{}
-ACE_INLINE ::IR_StringDef_out &
-IR_StringDef_out::operator= (const ::IR_StringDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_StringDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_StringDef_out &
-IR_StringDef_out::operator= (const ::IR_StringDef_var &p)
+ACE_INLINE IR_ModuleDescription_out &
+IR_ModuleDescription_out::operator= (const ::IR_ModuleDescription_out &p)
{
- this->ptr_ = ::IR_StringDef::_duplicate (p.ptr ());
+ this->ptr_ = ACE_const_cast (IR_ModuleDescription_out&, p).ptr_;
return *this;
}
-ACE_INLINE IR_StringDef_out &
-IR_StringDef_out::operator= (IR_StringDef_ptr p)
+ACE_INLINE IR_ModuleDescription_out &
+IR_ModuleDescription_out::operator= (IR_ModuleDescription *p)
{
this->ptr_ = p;
return *this;
}
-ACE_INLINE
-IR_StringDef_out::operator ::IR_StringDef_ptr &() // cast
+ACE_INLINE
+IR_ModuleDescription_out::operator ::IR_ModuleDescription *&() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_StringDef_ptr &
-IR_StringDef_out::ptr (void) // ptr
+ACE_INLINE ::IR_ModuleDescription *&
+IR_ModuleDescription_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_StringDef_ptr
-IR_StringDef_out::operator-> (void)
+ACE_INLINE ::IR_ModuleDescription *
+IR_ModuleDescription_out::operator-> (void)
{
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_WstringDef::IR_WstringDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_WstringDef::IR_WstringDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_WstringDef::~IR_WstringDef (void) // destructor
-{}
-
-
-#if !defined (_IR_WSTRINGDEF___VAR_CI_)
-#define _IR_WSTRINGDEF___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_WstringDef_var
+// Inline operations for class IR_ConstantDescription_var
// *************************************************************
ACE_INLINE
-IR_WstringDef_var::IR_WstringDef_var (void) // default constructor
- : ptr_ (IR_WstringDef::_nil ())
+IR_ConstantDescription_var::IR_ConstantDescription_var (void) // default constructor
+ : ptr_ (0)
{}
ACE_INLINE
-IR_WstringDef_var::IR_WstringDef_var (IR_WstringDef_ptr p)
+IR_ConstantDescription_var::IR_ConstantDescription_var (IR_ConstantDescription *p)
: ptr_ (p)
{}
-ACE_INLINE ::IR_WstringDef_ptr
-IR_WstringDef_var::ptr (void) const
+ACE_INLINE
+IR_ConstantDescription_var::IR_ConstantDescription_var (const ::IR_ConstantDescription_var &p) // copy constructor
{
- return this->ptr_;
+ if (p.ptr_)
+ ACE_NEW (this->ptr_, ::IR_ConstantDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_WstringDef_var::IR_WstringDef_var (const ::IR_WstringDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_WstringDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_WstringDef_var::~IR_WstringDef_var (void) // destructor
+IR_ConstantDescription_var::~IR_ConstantDescription_var (void) // destructor
{
- CORBA::release (this->ptr_);
+ delete this->ptr_;
}
-ACE_INLINE IR_WstringDef_var &
-IR_WstringDef_var::operator= (IR_WstringDef_ptr p)
+ACE_INLINE IR_ConstantDescription_var &
+IR_ConstantDescription_var::operator= (IR_ConstantDescription *p)
{
- CORBA::release (this->ptr_);
+ delete this->ptr_;
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_WstringDef_var &
-IR_WstringDef_var::operator= (const ::IR_WstringDef_var &p)
+ACE_INLINE ::IR_ConstantDescription_var &
+IR_ConstantDescription_var::operator= (const ::IR_ConstantDescription_var &p)
{
if (this != &p)
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_WstringDef::_duplicate (p.ptr ());
+ delete this->ptr_;
+ ACE_NEW_RETURN (this->ptr_, ::IR_ConstantDescription (*p.ptr_), *this);
}
return *this;
}
-ACE_INLINE
-IR_WstringDef_var::operator const ::IR_WstringDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_WstringDef_var::operator ::IR_WstringDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_WstringDef_ptr
-IR_WstringDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_WstringDef_ptr
-IR_WstringDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_WstringDef_ptr &
-IR_WstringDef_var::inout (void)
+ACE_INLINE const ::IR_ConstantDescription *
+IR_ConstantDescription_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_WstringDef_ptr &
-IR_WstringDef_var::out (void)
+ACE_INLINE ::IR_ConstantDescription *
+IR_ConstantDescription_var::operator-> (void)
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_WstringDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_WstringDef_ptr
-IR_WstringDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_WstringDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_WstringDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_WSTRINGDEF___OUT_CI_)
-#define _IR_WSTRINGDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_WstringDef_out
-// *************************************************************
-
ACE_INLINE
-IR_WstringDef_out::IR_WstringDef_out (IR_WstringDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_WstringDef::_nil ();
-}
-
-ACE_INLINE
-IR_WstringDef_out::IR_WstringDef_out (IR_WstringDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_WstringDef::_nil ();
-}
-
-ACE_INLINE
-IR_WstringDef_out::IR_WstringDef_out (const ::IR_WstringDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_WstringDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_WstringDef_out &
-IR_WstringDef_out::operator= (const ::IR_WstringDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_WstringDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_WstringDef_out &
-IR_WstringDef_out::operator= (const ::IR_WstringDef_var &p)
-{
- this->ptr_ = ::IR_WstringDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_WstringDef_out &
-IR_WstringDef_out::operator= (IR_WstringDef_ptr p)
+IR_ConstantDescription_var::operator const ::IR_ConstantDescription &() const // cast
{
- this->ptr_ = p;
- return *this;
+ return *this->ptr_;
}
ACE_INLINE
-IR_WstringDef_out::operator ::IR_WstringDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_WstringDef_ptr &
-IR_WstringDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_WstringDef_ptr
-IR_WstringDef_out::operator-> (void)
+IR_ConstantDescription_var::operator ::IR_ConstantDescription &() // cast
{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_FixedDef::IR_FixedDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_FixedDef::IR_FixedDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_FixedDef::~IR_FixedDef (void) // destructor
-{}
-
-
-#if !defined (_IR_FIXEDDEF___VAR_CI_)
-#define _IR_FIXEDDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_FixedDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_FixedDef_var::IR_FixedDef_var (void) // default constructor
- : ptr_ (IR_FixedDef::_nil ())
-{}
-
-ACE_INLINE
-IR_FixedDef_var::IR_FixedDef_var (IR_FixedDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_FixedDef_ptr
-IR_FixedDef_var::ptr (void) const
-{
- return this->ptr_;
+ return *this->ptr_;
}
ACE_INLINE
-IR_FixedDef_var::IR_FixedDef_var (const ::IR_FixedDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_FixedDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_FixedDef_var::~IR_FixedDef_var (void) // destructor
+IR_ConstantDescription_var::operator ::IR_ConstantDescription &() const // cast
{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_FixedDef_var &
-IR_FixedDef_var::operator= (IR_FixedDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_FixedDef_var &
-IR_FixedDef_var::operator= (const ::IR_FixedDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FixedDef::_duplicate (p.ptr ());
- }
- return *this;
+ return *this->ptr_;
}
+// variable-size types only
ACE_INLINE
-IR_FixedDef_var::operator const ::IR_FixedDef_ptr &() const // cast
+IR_ConstantDescription_var::operator ::IR_ConstantDescription *&() // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_FixedDef_var::operator ::IR_FixedDef_ptr &() // cast
+ACE_INLINE const ::IR_ConstantDescription &
+IR_ConstantDescription_var::in (void) const
{
- return this->ptr_;
+ return *this->ptr_;
}
-ACE_INLINE ::IR_FixedDef_ptr
-IR_FixedDef_var::operator-> (void) const
+ACE_INLINE ::IR_ConstantDescription &
+IR_ConstantDescription_var::inout (void)
{
- return this->ptr_;
+ return *this->ptr_;
}
-ACE_INLINE ::IR_FixedDef_ptr
-IR_FixedDef_var::in (void) const
+// mapping for variable size
+ACE_INLINE ::IR_ConstantDescription *&
+IR_ConstantDescription_var::out (void)
{
+ delete this->ptr_;
+ this->ptr_ = 0;
return this->ptr_;
}
-ACE_INLINE ::IR_FixedDef_ptr &
-IR_FixedDef_var::inout (void)
+ACE_INLINE ::IR_ConstantDescription *
+IR_ConstantDescription_var::_retn (void)
{
- return this->ptr_;
+ ::IR_ConstantDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
}
-ACE_INLINE ::IR_FixedDef_ptr &
-IR_FixedDef_var::out (void)
+ACE_INLINE ::IR_ConstantDescription *
+IR_ConstantDescription_var::ptr (void) const
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FixedDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_FixedDef_ptr
-IR_FixedDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_FixedDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_FixedDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FIXEDDEF___OUT_CI_)
-#define _IR_FIXEDDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_FixedDef_out
+// Inline operations for class IR_ConstantDescription_out
// *************************************************************
ACE_INLINE
-IR_FixedDef_out::IR_FixedDef_out (IR_FixedDef_ptr &p)
+IR_ConstantDescription_out::IR_ConstantDescription_out (::IR_ConstantDescription *&p)
: ptr_ (p)
{
- this->ptr_ = ::IR_FixedDef::_nil ();
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_FixedDef_out::IR_FixedDef_out (IR_FixedDef_var &p) // constructor from _var
+IR_ConstantDescription_out::IR_ConstantDescription_out (IR_ConstantDescription_var &p) // constructor from _var
: ptr_ (p.out ())
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FixedDef::_nil ();
+ delete this->ptr_;
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_FixedDef_out::IR_FixedDef_out (const ::IR_FixedDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_FixedDef_out &, p).ptr_)
+IR_ConstantDescription_out::IR_ConstantDescription_out (const ::IR_ConstantDescription_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_ConstantDescription_out&, p).ptr_)
{}
-ACE_INLINE ::IR_FixedDef_out &
-IR_FixedDef_out::operator= (const ::IR_FixedDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_FixedDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_FixedDef_out &
-IR_FixedDef_out::operator= (const ::IR_FixedDef_var &p)
+ACE_INLINE IR_ConstantDescription_out &
+IR_ConstantDescription_out::operator= (const ::IR_ConstantDescription_out &p)
{
- this->ptr_ = ::IR_FixedDef::_duplicate (p.ptr ());
+ this->ptr_ = ACE_const_cast (IR_ConstantDescription_out&, p).ptr_;
return *this;
}
-ACE_INLINE IR_FixedDef_out &
-IR_FixedDef_out::operator= (IR_FixedDef_ptr p)
+ACE_INLINE IR_ConstantDescription_out &
+IR_ConstantDescription_out::operator= (IR_ConstantDescription *p)
{
this->ptr_ = p;
return *this;
}
-ACE_INLINE
-IR_FixedDef_out::operator ::IR_FixedDef_ptr &() // cast
+ACE_INLINE
+IR_ConstantDescription_out::operator ::IR_ConstantDescription *&() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_FixedDef_ptr &
-IR_FixedDef_out::ptr (void) // ptr
+ACE_INLINE ::IR_ConstantDescription *&
+IR_ConstantDescription_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_FixedDef_ptr
-IR_FixedDef_out::operator-> (void)
+ACE_INLINE ::IR_ConstantDescription *
+IR_ConstantDescription_out::operator-> (void)
{
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_SequenceDef::IR_SequenceDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_SequenceDef::IR_SequenceDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
ACE_INLINE
-IR_SequenceDef::~IR_SequenceDef (void) // destructor
-{}
-
-
-#if !defined (_IR_SEQUENCEDEF___VAR_CI_)
-#define _IR_SEQUENCEDEF___VAR_CI_
+IR_TypedefDef::IR_TypedefDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
// *************************************************************
-// Inline operations for class IR_SequenceDef_var
+// Inline operations for class IR_TypedefDef_var
// *************************************************************
ACE_INLINE
-IR_SequenceDef_var::IR_SequenceDef_var (void) // default constructor
- : ptr_ (IR_SequenceDef::_nil ())
-{}
-
-ACE_INLINE
-IR_SequenceDef_var::IR_SequenceDef_var (IR_SequenceDef_ptr p)
- : ptr_ (p)
+IR_TypedefDef_var::IR_TypedefDef_var (void) // default constructor
+ : ptr_ (IR_TypedefDef::_nil ())
{}
-ACE_INLINE ::IR_SequenceDef_ptr
-IR_SequenceDef_var::ptr (void) const
+ACE_INLINE ::IR_TypedefDef_ptr
+IR_TypedefDef_var::ptr (void) const
{
return this->ptr_;
}
ACE_INLINE
-IR_SequenceDef_var::IR_SequenceDef_var (const ::IR_SequenceDef_var &p) // copy constructor
+IR_TypedefDef_var::IR_TypedefDef_var (const ::IR_TypedefDef_var &p) // copy constructor
: TAO_Base_var (),
- ptr_ (IR_SequenceDef::_duplicate (p.ptr ()))
+ ptr_ (IR_TypedefDef::_duplicate (p.ptr ()))
{}
ACE_INLINE
-IR_SequenceDef_var::~IR_SequenceDef_var (void) // destructor
+IR_TypedefDef_var::~IR_TypedefDef_var (void) // destructor
{
CORBA::release (this->ptr_);
}
-ACE_INLINE IR_SequenceDef_var &
-IR_SequenceDef_var::operator= (IR_SequenceDef_ptr p)
+ACE_INLINE IR_TypedefDef_var &
+IR_TypedefDef_var::operator= (IR_TypedefDef_ptr p)
{
CORBA::release (this->ptr_);
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_SequenceDef_var &
-IR_SequenceDef_var::operator= (const ::IR_SequenceDef_var &p)
+ACE_INLINE IR_TypedefDef_var &
+IR_TypedefDef_var::operator= (const ::IR_TypedefDef_var &p)
{
if (this != &p)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_SequenceDef::_duplicate (p.ptr ());
+ this->ptr_ = ::IR_TypedefDef::_duplicate (p.ptr ());
}
return *this;
}
-ACE_INLINE
-IR_SequenceDef_var::operator const ::IR_SequenceDef_ptr &() const // cast
+ACE_INLINE
+IR_TypedefDef_var::operator const ::IR_TypedefDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_SequenceDef_var::operator ::IR_SequenceDef_ptr &() // cast
+ACE_INLINE
+IR_TypedefDef_var::operator ::IR_TypedefDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_SequenceDef_ptr
-IR_SequenceDef_var::operator-> (void) const
+ACE_INLINE ::IR_TypedefDef_ptr
+IR_TypedefDef_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_SequenceDef_ptr
-IR_SequenceDef_var::in (void) const
+ACE_INLINE ::IR_TypedefDef_ptr
+IR_TypedefDef_var::in (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_SequenceDef_ptr &
-IR_SequenceDef_var::inout (void)
+ACE_INLINE ::IR_TypedefDef_ptr &
+IR_TypedefDef_var::inout (void)
{
return this->ptr_;
}
-ACE_INLINE ::IR_SequenceDef_ptr &
-IR_SequenceDef_var::out (void)
+ACE_INLINE ::IR_TypedefDef_ptr &
+IR_TypedefDef_var::out (void)
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_SequenceDef::_nil ();
+ this->ptr_ = ::IR_TypedefDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_SequenceDef_ptr
-IR_SequenceDef_var::_retn (void)
+ACE_INLINE ::IR_TypedefDef_ptr
+IR_TypedefDef_var::_retn (void)
{
// yield ownership of managed obj reference
- ::IR_SequenceDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_SequenceDef::_nil ();
+ ::IR_TypedefDef_ptr val = this->ptr_;
+ this->ptr_ = ::IR_TypedefDef::_nil ();
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_SEQUENCEDEF___OUT_CI_)
-#define _IR_SEQUENCEDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_SequenceDef_out
+// Inline operations for class IR_TypedefDef_out
// *************************************************************
ACE_INLINE
-IR_SequenceDef_out::IR_SequenceDef_out (IR_SequenceDef_ptr &p)
+IR_TypedefDef_out::IR_TypedefDef_out (IR_TypedefDef_ptr &p)
: ptr_ (p)
{
- this->ptr_ = ::IR_SequenceDef::_nil ();
+ this->ptr_ = ::IR_TypedefDef::_nil ();
}
ACE_INLINE
-IR_SequenceDef_out::IR_SequenceDef_out (IR_SequenceDef_var &p) // constructor from _var
+IR_TypedefDef_out::IR_TypedefDef_out (IR_TypedefDef_var &p) // constructor from _var
: ptr_ (p.out ())
{
CORBA::release (this->ptr_);
- this->ptr_ = ::IR_SequenceDef::_nil ();
+ this->ptr_ = ::IR_TypedefDef::_nil ();
}
ACE_INLINE
-IR_SequenceDef_out::IR_SequenceDef_out (const ::IR_SequenceDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_SequenceDef_out &, p).ptr_)
+IR_TypedefDef_out::IR_TypedefDef_out (const ::IR_TypedefDef_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_TypedefDef_out &, p).ptr_)
{}
-ACE_INLINE ::IR_SequenceDef_out &
-IR_SequenceDef_out::operator= (const ::IR_SequenceDef_out &p)
+ACE_INLINE ::IR_TypedefDef_out &
+IR_TypedefDef_out::operator= (const ::IR_TypedefDef_out &p)
{
- this->ptr_ = ACE_const_cast (IR_SequenceDef_out&, p).ptr_;
+ this->ptr_ = ACE_const_cast (IR_TypedefDef_out&, p).ptr_;
return *this;
}
-ACE_INLINE IR_SequenceDef_out &
-IR_SequenceDef_out::operator= (const ::IR_SequenceDef_var &p)
+ACE_INLINE IR_TypedefDef_out &
+IR_TypedefDef_out::operator= (const ::IR_TypedefDef_var &p)
{
- this->ptr_ = ::IR_SequenceDef::_duplicate (p.ptr ());
+ this->ptr_ = ::IR_TypedefDef::_duplicate (p.ptr ());
return *this;
}
-ACE_INLINE IR_SequenceDef_out &
-IR_SequenceDef_out::operator= (IR_SequenceDef_ptr p)
+ACE_INLINE IR_TypedefDef_out &
+IR_TypedefDef_out::operator= (IR_TypedefDef_ptr p)
{
this->ptr_ = p;
return *this;
}
-ACE_INLINE
-IR_SequenceDef_out::operator ::IR_SequenceDef_ptr &() // cast
+ACE_INLINE
+IR_TypedefDef_out::operator ::IR_TypedefDef_ptr &() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_SequenceDef_ptr &
-IR_SequenceDef_out::ptr (void) // ptr
+ACE_INLINE ::IR_TypedefDef_ptr &
+IR_TypedefDef_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_SequenceDef_ptr
-IR_SequenceDef_out::operator-> (void)
+ACE_INLINE ::IR_TypedefDef_ptr
+IR_TypedefDef_out::operator-> (void)
{
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_ArrayDef::IR_ArrayDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ArrayDef::IR_ArrayDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ArrayDef::~IR_ArrayDef (void) // destructor
-{}
-
-
-#if !defined (_IR_ARRAYDEF___VAR_CI_)
-#define _IR_ARRAYDEF___VAR_CI_
-
// *************************************************************
-// Inline operations for class IR_ArrayDef_var
+// Inline operations for class IR_TypeDescription_var
// *************************************************************
ACE_INLINE
-IR_ArrayDef_var::IR_ArrayDef_var (void) // default constructor
- : ptr_ (IR_ArrayDef::_nil ())
+IR_TypeDescription_var::IR_TypeDescription_var (void) // default constructor
+ : ptr_ (0)
{}
ACE_INLINE
-IR_ArrayDef_var::IR_ArrayDef_var (IR_ArrayDef_ptr p)
+IR_TypeDescription_var::IR_TypeDescription_var (IR_TypeDescription *p)
: ptr_ (p)
{}
-ACE_INLINE ::IR_ArrayDef_ptr
-IR_ArrayDef_var::ptr (void) const
+ACE_INLINE
+IR_TypeDescription_var::IR_TypeDescription_var (const ::IR_TypeDescription_var &p) // copy constructor
{
- return this->ptr_;
+ if (p.ptr_)
+ ACE_NEW (this->ptr_, ::IR_TypeDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_ArrayDef_var::IR_ArrayDef_var (const ::IR_ArrayDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_ArrayDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_ArrayDef_var::~IR_ArrayDef_var (void) // destructor
+IR_TypeDescription_var::~IR_TypeDescription_var (void) // destructor
{
- CORBA::release (this->ptr_);
+ delete this->ptr_;
}
-ACE_INLINE IR_ArrayDef_var &
-IR_ArrayDef_var::operator= (IR_ArrayDef_ptr p)
+ACE_INLINE IR_TypeDescription_var &
+IR_TypeDescription_var::operator= (IR_TypeDescription *p)
{
- CORBA::release (this->ptr_);
+ delete this->ptr_;
this->ptr_ = p;
return *this;
}
-ACE_INLINE IR_ArrayDef_var &
-IR_ArrayDef_var::operator= (const ::IR_ArrayDef_var &p)
+ACE_INLINE ::IR_TypeDescription_var &
+IR_TypeDescription_var::operator= (const ::IR_TypeDescription_var &p)
{
if (this != &p)
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ArrayDef::_duplicate (p.ptr ());
+ delete this->ptr_;
+ ACE_NEW_RETURN (this->ptr_, ::IR_TypeDescription (*p.ptr_), *this);
}
return *this;
}
-ACE_INLINE
-IR_ArrayDef_var::operator const ::IR_ArrayDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ArrayDef_var::operator ::IR_ArrayDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ArrayDef_ptr
-IR_ArrayDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ArrayDef_ptr
-IR_ArrayDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ArrayDef_ptr &
-IR_ArrayDef_var::inout (void)
+ACE_INLINE const ::IR_TypeDescription *
+IR_TypeDescription_var::operator-> (void) const
{
return this->ptr_;
}
-ACE_INLINE ::IR_ArrayDef_ptr &
-IR_ArrayDef_var::out (void)
+ACE_INLINE ::IR_TypeDescription *
+IR_TypeDescription_var::operator-> (void)
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ArrayDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_ArrayDef_ptr
-IR_ArrayDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_ArrayDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ArrayDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_ARRAYDEF___OUT_CI_)
-#define _IR_ARRAYDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_ArrayDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_ArrayDef_out::IR_ArrayDef_out (IR_ArrayDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_ArrayDef::_nil ();
-}
-
-ACE_INLINE
-IR_ArrayDef_out::IR_ArrayDef_out (IR_ArrayDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ArrayDef::_nil ();
-}
-
ACE_INLINE
-IR_ArrayDef_out::IR_ArrayDef_out (const ::IR_ArrayDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ArrayDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_ArrayDef_out &
-IR_ArrayDef_out::operator= (const ::IR_ArrayDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ArrayDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ArrayDef_out &
-IR_ArrayDef_out::operator= (const ::IR_ArrayDef_var &p)
-{
- this->ptr_ = ::IR_ArrayDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_ArrayDef_out &
-IR_ArrayDef_out::operator= (IR_ArrayDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_ArrayDef_out::operator ::IR_ArrayDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ArrayDef_ptr &
-IR_ArrayDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ArrayDef_ptr
-IR_ArrayDef_out::operator-> (void)
+IR_TypeDescription_var::operator const ::IR_TypeDescription &() const // cast
{
- return this->ptr_;
+ return *this->ptr_;
}
-
-#endif /* end #if !defined */
-
ACE_INLINE
-IR_ExceptionDef::IR_ExceptionDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ExceptionDef::IR_ExceptionDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ExceptionDef::~IR_ExceptionDef (void) // destructor
-{}
-
-
-#if !defined (_IR_EXCEPTIONDEF___VAR_CI_)
-#define _IR_EXCEPTIONDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_ExceptionDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_ExceptionDef_var::IR_ExceptionDef_var (void) // default constructor
- : ptr_ (IR_ExceptionDef::_nil ())
-{}
-
-ACE_INLINE
-IR_ExceptionDef_var::IR_ExceptionDef_var (IR_ExceptionDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_ExceptionDef_ptr
-IR_ExceptionDef_var::ptr (void) const
+IR_TypeDescription_var::operator ::IR_TypeDescription &() // cast
{
- return this->ptr_;
+ return *this->ptr_;
}
ACE_INLINE
-IR_ExceptionDef_var::IR_ExceptionDef_var (const ::IR_ExceptionDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_ExceptionDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_ExceptionDef_var::~IR_ExceptionDef_var (void) // destructor
+IR_TypeDescription_var::operator ::IR_TypeDescription &() const // cast
{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_ExceptionDef_var &
-IR_ExceptionDef_var::operator= (IR_ExceptionDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_ExceptionDef_var &
-IR_ExceptionDef_var::operator= (const ::IR_ExceptionDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ExceptionDef::_duplicate (p.ptr ());
- }
- return *this;
+ return *this->ptr_;
}
+// variable-size types only
ACE_INLINE
-IR_ExceptionDef_var::operator const ::IR_ExceptionDef_ptr &() const // cast
+IR_TypeDescription_var::operator ::IR_TypeDescription *&() // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_ExceptionDef_var::operator ::IR_ExceptionDef_ptr &() // cast
+ACE_INLINE const ::IR_TypeDescription &
+IR_TypeDescription_var::in (void) const
{
- return this->ptr_;
+ return *this->ptr_;
}
-ACE_INLINE ::IR_ExceptionDef_ptr
-IR_ExceptionDef_var::operator-> (void) const
+ACE_INLINE ::IR_TypeDescription &
+IR_TypeDescription_var::inout (void)
{
- return this->ptr_;
+ return *this->ptr_;
}
-ACE_INLINE ::IR_ExceptionDef_ptr
-IR_ExceptionDef_var::in (void) const
+// mapping for variable size
+ACE_INLINE ::IR_TypeDescription *&
+IR_TypeDescription_var::out (void)
{
+ delete this->ptr_;
+ this->ptr_ = 0;
return this->ptr_;
}
-ACE_INLINE ::IR_ExceptionDef_ptr &
-IR_ExceptionDef_var::inout (void)
+ACE_INLINE ::IR_TypeDescription *
+IR_TypeDescription_var::_retn (void)
{
- return this->ptr_;
+ ::IR_TypeDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
}
-ACE_INLINE ::IR_ExceptionDef_ptr &
-IR_ExceptionDef_var::out (void)
+ACE_INLINE ::IR_TypeDescription *
+IR_TypeDescription_var::ptr (void) const
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ExceptionDef::_nil ();
return this->ptr_;
}
-ACE_INLINE ::IR_ExceptionDef_ptr
-IR_ExceptionDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_ExceptionDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ExceptionDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EXCEPTIONDEF___OUT_CI_)
-#define _IR_EXCEPTIONDEF___OUT_CI_
-
// *************************************************************
-// Inline operations for class IR_ExceptionDef_out
+// Inline operations for class IR_TypeDescription_out
// *************************************************************
ACE_INLINE
-IR_ExceptionDef_out::IR_ExceptionDef_out (IR_ExceptionDef_ptr &p)
+IR_TypeDescription_out::IR_TypeDescription_out (::IR_TypeDescription *&p)
: ptr_ (p)
{
- this->ptr_ = ::IR_ExceptionDef::_nil ();
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_ExceptionDef_out::IR_ExceptionDef_out (IR_ExceptionDef_var &p) // constructor from _var
+IR_TypeDescription_out::IR_TypeDescription_out (IR_TypeDescription_var &p) // constructor from _var
: ptr_ (p.out ())
{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ExceptionDef::_nil ();
+ delete this->ptr_;
+ this->ptr_ = 0;
}
ACE_INLINE
-IR_ExceptionDef_out::IR_ExceptionDef_out (const ::IR_ExceptionDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ExceptionDef_out &, p).ptr_)
+IR_TypeDescription_out::IR_TypeDescription_out (const ::IR_TypeDescription_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (IR_TypeDescription_out&, p).ptr_)
{}
-ACE_INLINE ::IR_ExceptionDef_out &
-IR_ExceptionDef_out::operator= (const ::IR_ExceptionDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ExceptionDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ExceptionDef_out &
-IR_ExceptionDef_out::operator= (const ::IR_ExceptionDef_var &p)
+ACE_INLINE IR_TypeDescription_out &
+IR_TypeDescription_out::operator= (const ::IR_TypeDescription_out &p)
{
- this->ptr_ = ::IR_ExceptionDef::_duplicate (p.ptr ());
+ this->ptr_ = ACE_const_cast (IR_TypeDescription_out&, p).ptr_;
return *this;
}
-ACE_INLINE IR_ExceptionDef_out &
-IR_ExceptionDef_out::operator= (IR_ExceptionDef_ptr p)
+ACE_INLINE IR_TypeDescription_out &
+IR_TypeDescription_out::operator= (IR_TypeDescription *p)
{
this->ptr_ = p;
return *this;
}
-ACE_INLINE
-IR_ExceptionDef_out::operator ::IR_ExceptionDef_ptr &() // cast
+ACE_INLINE
+IR_TypeDescription_out::operator ::IR_TypeDescription *&() // cast
{
return this->ptr_;
}
-ACE_INLINE ::IR_ExceptionDef_ptr &
-IR_ExceptionDef_out::ptr (void) // ptr
+ACE_INLINE ::IR_TypeDescription *&
+IR_TypeDescription_out::ptr (void) // ptr
{
return this->ptr_;
}
-ACE_INLINE ::IR_ExceptionDef_ptr
-IR_ExceptionDef_out::operator-> (void)
+ACE_INLINE ::IR_TypeDescription *
+IR_TypeDescription_out::operator-> (void)
{
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_ExceptionDescription_var
// *************************************************************
@@ -11322,20 +13028,20 @@ IR_ExceptionDescription_var::operator const ::IR_ExceptionDescription &() const
}
ACE_INLINE
-IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() // cast
+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() const // cast
+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ExceptionDescription_var::operator ::IR_ExceptionDescription *&() // cast
+IR_ExceptionDescription_var::operator ::IR_ExceptionDescription *&() // cast
{
return this->ptr_;
}
@@ -11352,7 +13058,7 @@ IR_ExceptionDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ExceptionDescription *&
IR_ExceptionDescription_var::out (void)
{
@@ -11413,7 +13119,7 @@ IR_ExceptionDescription_out::operator= (IR_ExceptionDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ExceptionDescription_out::operator ::IR_ExceptionDescription *&() // cast
{
return this->ptr_;
@@ -11431,65 +13137,61 @@ IR_ExceptionDescription_out::operator-> (void)
return this->ptr_;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_)
-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_
-
+
ACE_INLINE IR_ExceptionDef **
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
{
IR_ExceptionDef **buf = 0;
-
+
ACE_NEW_RETURN (buf, IR_ExceptionDef*[nelems], 0);
-
+
for (CORBA::ULong i = 0; i < nelems; i++)
buf[i] = IR_ExceptionDef::_nil ();
-
+
return buf;
}
-
- ACE_INLINE void
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (IR_ExceptionDef **buffer)
+
+ ACE_INLINE void
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (IR_ExceptionDef **buffer)
{
if (buffer == 0)
return;
delete[] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum)
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum)
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ExceptionDef* *value,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, value, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
: TAO_Unbounded_Base_Sequence (rhs)
{
if (rhs.buffer_ != 0)
{
IR_ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (this->maximum_);
IR_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ExceptionDef::_duplicate (tmp2[i]);
-
+
this->buffer_ = tmp1;
}
else
@@ -11497,17 +13199,17 @@ IR_ExceptionDescription_out::operator-> (void)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef **, this->buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
{
CORBA::release (tmp[i]);
@@ -11521,29 +13223,29 @@ IR_ExceptionDescription_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ExceptionDef **tmp1 = ACE_reinterpret_cast (IR_ExceptionDef **, this->buffer_);
IR_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < rhs.length_; ++i)
tmp1[i] = IR_ExceptionDef::_duplicate (tmp2[i]);
-
+
return *this;
}
-
+
ACE_INLINE TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator[] (CORBA::ULong index) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator[] (CORBA::ULong index) const
// read-write accessor
{
ACE_ASSERT (index < this->maximum_);
IR_ExceptionDef ** const tmp = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
return TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var> (tmp + index, this->release_);
}
-
+
ACE_INLINE IR_ExceptionDef* *
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ExceptionDef **result = 0;
if (orphan == 0)
@@ -11575,21 +13277,14 @@ IR_ExceptionDescription_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_ExceptionDef* *
- _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
}
-
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_EXCEPTIONDEFSEQ_CI_)
-#define _IR_EXCEPTIONDEFSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ExceptionDefSeq_var
@@ -11651,27 +13346,27 @@ IR_ExceptionDefSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ExceptionDefSeq_var::operator const ::IR_ExceptionDefSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() // cast
+ACE_INLINE
+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() const // cast
+ACE_INLINE
+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq *&() // cast
+IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq *&() // cast
{
return this->ptr_;
}
@@ -11694,7 +13389,7 @@ IR_ExceptionDefSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ExceptionDefSeq *&
IR_ExceptionDefSeq_var::out (void)
{
@@ -11755,7 +13450,7 @@ IR_ExceptionDefSeq_out::operator= (IR_ExceptionDefSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ExceptionDefSeq_out::operator ::IR_ExceptionDefSeq *&() // cast
{
return this->ptr_;
@@ -11779,53 +13474,46 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_ExceptionDescription *
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_ExceptionDescription *retval = 0;
ACE_NEW_RETURN (retval, IR_ExceptionDescription[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (IR_ExceptionDescription *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (IR_ExceptionDescription *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ExceptionDescription *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -11833,10 +13521,10 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
{
IR_ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (this->maximum_);
IR_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -11844,14 +13532,14 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -11864,41 +13552,41 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ExceptionDescription *tmp1 = ACE_reinterpret_cast (IR_ExceptionDescription *, this->buffer_);
IR_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_ExceptionDescription &
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_ExceptionDescription* tmp = ACE_reinterpret_cast(IR_ExceptionDescription*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_ExceptionDescription &
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_ExceptionDescription * const tmp = ACE_reinterpret_cast (IR_ExceptionDescription* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_ExceptionDescription *
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ExceptionDescription *result = 0;
if (orphan == 0)
@@ -11930,15 +13618,15 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_ExceptionDescription *
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ExceptionDescription * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_ExceptionDescription *data,
CORBA::Boolean release)
@@ -11953,14 +13641,8 @@ IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_EXCDESCRIPTIONSEQ_CI_)
-#define _IR_EXCDESCRIPTIONSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ExcDescriptionSeq_var
@@ -12022,27 +13704,27 @@ IR_ExcDescriptionSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ExcDescriptionSeq_var::operator const ::IR_ExcDescriptionSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() // cast
+ACE_INLINE
+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() const // cast
+ACE_INLINE
+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq *&() // cast
+IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq *&() // cast
{
return this->ptr_;
}
@@ -12053,6 +13735,12 @@ IR_ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_ExceptionDescription &
+IR_ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_ExceptionDescription &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_ExcDescriptionSeq &
IR_ExcDescriptionSeq_var::in (void) const
{
@@ -12065,7 +13753,7 @@ IR_ExcDescriptionSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ExcDescriptionSeq *&
IR_ExcDescriptionSeq_var::out (void)
{
@@ -12126,7 +13814,7 @@ IR_ExcDescriptionSeq_out::operator= (IR_ExcDescriptionSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ExcDescriptionSeq_out::operator ::IR_ExcDescriptionSeq *&() // cast
{
return this->ptr_;
@@ -12150,25 +13838,16 @@ IR_ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
ACE_INLINE
-IR_AttributeDef::IR_AttributeDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_AttributeDef::IR_AttributeDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_AttributeDef::~IR_AttributeDef (void) // destructor
-{}
-
-
-#if !defined (_IR_ATTRIBUTEDEF___VAR_CI_)
-#define _IR_ATTRIBUTEDEF___VAR_CI_
+IR_AttributeDef::IR_AttributeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
// *************************************************************
// Inline operations for class IR_AttributeDef_var
@@ -12179,11 +13858,6 @@ IR_AttributeDef_var::IR_AttributeDef_var (void) // default constructor
: ptr_ (IR_AttributeDef::_nil ())
{}
-ACE_INLINE
-IR_AttributeDef_var::IR_AttributeDef_var (IR_AttributeDef_ptr p)
- : ptr_ (p)
-{}
-
ACE_INLINE ::IR_AttributeDef_ptr
IR_AttributeDef_var::ptr (void) const
{
@@ -12221,14 +13895,14 @@ IR_AttributeDef_var::operator= (const ::IR_AttributeDef_var &p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_AttributeDef_var::operator const ::IR_AttributeDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_AttributeDef_var::operator ::IR_AttributeDef_ptr &() // cast
+ACE_INLINE
+IR_AttributeDef_var::operator ::IR_AttributeDef_ptr &() // cast
{
return this->ptr_;
}
@@ -12268,13 +13942,6 @@ IR_AttributeDef_var::_retn (void)
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_ATTRIBUTEDEF___OUT_CI_)
-#define _IR_ATTRIBUTEDEF___OUT_CI_
-
// *************************************************************
// Inline operations for class IR_AttributeDef_out
// *************************************************************
@@ -12320,7 +13987,7 @@ IR_AttributeDef_out::operator= (IR_AttributeDef_ptr p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_AttributeDef_out::operator ::IR_AttributeDef_ptr &() // cast
{
return this->ptr_;
@@ -12338,9 +14005,6 @@ IR_AttributeDef_out::operator-> (void)
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_AttributeDescription_var
// *************************************************************
@@ -12408,20 +14072,20 @@ IR_AttributeDescription_var::operator const ::IR_AttributeDescription &() const
}
ACE_INLINE
-IR_AttributeDescription_var::operator ::IR_AttributeDescription &() // cast
+IR_AttributeDescription_var::operator ::IR_AttributeDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_AttributeDescription_var::operator ::IR_AttributeDescription &() const // cast
+IR_AttributeDescription_var::operator ::IR_AttributeDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_AttributeDescription_var::operator ::IR_AttributeDescription *&() // cast
+IR_AttributeDescription_var::operator ::IR_AttributeDescription *&() // cast
{
return this->ptr_;
}
@@ -12438,7 +14102,7 @@ IR_AttributeDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_AttributeDescription *&
IR_AttributeDescription_var::out (void)
{
@@ -12499,7 +14163,7 @@ IR_AttributeDescription_out::operator= (IR_AttributeDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_AttributeDescription_out::operator ::IR_AttributeDescription *&() // cast
{
return this->ptr_;
@@ -12584,20 +14248,20 @@ IR_ParameterDescription_var::operator const ::IR_ParameterDescription &() const
}
ACE_INLINE
-IR_ParameterDescription_var::operator ::IR_ParameterDescription &() // cast
+IR_ParameterDescription_var::operator ::IR_ParameterDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_ParameterDescription_var::operator ::IR_ParameterDescription &() const // cast
+IR_ParameterDescription_var::operator ::IR_ParameterDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ParameterDescription_var::operator ::IR_ParameterDescription *&() // cast
+IR_ParameterDescription_var::operator ::IR_ParameterDescription *&() // cast
{
return this->ptr_;
}
@@ -12614,7 +14278,7 @@ IR_ParameterDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ParameterDescription *&
IR_ParameterDescription_var::out (void)
{
@@ -12675,7 +14339,7 @@ IR_ParameterDescription_out::operator= (IR_ParameterDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ParameterDescription_out::operator ::IR_ParameterDescription *&() // cast
{
return this->ptr_;
@@ -12693,50 +14357,46 @@ IR_ParameterDescription_out::operator-> (void)
return this->ptr_;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_ParameterDescription *
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_ParameterDescription *retval = 0;
ACE_NEW_RETURN (retval, IR_ParameterDescription[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (IR_ParameterDescription *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (IR_ParameterDescription *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ParameterDescription *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -12744,10 +14404,10 @@ IR_ParameterDescription_out::operator-> (void)
{
IR_ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (this->maximum_);
IR_ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -12755,14 +14415,14 @@ IR_ParameterDescription_out::operator-> (void)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq &
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -12775,41 +14435,41 @@ IR_ParameterDescription_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ParameterDescription *tmp1 = ACE_reinterpret_cast (IR_ParameterDescription *, this->buffer_);
IR_ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_ParameterDescription &
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_ParameterDescription* tmp = ACE_reinterpret_cast(IR_ParameterDescription*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_ParameterDescription &
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_ParameterDescription * const tmp = ACE_reinterpret_cast (IR_ParameterDescription* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_ParameterDescription *
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ParameterDescription *result = 0;
if (orphan == 0)
@@ -12841,15 +14501,15 @@ IR_ParameterDescription_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_ParameterDescription *
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ParameterDescription * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_ParameterDescription *data,
CORBA::Boolean release)
@@ -12864,14 +14524,8 @@ IR_ParameterDescription_out::operator-> (void)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PARDESCRIPTIONSEQ_CI_)
-#define _IR_PARDESCRIPTIONSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ParDescriptionSeq_var
@@ -12933,27 +14587,27 @@ IR_ParDescriptionSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ParDescriptionSeq_var::operator const ::IR_ParDescriptionSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() // cast
+ACE_INLINE
+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() const // cast
+ACE_INLINE
+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq *&() // cast
+IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq *&() // cast
{
return this->ptr_;
}
@@ -12964,6 +14618,12 @@ IR_ParDescriptionSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_ParameterDescription &
+IR_ParDescriptionSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_ParameterDescription &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_ParDescriptionSeq &
IR_ParDescriptionSeq_var::in (void) const
{
@@ -12976,7 +14636,7 @@ IR_ParDescriptionSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ParDescriptionSeq *&
IR_ParDescriptionSeq_var::out (void)
{
@@ -13037,7 +14697,7 @@ IR_ParDescriptionSeq_out::operator= (IR_ParDescriptionSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ParDescriptionSeq_out::operator ::IR_ParDescriptionSeq *&() // cast
{
return this->ptr_;
@@ -13061,13 +14721,6 @@ IR_ParDescriptionSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONTEXTIDSEQ_CI_)
-#define _IR_CONTEXTIDSEQ_CI_
-
// *************************************************************
// Inline operations for class IR_ContextIdSeq_var
// *************************************************************
@@ -13128,27 +14781,27 @@ IR_ContextIdSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ContextIdSeq_var::operator const ::IR_ContextIdSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() // cast
+ACE_INLINE
+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() const // cast
+ACE_INLINE
+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ContextIdSeq_var::operator ::IR_ContextIdSeq *&() // cast
+IR_ContextIdSeq_var::operator ::IR_ContextIdSeq *&() // cast
{
return this->ptr_;
}
@@ -13171,7 +14824,7 @@ IR_ContextIdSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ContextIdSeq *&
IR_ContextIdSeq_var::out (void)
{
@@ -13232,7 +14885,7 @@ IR_ContextIdSeq_out::operator= (IR_ContextIdSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ContextIdSeq_out::operator ::IR_ContextIdSeq *&() // cast
{
return this->ptr_;
@@ -13256,25 +14909,16 @@ IR_ContextIdSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
ACE_INLINE
-IR_OperationDef::IR_OperationDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_OperationDef::IR_OperationDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_OperationDef::~IR_OperationDef (void) // destructor
-{}
-
-
-#if !defined (_IR_OPERATIONDEF___VAR_CI_)
-#define _IR_OPERATIONDEF___VAR_CI_
+IR_OperationDef::IR_OperationDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
// *************************************************************
// Inline operations for class IR_OperationDef_var
@@ -13285,11 +14929,6 @@ IR_OperationDef_var::IR_OperationDef_var (void) // default constructor
: ptr_ (IR_OperationDef::_nil ())
{}
-ACE_INLINE
-IR_OperationDef_var::IR_OperationDef_var (IR_OperationDef_ptr p)
- : ptr_ (p)
-{}
-
ACE_INLINE ::IR_OperationDef_ptr
IR_OperationDef_var::ptr (void) const
{
@@ -13327,14 +14966,14 @@ IR_OperationDef_var::operator= (const ::IR_OperationDef_var &p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_OperationDef_var::operator const ::IR_OperationDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_OperationDef_var::operator ::IR_OperationDef_ptr &() // cast
+ACE_INLINE
+IR_OperationDef_var::operator ::IR_OperationDef_ptr &() // cast
{
return this->ptr_;
}
@@ -13374,13 +15013,6 @@ IR_OperationDef_var::_retn (void)
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_OPERATIONDEF___OUT_CI_)
-#define _IR_OPERATIONDEF___OUT_CI_
-
// *************************************************************
// Inline operations for class IR_OperationDef_out
// *************************************************************
@@ -13426,7 +15058,7 @@ IR_OperationDef_out::operator= (IR_OperationDef_ptr p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_OperationDef_out::operator ::IR_OperationDef_ptr &() // cast
{
return this->ptr_;
@@ -13444,9 +15076,6 @@ IR_OperationDef_out::operator-> (void)
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_OperationDescription_var
// *************************************************************
@@ -13514,20 +15143,20 @@ IR_OperationDescription_var::operator const ::IR_OperationDescription &() const
}
ACE_INLINE
-IR_OperationDescription_var::operator ::IR_OperationDescription &() // cast
+IR_OperationDescription_var::operator ::IR_OperationDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_OperationDescription_var::operator ::IR_OperationDescription &() const // cast
+IR_OperationDescription_var::operator ::IR_OperationDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_OperationDescription_var::operator ::IR_OperationDescription *&() // cast
+IR_OperationDescription_var::operator ::IR_OperationDescription *&() // cast
{
return this->ptr_;
}
@@ -13544,7 +15173,7 @@ IR_OperationDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_OperationDescription *&
IR_OperationDescription_var::out (void)
{
@@ -13605,7 +15234,7 @@ IR_OperationDescription_out::operator= (IR_OperationDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_OperationDescription_out::operator ::IR_OperationDescription *&() // cast
{
return this->ptr_;
@@ -13623,10 +15252,6 @@ IR_OperationDescription_out::operator-> (void)
return this->ptr_;
}
-
-#if !defined (_IR_REPOSITORYIDSEQ_CI_)
-#define _IR_REPOSITORYIDSEQ_CI_
-
// *************************************************************
// Inline operations for class IR_RepositoryIdSeq_var
// *************************************************************
@@ -13687,27 +15312,27 @@ IR_RepositoryIdSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_RepositoryIdSeq_var::operator const ::IR_RepositoryIdSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() // cast
+ACE_INLINE
+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() const // cast
+ACE_INLINE
+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq *&() // cast
+IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq *&() // cast
{
return this->ptr_;
}
@@ -13730,7 +15355,7 @@ IR_RepositoryIdSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_RepositoryIdSeq *&
IR_RepositoryIdSeq_var::out (void)
{
@@ -13791,7 +15416,7 @@ IR_RepositoryIdSeq_out::operator= (IR_RepositoryIdSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_RepositoryIdSeq_out::operator ::IR_RepositoryIdSeq *&() // cast
{
return this->ptr_;
@@ -13815,53 +15440,46 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_OperationDescription *
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_OperationDescription *retval = 0;
ACE_NEW_RETURN (retval, IR_OperationDescription[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (IR_OperationDescription *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (IR_OperationDescription *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_OperationDescription *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -13869,10 +15487,10 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
{
IR_OperationDescription *tmp1 = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (this->maximum_);
IR_OperationDescription * const tmp2 = ACE_reinterpret_cast (IR_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -13880,14 +15498,14 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq &
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -13900,41 +15518,41 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_OperationDescription *tmp1 = ACE_reinterpret_cast (IR_OperationDescription *, this->buffer_);
IR_OperationDescription * const tmp2 = ACE_reinterpret_cast (IR_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_OperationDescription &
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_OperationDescription* tmp = ACE_reinterpret_cast(IR_OperationDescription*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_OperationDescription &
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_OperationDescription * const tmp = ACE_reinterpret_cast (IR_OperationDescription* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_OperationDescription *
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
{
IR_OperationDescription *result = 0;
if (orphan == 0)
@@ -13966,15 +15584,15 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_OperationDescription *
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_OperationDescription * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_OperationDescription *data,
CORBA::Boolean release)
@@ -13989,14 +15607,8 @@ IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_OPDESCRIPTIONSEQ_CI_)
-#define _IR_OPDESCRIPTIONSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_OpDescriptionSeq_var
@@ -14058,27 +15670,27 @@ IR_OpDescriptionSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_OpDescriptionSeq_var::operator const ::IR_OpDescriptionSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() // cast
+ACE_INLINE
+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() const // cast
+ACE_INLINE
+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq *&() // cast
+IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq *&() // cast
{
return this->ptr_;
}
@@ -14089,6 +15701,12 @@ IR_OpDescriptionSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_OperationDescription &
+IR_OpDescriptionSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_OperationDescription &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_OpDescriptionSeq &
IR_OpDescriptionSeq_var::in (void) const
{
@@ -14101,7 +15719,7 @@ IR_OpDescriptionSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_OpDescriptionSeq *&
IR_OpDescriptionSeq_var::out (void)
{
@@ -14162,7 +15780,7 @@ IR_OpDescriptionSeq_out::operator= (IR_OpDescriptionSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_OpDescriptionSeq_out::operator ::IR_OpDescriptionSeq *&() // cast
{
return this->ptr_;
@@ -14186,53 +15804,46 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_AttributeDescription *
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_AttributeDescription *retval = 0;
ACE_NEW_RETURN (retval, IR_AttributeDescription[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (IR_AttributeDescription *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (IR_AttributeDescription *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_AttributeDescription *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -14240,10 +15851,10 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
{
IR_AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (this->maximum_);
IR_AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -14251,14 +15862,14 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -14271,41 +15882,41 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_AttributeDescription *tmp1 = ACE_reinterpret_cast (IR_AttributeDescription *, this->buffer_);
IR_AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_AttributeDescription &
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_AttributeDescription* tmp = ACE_reinterpret_cast(IR_AttributeDescription*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_AttributeDescription &
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_AttributeDescription * const tmp = ACE_reinterpret_cast (IR_AttributeDescription* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_AttributeDescription *
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
{
IR_AttributeDescription *result = 0;
if (orphan == 0)
@@ -14337,15 +15948,15 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_AttributeDescription *
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_AttributeDescription * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_AttributeDescription *data,
CORBA::Boolean release)
@@ -14360,14 +15971,8 @@ IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_ATTRDESCRIPTIONSEQ_CI_)
-#define _IR_ATTRDESCRIPTIONSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_AttrDescriptionSeq_var
@@ -14429,27 +16034,27 @@ IR_AttrDescriptionSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_AttrDescriptionSeq_var::operator const ::IR_AttrDescriptionSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() // cast
+ACE_INLINE
+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() const // cast
+ACE_INLINE
+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq *&() // cast
+IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq *&() // cast
{
return this->ptr_;
}
@@ -14460,6 +16065,12 @@ IR_AttrDescriptionSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_AttributeDescription &
+IR_AttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_AttributeDescription &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_AttrDescriptionSeq &
IR_AttrDescriptionSeq_var::in (void) const
{
@@ -14472,7 +16083,7 @@ IR_AttrDescriptionSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_AttrDescriptionSeq *&
IR_AttrDescriptionSeq_var::out (void)
{
@@ -14533,7 +16144,7 @@ IR_AttrDescriptionSeq_out::operator= (IR_AttrDescriptionSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_AttrDescriptionSeq_out::operator ::IR_AttrDescriptionSeq *&() // cast
{
return this->ptr_;
@@ -14557,197 +16168,6 @@ IR_AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_InterfaceDef::IR_InterfaceDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_InterfaceDef::IR_InterfaceDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_InterfaceDef::~IR_InterfaceDef (void) // destructor
-{}
-
-
-#if !defined (_IR_INTERFACEDEF___VAR_CI_)
-#define _IR_INTERFACEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_InterfaceDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_InterfaceDef_var::IR_InterfaceDef_var (void) // default constructor
- : ptr_ (IR_InterfaceDef::_nil ())
-{}
-
-ACE_INLINE
-IR_InterfaceDef_var::IR_InterfaceDef_var (IR_InterfaceDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_InterfaceDef_ptr
-IR_InterfaceDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_InterfaceDef_var::IR_InterfaceDef_var (const ::IR_InterfaceDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_InterfaceDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_InterfaceDef_var::~IR_InterfaceDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_InterfaceDef_var &
-IR_InterfaceDef_var::operator= (IR_InterfaceDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_InterfaceDef_var &
-IR_InterfaceDef_var::operator= (const ::IR_InterfaceDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_InterfaceDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_InterfaceDef_var::operator const ::IR_InterfaceDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_InterfaceDef_var::operator ::IR_InterfaceDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_InterfaceDef_ptr
-IR_InterfaceDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_InterfaceDef_ptr
-IR_InterfaceDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_InterfaceDef_ptr &
-IR_InterfaceDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_InterfaceDef_ptr &
-IR_InterfaceDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_InterfaceDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_InterfaceDef_ptr
-IR_InterfaceDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_InterfaceDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_InterfaceDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_INTERFACEDEF___OUT_CI_)
-#define _IR_INTERFACEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_InterfaceDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_InterfaceDef_out::IR_InterfaceDef_out (IR_InterfaceDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_InterfaceDef::_nil ();
-}
-
-ACE_INLINE
-IR_InterfaceDef_out::IR_InterfaceDef_out (IR_InterfaceDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_InterfaceDef::_nil ();
-}
-
-ACE_INLINE
-IR_InterfaceDef_out::IR_InterfaceDef_out (const ::IR_InterfaceDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_InterfaceDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_InterfaceDef_out &
-IR_InterfaceDef_out::operator= (const ::IR_InterfaceDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_InterfaceDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_InterfaceDef_out &
-IR_InterfaceDef_out::operator= (const ::IR_InterfaceDef_var &p)
-{
- this->ptr_ = ::IR_InterfaceDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_InterfaceDef_out &
-IR_InterfaceDef_out::operator= (IR_InterfaceDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_InterfaceDef_out::operator ::IR_InterfaceDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_InterfaceDef_ptr &
-IR_InterfaceDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_InterfaceDef_ptr
-IR_InterfaceDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_InterfaceDescription_var
// *************************************************************
@@ -14815,20 +16235,20 @@ IR_InterfaceDescription_var::operator const ::IR_InterfaceDescription &() const
}
ACE_INLINE
-IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() // cast
+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() const // cast
+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_InterfaceDescription_var::operator ::IR_InterfaceDescription *&() // cast
+IR_InterfaceDescription_var::operator ::IR_InterfaceDescription *&() // cast
{
return this->ptr_;
}
@@ -14845,7 +16265,7 @@ IR_InterfaceDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_InterfaceDescription *&
IR_InterfaceDescription_var::out (void)
{
@@ -14906,7 +16326,7 @@ IR_InterfaceDescription_out::operator= (IR_InterfaceDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_InterfaceDescription_out::operator ::IR_InterfaceDescription *&() // cast
{
return this->ptr_;
@@ -14991,20 +16411,20 @@ IR_ValueMember_var::operator const ::IR_ValueMember &() const // cast
}
ACE_INLINE
-IR_ValueMember_var::operator ::IR_ValueMember &() // cast
+IR_ValueMember_var::operator ::IR_ValueMember &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_ValueMember_var::operator ::IR_ValueMember &() const // cast
+IR_ValueMember_var::operator ::IR_ValueMember &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ValueMember_var::operator ::IR_ValueMember *&() // cast
+IR_ValueMember_var::operator ::IR_ValueMember *&() // cast
{
return this->ptr_;
}
@@ -15021,7 +16441,7 @@ IR_ValueMember_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ValueMember *&
IR_ValueMember_var::out (void)
{
@@ -15082,7 +16502,7 @@ IR_ValueMember_out::operator= (IR_ValueMember *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ValueMember_out::operator ::IR_ValueMember *&() // cast
{
return this->ptr_;
@@ -15100,50 +16520,46 @@ IR_ValueMember_out::operator-> (void)
return this->ptr_;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_ValueMember *
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_ValueMember *retval = 0;
ACE_NEW_RETURN (retval, IR_ValueMember[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (IR_ValueMember *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (IR_ValueMember *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ValueMember *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -15151,10 +16567,10 @@ IR_ValueMember_out::operator-> (void)
{
IR_ValueMember *tmp1 = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (this->maximum_);
IR_ValueMember * const tmp2 = ACE_reinterpret_cast (IR_ValueMember * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -15162,14 +16578,14 @@ IR_ValueMember_out::operator-> (void)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_ValueMemberSeq &
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq &
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -15182,41 +16598,41 @@ IR_ValueMember_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ValueMember *tmp1 = ACE_reinterpret_cast (IR_ValueMember *, this->buffer_);
IR_ValueMember * const tmp2 = ACE_reinterpret_cast (IR_ValueMember * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_ValueMember &
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_ValueMember* tmp = ACE_reinterpret_cast(IR_ValueMember*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_ValueMember &
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_ValueMember * const tmp = ACE_reinterpret_cast (IR_ValueMember* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_ValueMember *
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ValueMember *result = 0;
if (orphan == 0)
@@ -15248,15 +16664,15 @@ IR_ValueMember_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_ValueMember *
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ValueMember * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_ValueMemberSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_ValueMember *data,
CORBA::Boolean release)
@@ -15271,14 +16687,8 @@ IR_ValueMember_out::operator-> (void)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_VALUEMEMBERSEQ_CI_)
-#define _IR_VALUEMEMBERSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ValueMemberSeq_var
@@ -15340,27 +16750,27 @@ IR_ValueMemberSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ValueMemberSeq_var::operator const ::IR_ValueMemberSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() // cast
+ACE_INLINE
+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() const // cast
+ACE_INLINE
+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq *&() // cast
+IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq *&() // cast
{
return this->ptr_;
}
@@ -15371,6 +16781,12 @@ IR_ValueMemberSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_ValueMember &
+IR_ValueMemberSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_ValueMember &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_ValueMemberSeq &
IR_ValueMemberSeq_var::in (void) const
{
@@ -15383,7 +16799,7 @@ IR_ValueMemberSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ValueMemberSeq *&
IR_ValueMemberSeq_var::out (void)
{
@@ -15444,7 +16860,7 @@ IR_ValueMemberSeq_out::operator= (IR_ValueMemberSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ValueMemberSeq_out::operator ::IR_ValueMemberSeq *&() // cast
{
return this->ptr_;
@@ -15468,25 +16884,16 @@ IR_ValueMemberSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_ValueMemberDef::IR_ValueMemberDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ValueMemberDef::IR_ValueMemberDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
ACE_INLINE
-IR_ValueMemberDef::~IR_ValueMemberDef (void) // destructor
-{}
-
-
-#if !defined (_IR_VALUEMEMBERDEF___VAR_CI_)
-#define _IR_VALUEMEMBERDEF___VAR_CI_
+IR_ValueMemberDef::IR_ValueMemberDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+ )
+ : CORBA_Object (objref, _tao_collocated, servant)
+{
+ this->_tao_setup_collocation (_tao_collocated);
+}
// *************************************************************
// Inline operations for class IR_ValueMemberDef_var
@@ -15497,11 +16904,6 @@ IR_ValueMemberDef_var::IR_ValueMemberDef_var (void) // default constructor
: ptr_ (IR_ValueMemberDef::_nil ())
{}
-ACE_INLINE
-IR_ValueMemberDef_var::IR_ValueMemberDef_var (IR_ValueMemberDef_ptr p)
- : ptr_ (p)
-{}
-
ACE_INLINE ::IR_ValueMemberDef_ptr
IR_ValueMemberDef_var::ptr (void) const
{
@@ -15539,14 +16941,14 @@ IR_ValueMemberDef_var::operator= (const ::IR_ValueMemberDef_var &p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ValueMemberDef_var::operator const ::IR_ValueMemberDef_ptr &() const // cast
{
return this->ptr_;
}
-ACE_INLINE
-IR_ValueMemberDef_var::operator ::IR_ValueMemberDef_ptr &() // cast
+ACE_INLINE
+IR_ValueMemberDef_var::operator ::IR_ValueMemberDef_ptr &() // cast
{
return this->ptr_;
}
@@ -15586,13 +16988,6 @@ IR_ValueMemberDef_var::_retn (void)
return val;
}
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_VALUEMEMBERDEF___OUT_CI_)
-#define _IR_VALUEMEMBERDEF___OUT_CI_
-
// *************************************************************
// Inline operations for class IR_ValueMemberDef_out
// *************************************************************
@@ -15638,7 +17033,7 @@ IR_ValueMemberDef_out::operator= (IR_ValueMemberDef_ptr p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ValueMemberDef_out::operator ::IR_ValueMemberDef_ptr &() // cast
{
return this->ptr_;
@@ -15656,197 +17051,6 @@ IR_ValueMemberDef_out::operator-> (void)
return this->ptr_;
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_ValueDef::IR_ValueDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ValueDef::IR_ValueDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ValueDef::~IR_ValueDef (void) // destructor
-{}
-
-
-#if !defined (_IR_VALUEDEF___VAR_CI_)
-#define _IR_VALUEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_ValueDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_ValueDef_var::IR_ValueDef_var (void) // default constructor
- : ptr_ (IR_ValueDef::_nil ())
-{}
-
-ACE_INLINE
-IR_ValueDef_var::IR_ValueDef_var (IR_ValueDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_ValueDef_ptr
-IR_ValueDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ValueDef_var::IR_ValueDef_var (const ::IR_ValueDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_ValueDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_ValueDef_var::~IR_ValueDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_ValueDef_var &
-IR_ValueDef_var::operator= (IR_ValueDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_ValueDef_var &
-IR_ValueDef_var::operator= (const ::IR_ValueDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ValueDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_ValueDef_var::operator const ::IR_ValueDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ValueDef_var::operator ::IR_ValueDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueDef_ptr
-IR_ValueDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueDef_ptr
-IR_ValueDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueDef_ptr &
-IR_ValueDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueDef_ptr &
-IR_ValueDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ValueDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueDef_ptr
-IR_ValueDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_ValueDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ValueDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_VALUEDEF___OUT_CI_)
-#define _IR_VALUEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_ValueDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_ValueDef_out::IR_ValueDef_out (IR_ValueDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_ValueDef::_nil ();
-}
-
-ACE_INLINE
-IR_ValueDef_out::IR_ValueDef_out (IR_ValueDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ValueDef::_nil ();
-}
-
-ACE_INLINE
-IR_ValueDef_out::IR_ValueDef_out (const ::IR_ValueDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ValueDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_ValueDef_out &
-IR_ValueDef_out::operator= (const ::IR_ValueDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ValueDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ValueDef_out &
-IR_ValueDef_out::operator= (const ::IR_ValueDef_var &p)
-{
- this->ptr_ = ::IR_ValueDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_ValueDef_out &
-IR_ValueDef_out::operator= (IR_ValueDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_ValueDef_out::operator ::IR_ValueDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueDef_ptr &
-IR_ValueDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueDef_ptr
-IR_ValueDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_ValueDescription_var
// *************************************************************
@@ -15914,20 +17118,20 @@ IR_ValueDescription_var::operator const ::IR_ValueDescription &() const // cast
}
ACE_INLINE
-IR_ValueDescription_var::operator ::IR_ValueDescription &() // cast
+IR_ValueDescription_var::operator ::IR_ValueDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_ValueDescription_var::operator ::IR_ValueDescription &() const // cast
+IR_ValueDescription_var::operator ::IR_ValueDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ValueDescription_var::operator ::IR_ValueDescription *&() // cast
+IR_ValueDescription_var::operator ::IR_ValueDescription *&() // cast
{
return this->ptr_;
}
@@ -15944,7 +17148,7 @@ IR_ValueDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ValueDescription *&
IR_ValueDescription_var::out (void)
{
@@ -16005,7 +17209,7 @@ IR_ValueDescription_out::operator= (IR_ValueDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ValueDescription_out::operator ::IR_ValueDescription *&() // cast
{
return this->ptr_;
@@ -16023,382 +17227,6 @@ IR_ValueDescription_out::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
-IR_ValueBoxDef::IR_ValueBoxDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ValueBoxDef::IR_ValueBoxDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ValueBoxDef::~IR_ValueBoxDef (void) // destructor
-{}
-
-
-#if !defined (_IR_VALUEBOXDEF___VAR_CI_)
-#define _IR_VALUEBOXDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_ValueBoxDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_ValueBoxDef_var::IR_ValueBoxDef_var (void) // default constructor
- : ptr_ (IR_ValueBoxDef::_nil ())
-{}
-
-ACE_INLINE
-IR_ValueBoxDef_var::IR_ValueBoxDef_var (IR_ValueBoxDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_ValueBoxDef_ptr
-IR_ValueBoxDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ValueBoxDef_var::IR_ValueBoxDef_var (const ::IR_ValueBoxDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_ValueBoxDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_ValueBoxDef_var::~IR_ValueBoxDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_ValueBoxDef_var &
-IR_ValueBoxDef_var::operator= (IR_ValueBoxDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_ValueBoxDef_var &
-IR_ValueBoxDef_var::operator= (const ::IR_ValueBoxDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ValueBoxDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_ValueBoxDef_var::operator const ::IR_ValueBoxDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ValueBoxDef_var::operator ::IR_ValueBoxDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueBoxDef_ptr
-IR_ValueBoxDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueBoxDef_ptr
-IR_ValueBoxDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueBoxDef_ptr &
-IR_ValueBoxDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueBoxDef_ptr &
-IR_ValueBoxDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ValueBoxDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueBoxDef_ptr
-IR_ValueBoxDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_ValueBoxDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ValueBoxDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_VALUEBOXDEF___OUT_CI_)
-#define _IR_VALUEBOXDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_ValueBoxDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_ValueBoxDef_out::IR_ValueBoxDef_out (IR_ValueBoxDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_ValueBoxDef::_nil ();
-}
-
-ACE_INLINE
-IR_ValueBoxDef_out::IR_ValueBoxDef_out (IR_ValueBoxDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ValueBoxDef::_nil ();
-}
-
-ACE_INLINE
-IR_ValueBoxDef_out::IR_ValueBoxDef_out (const ::IR_ValueBoxDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ValueBoxDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_ValueBoxDef_out &
-IR_ValueBoxDef_out::operator= (const ::IR_ValueBoxDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ValueBoxDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ValueBoxDef_out &
-IR_ValueBoxDef_out::operator= (const ::IR_ValueBoxDef_var &p)
-{
- this->ptr_ = ::IR_ValueBoxDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_ValueBoxDef_out &
-IR_ValueBoxDef_out::operator= (IR_ValueBoxDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_ValueBoxDef_out::operator ::IR_ValueBoxDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueBoxDef_ptr &
-IR_ValueBoxDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ValueBoxDef_ptr
-IR_ValueBoxDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_ProvidesDef::IR_ProvidesDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ProvidesDef::IR_ProvidesDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ProvidesDef::~IR_ProvidesDef (void) // destructor
-{}
-
-
-#if !defined (_IR_PROVIDESDEF___VAR_CI_)
-#define _IR_PROVIDESDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_ProvidesDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_ProvidesDef_var::IR_ProvidesDef_var (void) // default constructor
- : ptr_ (IR_ProvidesDef::_nil ())
-{}
-
-ACE_INLINE
-IR_ProvidesDef_var::IR_ProvidesDef_var (IR_ProvidesDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_ProvidesDef_ptr
-IR_ProvidesDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ProvidesDef_var::IR_ProvidesDef_var (const ::IR_ProvidesDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_ProvidesDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_ProvidesDef_var::~IR_ProvidesDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_ProvidesDef_var &
-IR_ProvidesDef_var::operator= (IR_ProvidesDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_ProvidesDef_var &
-IR_ProvidesDef_var::operator= (const ::IR_ProvidesDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ProvidesDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_ProvidesDef_var::operator const ::IR_ProvidesDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ProvidesDef_var::operator ::IR_ProvidesDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ProvidesDef_ptr
-IR_ProvidesDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ProvidesDef_ptr
-IR_ProvidesDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ProvidesDef_ptr &
-IR_ProvidesDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ProvidesDef_ptr &
-IR_ProvidesDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ProvidesDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ProvidesDef_ptr
-IR_ProvidesDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_ProvidesDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ProvidesDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PROVIDESDEF___OUT_CI_)
-#define _IR_PROVIDESDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_ProvidesDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_ProvidesDef_out::IR_ProvidesDef_out (IR_ProvidesDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_ProvidesDef::_nil ();
-}
-
-ACE_INLINE
-IR_ProvidesDef_out::IR_ProvidesDef_out (IR_ProvidesDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ProvidesDef::_nil ();
-}
-
-ACE_INLINE
-IR_ProvidesDef_out::IR_ProvidesDef_out (const ::IR_ProvidesDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ProvidesDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_ProvidesDef_out &
-IR_ProvidesDef_out::operator= (const ::IR_ProvidesDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ProvidesDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ProvidesDef_out &
-IR_ProvidesDef_out::operator= (const ::IR_ProvidesDef_var &p)
-{
- this->ptr_ = ::IR_ProvidesDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_ProvidesDef_out &
-IR_ProvidesDef_out::operator= (IR_ProvidesDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_ProvidesDef_out::operator ::IR_ProvidesDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ProvidesDef_ptr &
-IR_ProvidesDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ProvidesDef_ptr
-IR_ProvidesDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_ProvidesDescription_var
// *************************************************************
@@ -16466,20 +17294,20 @@ IR_ProvidesDescription_var::operator const ::IR_ProvidesDescription &() const //
}
ACE_INLINE
-IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() // cast
+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() const // cast
+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ProvidesDescription_var::operator ::IR_ProvidesDescription *&() // cast
+IR_ProvidesDescription_var::operator ::IR_ProvidesDescription *&() // cast
{
return this->ptr_;
}
@@ -16496,7 +17324,7 @@ IR_ProvidesDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ProvidesDescription *&
IR_ProvidesDescription_var::out (void)
{
@@ -16557,7 +17385,7 @@ IR_ProvidesDescription_out::operator= (IR_ProvidesDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ProvidesDescription_out::operator ::IR_ProvidesDescription *&() // cast
{
return this->ptr_;
@@ -16575,194 +17403,6 @@ IR_ProvidesDescription_out::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
-IR_UsesDef::IR_UsesDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_UsesDef::IR_UsesDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_UsesDef::~IR_UsesDef (void) // destructor
-{}
-
-
-#if !defined (_IR_USESDEF___VAR_CI_)
-#define _IR_USESDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_UsesDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_UsesDef_var::IR_UsesDef_var (void) // default constructor
- : ptr_ (IR_UsesDef::_nil ())
-{}
-
-ACE_INLINE
-IR_UsesDef_var::IR_UsesDef_var (IR_UsesDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_UsesDef_ptr
-IR_UsesDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_UsesDef_var::IR_UsesDef_var (const ::IR_UsesDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_UsesDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_UsesDef_var::~IR_UsesDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_UsesDef_var &
-IR_UsesDef_var::operator= (IR_UsesDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_UsesDef_var &
-IR_UsesDef_var::operator= (const ::IR_UsesDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_UsesDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_UsesDef_var::operator const ::IR_UsesDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_UsesDef_var::operator ::IR_UsesDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UsesDef_ptr
-IR_UsesDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UsesDef_ptr
-IR_UsesDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UsesDef_ptr &
-IR_UsesDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UsesDef_ptr &
-IR_UsesDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_UsesDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UsesDef_ptr
-IR_UsesDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_UsesDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_UsesDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_USESDEF___OUT_CI_)
-#define _IR_USESDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_UsesDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_UsesDef_out::IR_UsesDef_out (IR_UsesDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_UsesDef::_nil ();
-}
-
-ACE_INLINE
-IR_UsesDef_out::IR_UsesDef_out (IR_UsesDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_UsesDef::_nil ();
-}
-
-ACE_INLINE
-IR_UsesDef_out::IR_UsesDef_out (const ::IR_UsesDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_UsesDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_UsesDef_out &
-IR_UsesDef_out::operator= (const ::IR_UsesDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_UsesDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_UsesDef_out &
-IR_UsesDef_out::operator= (const ::IR_UsesDef_var &p)
-{
- this->ptr_ = ::IR_UsesDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_UsesDef_out &
-IR_UsesDef_out::operator= (IR_UsesDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_UsesDef_out::operator ::IR_UsesDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UsesDef_ptr &
-IR_UsesDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_UsesDef_ptr
-IR_UsesDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_UsesDescription_var
// *************************************************************
@@ -16830,20 +17470,20 @@ IR_UsesDescription_var::operator const ::IR_UsesDescription &() const // cast
}
ACE_INLINE
-IR_UsesDescription_var::operator ::IR_UsesDescription &() // cast
+IR_UsesDescription_var::operator ::IR_UsesDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_UsesDescription_var::operator ::IR_UsesDescription &() const // cast
+IR_UsesDescription_var::operator ::IR_UsesDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_UsesDescription_var::operator ::IR_UsesDescription *&() // cast
+IR_UsesDescription_var::operator ::IR_UsesDescription *&() // cast
{
return this->ptr_;
}
@@ -16860,7 +17500,7 @@ IR_UsesDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_UsesDescription *&
IR_UsesDescription_var::out (void)
{
@@ -16921,7 +17561,7 @@ IR_UsesDescription_out::operator= (IR_UsesDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_UsesDescription_out::operator ::IR_UsesDescription *&() // cast
{
return this->ptr_;
@@ -16939,50 +17579,46 @@ IR_UsesDescription_out::operator-> (void)
return this->ptr_;
}
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_ProvidesDescription *
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_ProvidesDescription *retval = 0;
ACE_NEW_RETURN (retval, IR_ProvidesDescription[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR_ProvidesDescription *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR_ProvidesDescription *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_ProvidesDescription *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -16990,10 +17626,10 @@ IR_UsesDescription_out::operator-> (void)
{
IR_ProvidesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
IR_ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR_ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -17001,14 +17637,14 @@ IR_UsesDescription_out::operator-> (void)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -17021,41 +17657,41 @@ IR_UsesDescription_out::operator-> (void)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_ProvidesDescription *tmp1 = ACE_reinterpret_cast (IR_ProvidesDescription *, this->buffer_);
IR_ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR_ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_ProvidesDescription &
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_ProvidesDescription* tmp = ACE_reinterpret_cast(IR_ProvidesDescription*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_ProvidesDescription &
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_ProvidesDescription * const tmp = ACE_reinterpret_cast (IR_ProvidesDescription* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_ProvidesDescription *
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
{
IR_ProvidesDescription *result = 0;
if (orphan == 0)
@@ -17087,15 +17723,15 @@ IR_UsesDescription_out::operator-> (void)
}
return result;
}
-
+
ACE_INLINE const IR_ProvidesDescription *
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_ProvidesDescription * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_ProvidesDescription *data,
CORBA::Boolean release)
@@ -17110,14 +17746,8 @@ IR_UsesDescription_out::operator-> (void)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_PROVIDESDESCSEQ_CI_)
-#define _IR_PROVIDESDESCSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_ProvidesDescSeq_var
@@ -17179,27 +17809,27 @@ IR_ProvidesDescSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_ProvidesDescSeq_var::operator const ::IR_ProvidesDescSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() // cast
+ACE_INLINE
+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() const // cast
+ACE_INLINE
+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq *&() // cast
+IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq *&() // cast
{
return this->ptr_;
}
@@ -17210,6 +17840,12 @@ IR_ProvidesDescSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_ProvidesDescription &
+IR_ProvidesDescSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_ProvidesDescription &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_ProvidesDescSeq &
IR_ProvidesDescSeq_var::in (void) const
{
@@ -17222,7 +17858,7 @@ IR_ProvidesDescSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ProvidesDescSeq *&
IR_ProvidesDescSeq_var::out (void)
{
@@ -17283,7 +17919,7 @@ IR_ProvidesDescSeq_out::operator= (IR_ProvidesDescSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ProvidesDescSeq_out::operator ::IR_ProvidesDescSeq *&() // cast
{
return this->ptr_;
@@ -17307,53 +17943,46 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
-
-#if !defined (__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_)
-#define __TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_
-
+
// = Static operations.
ACE_INLINE IR_UsesDescription *
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
// Allocate storage for the sequence.
{
IR_UsesDescription *retval = 0;
ACE_NEW_RETURN (retval, IR_UsesDescription[size], 0);
return retval;
}
-
- ACE_INLINE void _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR_UsesDescription *buffer)
+
+ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR_UsesDescription *buffer)
// Free the sequence.
{
delete [] buffer;
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
: TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (maximum))
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
CORBA::ULong length,
IR_UsesDescription *data,
CORBA::Boolean release)
: TAO_Unbounded_Base_Sequence (maximum, length, data, release)
{
}
-
+
ACE_INLINE
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
// Copy constructor.
: TAO_Unbounded_Base_Sequence (rhs)
{
@@ -17361,10 +17990,10 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
{
IR_UsesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
IR_UsesDescription * const tmp2 = ACE_reinterpret_cast (IR_UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
this->buffer_ = tmp1;
}
else
@@ -17372,14 +18001,14 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = 0;
}
}
-
- ACE_INLINE _TAO_Unbounded_Sequence_IR_UsesDescSeq &
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
+
+ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_UsesDescSeq &
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
// Assignment operator.
{
if (this == &rhs)
return *this;
-
+
if (this->release_)
{
if (this->maximum_ < rhs.maximum_)
@@ -17392,41 +18021,41 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
}
else
this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
-
+
TAO_Unbounded_Base_Sequence::operator= (rhs);
-
+
IR_UsesDescription *tmp1 = ACE_reinterpret_cast (IR_UsesDescription *, this->buffer_);
IR_UsesDescription * const tmp2 = ACE_reinterpret_cast (IR_UsesDescription * ACE_CAST_CONST, rhs.buffer_);
-
+
for (CORBA::ULong i = 0; i < this->length_; ++i)
tmp1[i] = tmp2[i];
-
+
return *this;
}
-
+
// = Accessors.
ACE_INLINE IR_UsesDescription &
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_UsesDescription* tmp = ACE_reinterpret_cast(IR_UsesDescription*,this->buffer_);
return tmp[i];
}
-
+
ACE_INLINE const IR_UsesDescription &
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
// operator []
{
ACE_ASSERT (i < this->maximum_);
IR_UsesDescription * const tmp = ACE_reinterpret_cast (IR_UsesDescription* ACE_CAST_CONST, this->buffer_);
return tmp[i];
}
-
+
// Implement the TAO_Base_Sequence methods (see Sequence.h)
-
+
ACE_INLINE IR_UsesDescription *
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
{
IR_UsesDescription *result = 0;
if (orphan == 0)
@@ -17458,15 +18087,15 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
}
return result;
}
-
+
ACE_INLINE const IR_UsesDescription *
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
{
return ACE_reinterpret_cast(const IR_UsesDescription * ACE_CAST_CONST, this->buffer_);
}
-
+
ACE_INLINE void
- _TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
+ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
CORBA::ULong length,
IR_UsesDescription *data,
CORBA::Boolean release)
@@ -17481,14 +18110,8 @@ IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
this->buffer_ = data;
this->release_ = release;
}
-
-#endif /* end #if !defined */
-
-
-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
-
-#if !defined (_IR_USESDESCSEQ_CI_)
-#define _IR_USESDESCSEQ_CI_
+
+#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
// *************************************************************
// Inline operations for class IR_UsesDescSeq_var
@@ -17550,27 +18173,27 @@ IR_UsesDescSeq_var::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
+ACE_INLINE
IR_UsesDescSeq_var::operator const ::IR_UsesDescSeq &() const // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() // cast
+ACE_INLINE
+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() // cast
{
return *this->ptr_;
}
-ACE_INLINE
-IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() const // cast
+ACE_INLINE
+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_UsesDescSeq_var::operator ::IR_UsesDescSeq *&() // cast
+IR_UsesDescSeq_var::operator ::IR_UsesDescSeq *&() // cast
{
return this->ptr_;
}
@@ -17581,6 +18204,12 @@ IR_UsesDescSeq_var::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
+ACE_INLINE const IR_UsesDescription &
+IR_UsesDescSeq_var::operator[] (CORBA::ULong index) const
+{
+ return ACE_const_cast (const IR_UsesDescription &, this->ptr_->operator[] (index));
+}
+
ACE_INLINE const ::IR_UsesDescSeq &
IR_UsesDescSeq_var::in (void) const
{
@@ -17593,7 +18222,7 @@ IR_UsesDescSeq_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_UsesDescSeq *&
IR_UsesDescSeq_var::out (void)
{
@@ -17654,7 +18283,7 @@ IR_UsesDescSeq_out::operator= (IR_UsesDescSeq *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_UsesDescSeq_out::operator ::IR_UsesDescSeq *&() // cast
{
return this->ptr_;
@@ -17678,197 +18307,6 @@ IR_UsesDescSeq_out::operator[] (CORBA::ULong index)
return this->ptr_->operator[] (index);
}
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_EventDef::IR_EventDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_EventDef::IR_EventDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_EventDef::~IR_EventDef (void) // destructor
-{}
-
-
-#if !defined (_IR_EVENTDEF___VAR_CI_)
-#define _IR_EVENTDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_EventDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_EventDef_var::IR_EventDef_var (void) // default constructor
- : ptr_ (IR_EventDef::_nil ())
-{}
-
-ACE_INLINE
-IR_EventDef_var::IR_EventDef_var (IR_EventDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_EventDef_ptr
-IR_EventDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_EventDef_var::IR_EventDef_var (const ::IR_EventDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_EventDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_EventDef_var::~IR_EventDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_EventDef_var &
-IR_EventDef_var::operator= (IR_EventDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_EventDef_var &
-IR_EventDef_var::operator= (const ::IR_EventDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EventDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_EventDef_var::operator const ::IR_EventDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_EventDef_var::operator ::IR_EventDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EventDef_ptr
-IR_EventDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EventDef_ptr
-IR_EventDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EventDef_ptr &
-IR_EventDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EventDef_ptr &
-IR_EventDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EventDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EventDef_ptr
-IR_EventDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_EventDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_EventDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EVENTDEF___OUT_CI_)
-#define _IR_EVENTDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_EventDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_EventDef_out::IR_EventDef_out (IR_EventDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_EventDef::_nil ();
-}
-
-ACE_INLINE
-IR_EventDef_out::IR_EventDef_out (IR_EventDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EventDef::_nil ();
-}
-
-ACE_INLINE
-IR_EventDef_out::IR_EventDef_out (const ::IR_EventDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_EventDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_EventDef_out &
-IR_EventDef_out::operator= (const ::IR_EventDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_EventDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_EventDef_out &
-IR_EventDef_out::operator= (const ::IR_EventDef_var &p)
-{
- this->ptr_ = ::IR_EventDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_EventDef_out &
-IR_EventDef_out::operator= (IR_EventDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_EventDef_out::operator ::IR_EventDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EventDef_ptr &
-IR_EventDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EventDef_ptr
-IR_EventDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_EventDescription_var
// *************************************************************
@@ -17936,20 +18374,20 @@ IR_EventDescription_var::operator const ::IR_EventDescription &() const // cast
}
ACE_INLINE
-IR_EventDescription_var::operator ::IR_EventDescription &() // cast
+IR_EventDescription_var::operator ::IR_EventDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_EventDescription_var::operator ::IR_EventDescription &() const // cast
+IR_EventDescription_var::operator ::IR_EventDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_EventDescription_var::operator ::IR_EventDescription *&() // cast
+IR_EventDescription_var::operator ::IR_EventDescription *&() // cast
{
return this->ptr_;
}
@@ -17966,7 +18404,7 @@ IR_EventDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_EventDescription *&
IR_EventDescription_var::out (void)
{
@@ -18027,7 +18465,7 @@ IR_EventDescription_out::operator= (IR_EventDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_EventDescription_out::operator ::IR_EventDescription *&() // cast
{
return this->ptr_;
@@ -18045,758 +18483,6 @@ IR_EventDescription_out::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
-IR_EmitsDef::IR_EmitsDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_EmitsDef::IR_EmitsDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_EmitsDef::~IR_EmitsDef (void) // destructor
-{}
-
-
-#if !defined (_IR_EMITSDEF___VAR_CI_)
-#define _IR_EMITSDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_EmitsDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_EmitsDef_var::IR_EmitsDef_var (void) // default constructor
- : ptr_ (IR_EmitsDef::_nil ())
-{}
-
-ACE_INLINE
-IR_EmitsDef_var::IR_EmitsDef_var (IR_EmitsDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_EmitsDef_ptr
-IR_EmitsDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_EmitsDef_var::IR_EmitsDef_var (const ::IR_EmitsDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_EmitsDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_EmitsDef_var::~IR_EmitsDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_EmitsDef_var &
-IR_EmitsDef_var::operator= (IR_EmitsDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_EmitsDef_var &
-IR_EmitsDef_var::operator= (const ::IR_EmitsDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EmitsDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_EmitsDef_var::operator const ::IR_EmitsDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_EmitsDef_var::operator ::IR_EmitsDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EmitsDef_ptr
-IR_EmitsDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EmitsDef_ptr
-IR_EmitsDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EmitsDef_ptr &
-IR_EmitsDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EmitsDef_ptr &
-IR_EmitsDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EmitsDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EmitsDef_ptr
-IR_EmitsDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_EmitsDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_EmitsDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_EMITSDEF___OUT_CI_)
-#define _IR_EMITSDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_EmitsDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_EmitsDef_out::IR_EmitsDef_out (IR_EmitsDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_EmitsDef::_nil ();
-}
-
-ACE_INLINE
-IR_EmitsDef_out::IR_EmitsDef_out (IR_EmitsDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_EmitsDef::_nil ();
-}
-
-ACE_INLINE
-IR_EmitsDef_out::IR_EmitsDef_out (const ::IR_EmitsDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_EmitsDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_EmitsDef_out &
-IR_EmitsDef_out::operator= (const ::IR_EmitsDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_EmitsDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_EmitsDef_out &
-IR_EmitsDef_out::operator= (const ::IR_EmitsDef_var &p)
-{
- this->ptr_ = ::IR_EmitsDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_EmitsDef_out &
-IR_EmitsDef_out::operator= (IR_EmitsDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_EmitsDef_out::operator ::IR_EmitsDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EmitsDef_ptr &
-IR_EmitsDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_EmitsDef_ptr
-IR_EmitsDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_PublishesDef::IR_PublishesDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_PublishesDef::IR_PublishesDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_PublishesDef::~IR_PublishesDef (void) // destructor
-{}
-
-
-#if !defined (_IR_PUBLISHESDEF___VAR_CI_)
-#define _IR_PUBLISHESDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_PublishesDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_PublishesDef_var::IR_PublishesDef_var (void) // default constructor
- : ptr_ (IR_PublishesDef::_nil ())
-{}
-
-ACE_INLINE
-IR_PublishesDef_var::IR_PublishesDef_var (IR_PublishesDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_PublishesDef_ptr
-IR_PublishesDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_PublishesDef_var::IR_PublishesDef_var (const ::IR_PublishesDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_PublishesDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_PublishesDef_var::~IR_PublishesDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_PublishesDef_var &
-IR_PublishesDef_var::operator= (IR_PublishesDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_PublishesDef_var &
-IR_PublishesDef_var::operator= (const ::IR_PublishesDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PublishesDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_PublishesDef_var::operator const ::IR_PublishesDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_PublishesDef_var::operator ::IR_PublishesDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PublishesDef_ptr
-IR_PublishesDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PublishesDef_ptr
-IR_PublishesDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PublishesDef_ptr &
-IR_PublishesDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PublishesDef_ptr &
-IR_PublishesDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PublishesDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PublishesDef_ptr
-IR_PublishesDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_PublishesDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_PublishesDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PUBLISHESDEF___OUT_CI_)
-#define _IR_PUBLISHESDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_PublishesDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_PublishesDef_out::IR_PublishesDef_out (IR_PublishesDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_PublishesDef::_nil ();
-}
-
-ACE_INLINE
-IR_PublishesDef_out::IR_PublishesDef_out (IR_PublishesDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PublishesDef::_nil ();
-}
-
-ACE_INLINE
-IR_PublishesDef_out::IR_PublishesDef_out (const ::IR_PublishesDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_PublishesDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_PublishesDef_out &
-IR_PublishesDef_out::operator= (const ::IR_PublishesDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_PublishesDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_PublishesDef_out &
-IR_PublishesDef_out::operator= (const ::IR_PublishesDef_var &p)
-{
- this->ptr_ = ::IR_PublishesDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_PublishesDef_out &
-IR_PublishesDef_out::operator= (IR_PublishesDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_PublishesDef_out::operator ::IR_PublishesDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PublishesDef_ptr &
-IR_PublishesDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PublishesDef_ptr
-IR_PublishesDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_ConsumesDef::IR_ConsumesDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ConsumesDef::IR_ConsumesDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ConsumesDef::~IR_ConsumesDef (void) // destructor
-{}
-
-
-#if !defined (_IR_CONSUMESDEF___VAR_CI_)
-#define _IR_CONSUMESDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_ConsumesDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_ConsumesDef_var::IR_ConsumesDef_var (void) // default constructor
- : ptr_ (IR_ConsumesDef::_nil ())
-{}
-
-ACE_INLINE
-IR_ConsumesDef_var::IR_ConsumesDef_var (IR_ConsumesDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_ConsumesDef_ptr
-IR_ConsumesDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ConsumesDef_var::IR_ConsumesDef_var (const ::IR_ConsumesDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_ConsumesDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_ConsumesDef_var::~IR_ConsumesDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_ConsumesDef_var &
-IR_ConsumesDef_var::operator= (IR_ConsumesDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_ConsumesDef_var &
-IR_ConsumesDef_var::operator= (const ::IR_ConsumesDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ConsumesDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_ConsumesDef_var::operator const ::IR_ConsumesDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ConsumesDef_var::operator ::IR_ConsumesDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConsumesDef_ptr
-IR_ConsumesDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConsumesDef_ptr
-IR_ConsumesDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConsumesDef_ptr &
-IR_ConsumesDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConsumesDef_ptr &
-IR_ConsumesDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ConsumesDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConsumesDef_ptr
-IR_ConsumesDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_ConsumesDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ConsumesDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_CONSUMESDEF___OUT_CI_)
-#define _IR_CONSUMESDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_ConsumesDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_ConsumesDef_out::IR_ConsumesDef_out (IR_ConsumesDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_ConsumesDef::_nil ();
-}
-
-ACE_INLINE
-IR_ConsumesDef_out::IR_ConsumesDef_out (IR_ConsumesDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ConsumesDef::_nil ();
-}
-
-ACE_INLINE
-IR_ConsumesDef_out::IR_ConsumesDef_out (const ::IR_ConsumesDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ConsumesDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_ConsumesDef_out &
-IR_ConsumesDef_out::operator= (const ::IR_ConsumesDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ConsumesDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ConsumesDef_out &
-IR_ConsumesDef_out::operator= (const ::IR_ConsumesDef_var &p)
-{
- this->ptr_ = ::IR_ConsumesDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_ConsumesDef_out &
-IR_ConsumesDef_out::operator= (IR_ConsumesDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_ConsumesDef_out::operator ::IR_ConsumesDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConsumesDef_ptr &
-IR_ConsumesDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ConsumesDef_ptr
-IR_ConsumesDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_ComponentDef::IR_ComponentDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_ComponentDef::IR_ComponentDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_ComponentDef::~IR_ComponentDef (void) // destructor
-{}
-
-
-#if !defined (_IR_COMPONENTDEF___VAR_CI_)
-#define _IR_COMPONENTDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_ComponentDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_ComponentDef_var::IR_ComponentDef_var (void) // default constructor
- : ptr_ (IR_ComponentDef::_nil ())
-{}
-
-ACE_INLINE
-IR_ComponentDef_var::IR_ComponentDef_var (IR_ComponentDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_ComponentDef_ptr
-IR_ComponentDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ComponentDef_var::IR_ComponentDef_var (const ::IR_ComponentDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_ComponentDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_ComponentDef_var::~IR_ComponentDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_ComponentDef_var &
-IR_ComponentDef_var::operator= (IR_ComponentDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_ComponentDef_var &
-IR_ComponentDef_var::operator= (const ::IR_ComponentDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ComponentDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_ComponentDef_var::operator const ::IR_ComponentDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_ComponentDef_var::operator ::IR_ComponentDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ComponentDef_ptr
-IR_ComponentDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ComponentDef_ptr
-IR_ComponentDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ComponentDef_ptr &
-IR_ComponentDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ComponentDef_ptr &
-IR_ComponentDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ComponentDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ComponentDef_ptr
-IR_ComponentDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_ComponentDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_ComponentDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_COMPONENTDEF___OUT_CI_)
-#define _IR_COMPONENTDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_ComponentDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_ComponentDef_out::IR_ComponentDef_out (IR_ComponentDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_ComponentDef::_nil ();
-}
-
-ACE_INLINE
-IR_ComponentDef_out::IR_ComponentDef_out (IR_ComponentDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_ComponentDef::_nil ();
-}
-
-ACE_INLINE
-IR_ComponentDef_out::IR_ComponentDef_out (const ::IR_ComponentDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_ComponentDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_ComponentDef_out &
-IR_ComponentDef_out::operator= (const ::IR_ComponentDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_ComponentDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_ComponentDef_out &
-IR_ComponentDef_out::operator= (const ::IR_ComponentDef_var &p)
-{
- this->ptr_ = ::IR_ComponentDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_ComponentDef_out &
-IR_ComponentDef_out::operator= (IR_ComponentDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_ComponentDef_out::operator ::IR_ComponentDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ComponentDef_ptr &
-IR_ComponentDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_ComponentDef_ptr
-IR_ComponentDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_ComponentDescription_var
// *************************************************************
@@ -18864,20 +18550,20 @@ IR_ComponentDescription_var::operator const ::IR_ComponentDescription &() const
}
ACE_INLINE
-IR_ComponentDescription_var::operator ::IR_ComponentDescription &() // cast
+IR_ComponentDescription_var::operator ::IR_ComponentDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_ComponentDescription_var::operator ::IR_ComponentDescription &() const // cast
+IR_ComponentDescription_var::operator ::IR_ComponentDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_ComponentDescription_var::operator ::IR_ComponentDescription *&() // cast
+IR_ComponentDescription_var::operator ::IR_ComponentDescription *&() // cast
{
return this->ptr_;
}
@@ -18894,7 +18580,7 @@ IR_ComponentDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_ComponentDescription *&
IR_ComponentDescription_var::out (void)
{
@@ -18955,7 +18641,7 @@ IR_ComponentDescription_out::operator= (IR_ComponentDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_ComponentDescription_out::operator ::IR_ComponentDescription *&() // cast
{
return this->ptr_;
@@ -18973,194 +18659,6 @@ IR_ComponentDescription_out::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
-IR_PrimaryKeyDef::IR_PrimaryKeyDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_PrimaryKeyDef::IR_PrimaryKeyDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_PrimaryKeyDef::~IR_PrimaryKeyDef (void) // destructor
-{}
-
-
-#if !defined (_IR_PRIMARYKEYDEF___VAR_CI_)
-#define _IR_PRIMARYKEYDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_PrimaryKeyDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (void) // default constructor
- : ptr_ (IR_PrimaryKeyDef::_nil ())
-{}
-
-ACE_INLINE
-IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (IR_PrimaryKeyDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_PrimaryKeyDef_ptr
-IR_PrimaryKeyDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (const ::IR_PrimaryKeyDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_PrimaryKeyDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_PrimaryKeyDef_var::~IR_PrimaryKeyDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_PrimaryKeyDef_var &
-IR_PrimaryKeyDef_var::operator= (IR_PrimaryKeyDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_PrimaryKeyDef_var &
-IR_PrimaryKeyDef_var::operator= (const ::IR_PrimaryKeyDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PrimaryKeyDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_PrimaryKeyDef_var::operator const ::IR_PrimaryKeyDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_PrimaryKeyDef_var::operator ::IR_PrimaryKeyDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimaryKeyDef_ptr
-IR_PrimaryKeyDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimaryKeyDef_ptr
-IR_PrimaryKeyDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimaryKeyDef_ptr &
-IR_PrimaryKeyDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimaryKeyDef_ptr &
-IR_PrimaryKeyDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PrimaryKeyDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimaryKeyDef_ptr
-IR_PrimaryKeyDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_PrimaryKeyDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_PrimaryKeyDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_PRIMARYKEYDEF___OUT_CI_)
-#define _IR_PRIMARYKEYDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_PrimaryKeyDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_PrimaryKeyDef::_nil ();
-}
-
-ACE_INLINE
-IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_PrimaryKeyDef::_nil ();
-}
-
-ACE_INLINE
-IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (const ::IR_PrimaryKeyDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_PrimaryKeyDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_PrimaryKeyDef_out &
-IR_PrimaryKeyDef_out::operator= (const ::IR_PrimaryKeyDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_PrimaryKeyDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_PrimaryKeyDef_out &
-IR_PrimaryKeyDef_out::operator= (const ::IR_PrimaryKeyDef_var &p)
-{
- this->ptr_ = ::IR_PrimaryKeyDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_PrimaryKeyDef_out &
-IR_PrimaryKeyDef_out::operator= (IR_PrimaryKeyDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_PrimaryKeyDef_out::operator ::IR_PrimaryKeyDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimaryKeyDef_ptr &
-IR_PrimaryKeyDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_PrimaryKeyDef_ptr
-IR_PrimaryKeyDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_PrimaryKeyDescription_var
// *************************************************************
@@ -19228,20 +18726,20 @@ IR_PrimaryKeyDescription_var::operator const ::IR_PrimaryKeyDescription &() cons
}
ACE_INLINE
-IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() // cast
+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() const // cast
+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription *&() // cast
+IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription *&() // cast
{
return this->ptr_;
}
@@ -19258,7 +18756,7 @@ IR_PrimaryKeyDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_PrimaryKeyDescription *&
IR_PrimaryKeyDescription_var::out (void)
{
@@ -19319,7 +18817,7 @@ IR_PrimaryKeyDescription_out::operator= (IR_PrimaryKeyDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_PrimaryKeyDescription_out::operator ::IR_PrimaryKeyDescription *&() // cast
{
return this->ptr_;
@@ -19337,570 +18835,6 @@ IR_PrimaryKeyDescription_out::operator-> (void)
return this->ptr_;
}
-ACE_INLINE
-IR_FactoryDef::IR_FactoryDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_FactoryDef::IR_FactoryDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_FactoryDef::~IR_FactoryDef (void) // destructor
-{}
-
-
-#if !defined (_IR_FACTORYDEF___VAR_CI_)
-#define _IR_FACTORYDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_FactoryDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_FactoryDef_var::IR_FactoryDef_var (void) // default constructor
- : ptr_ (IR_FactoryDef::_nil ())
-{}
-
-ACE_INLINE
-IR_FactoryDef_var::IR_FactoryDef_var (IR_FactoryDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_FactoryDef_ptr
-IR_FactoryDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_FactoryDef_var::IR_FactoryDef_var (const ::IR_FactoryDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_FactoryDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_FactoryDef_var::~IR_FactoryDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_FactoryDef_var &
-IR_FactoryDef_var::operator= (IR_FactoryDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_FactoryDef_var &
-IR_FactoryDef_var::operator= (const ::IR_FactoryDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FactoryDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_FactoryDef_var::operator const ::IR_FactoryDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_FactoryDef_var::operator ::IR_FactoryDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FactoryDef_ptr
-IR_FactoryDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FactoryDef_ptr
-IR_FactoryDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FactoryDef_ptr &
-IR_FactoryDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FactoryDef_ptr &
-IR_FactoryDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FactoryDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FactoryDef_ptr
-IR_FactoryDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_FactoryDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_FactoryDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FACTORYDEF___OUT_CI_)
-#define _IR_FACTORYDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_FactoryDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_FactoryDef_out::IR_FactoryDef_out (IR_FactoryDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_FactoryDef::_nil ();
-}
-
-ACE_INLINE
-IR_FactoryDef_out::IR_FactoryDef_out (IR_FactoryDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FactoryDef::_nil ();
-}
-
-ACE_INLINE
-IR_FactoryDef_out::IR_FactoryDef_out (const ::IR_FactoryDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_FactoryDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_FactoryDef_out &
-IR_FactoryDef_out::operator= (const ::IR_FactoryDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_FactoryDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_FactoryDef_out &
-IR_FactoryDef_out::operator= (const ::IR_FactoryDef_var &p)
-{
- this->ptr_ = ::IR_FactoryDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_FactoryDef_out &
-IR_FactoryDef_out::operator= (IR_FactoryDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_FactoryDef_out::operator ::IR_FactoryDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FactoryDef_ptr &
-IR_FactoryDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FactoryDef_ptr
-IR_FactoryDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_FinderDef::IR_FinderDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_FinderDef::IR_FinderDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_FinderDef::~IR_FinderDef (void) // destructor
-{}
-
-
-#if !defined (_IR_FINDERDEF___VAR_CI_)
-#define _IR_FINDERDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_FinderDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_FinderDef_var::IR_FinderDef_var (void) // default constructor
- : ptr_ (IR_FinderDef::_nil ())
-{}
-
-ACE_INLINE
-IR_FinderDef_var::IR_FinderDef_var (IR_FinderDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_FinderDef_ptr
-IR_FinderDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_FinderDef_var::IR_FinderDef_var (const ::IR_FinderDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_FinderDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_FinderDef_var::~IR_FinderDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_FinderDef_var &
-IR_FinderDef_var::operator= (IR_FinderDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_FinderDef_var &
-IR_FinderDef_var::operator= (const ::IR_FinderDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FinderDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_FinderDef_var::operator const ::IR_FinderDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_FinderDef_var::operator ::IR_FinderDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FinderDef_ptr
-IR_FinderDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FinderDef_ptr
-IR_FinderDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FinderDef_ptr &
-IR_FinderDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FinderDef_ptr &
-IR_FinderDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FinderDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FinderDef_ptr
-IR_FinderDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_FinderDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_FinderDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_FINDERDEF___OUT_CI_)
-#define _IR_FINDERDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_FinderDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_FinderDef_out::IR_FinderDef_out (IR_FinderDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_FinderDef::_nil ();
-}
-
-ACE_INLINE
-IR_FinderDef_out::IR_FinderDef_out (IR_FinderDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_FinderDef::_nil ();
-}
-
-ACE_INLINE
-IR_FinderDef_out::IR_FinderDef_out (const ::IR_FinderDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_FinderDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_FinderDef_out &
-IR_FinderDef_out::operator= (const ::IR_FinderDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_FinderDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_FinderDef_out &
-IR_FinderDef_out::operator= (const ::IR_FinderDef_var &p)
-{
- this->ptr_ = ::IR_FinderDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_FinderDef_out &
-IR_FinderDef_out::operator= (IR_FinderDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_FinderDef_out::operator ::IR_FinderDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FinderDef_ptr &
-IR_FinderDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_FinderDef_ptr
-IR_FinderDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
-ACE_INLINE
-IR_HomeDef::IR_HomeDef (void) // default constructor
-{}
-
-ACE_INLINE
-IR_HomeDef::IR_HomeDef (TAO_Stub *objref, CORBA::Boolean _tao_collocated) // constructor
- : CORBA_Object (objref, _tao_collocated)
-{}
-
-ACE_INLINE
-IR_HomeDef::~IR_HomeDef (void) // destructor
-{}
-
-
-#if !defined (_IR_HOMEDEF___VAR_CI_)
-#define _IR_HOMEDEF___VAR_CI_
-
-// *************************************************************
-// Inline operations for class IR_HomeDef_var
-// *************************************************************
-
-ACE_INLINE
-IR_HomeDef_var::IR_HomeDef_var (void) // default constructor
- : ptr_ (IR_HomeDef::_nil ())
-{}
-
-ACE_INLINE
-IR_HomeDef_var::IR_HomeDef_var (IR_HomeDef_ptr p)
- : ptr_ (p)
-{}
-
-ACE_INLINE ::IR_HomeDef_ptr
-IR_HomeDef_var::ptr (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_HomeDef_var::IR_HomeDef_var (const ::IR_HomeDef_var &p) // copy constructor
- : TAO_Base_var (),
- ptr_ (IR_HomeDef::_duplicate (p.ptr ()))
-{}
-
-ACE_INLINE
-IR_HomeDef_var::~IR_HomeDef_var (void) // destructor
-{
- CORBA::release (this->ptr_);
-}
-
-ACE_INLINE IR_HomeDef_var &
-IR_HomeDef_var::operator= (IR_HomeDef_ptr p)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE IR_HomeDef_var &
-IR_HomeDef_var::operator= (const ::IR_HomeDef_var &p)
-{
- if (this != &p)
- {
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_HomeDef::_duplicate (p.ptr ());
- }
- return *this;
-}
-
-ACE_INLINE
-IR_HomeDef_var::operator const ::IR_HomeDef_ptr &() const // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE
-IR_HomeDef_var::operator ::IR_HomeDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_HomeDef_ptr
-IR_HomeDef_var::operator-> (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_HomeDef_ptr
-IR_HomeDef_var::in (void) const
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_HomeDef_ptr &
-IR_HomeDef_var::inout (void)
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_HomeDef_ptr &
-IR_HomeDef_var::out (void)
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_HomeDef::_nil ();
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_HomeDef_ptr
-IR_HomeDef_var::_retn (void)
-{
- // yield ownership of managed obj reference
- ::IR_HomeDef_ptr val = this->ptr_;
- this->ptr_ = ::IR_HomeDef::_nil ();
- return val;
-}
-
-
-#endif /* end #if !defined */
-
-
-#if !defined (_IR_HOMEDEF___OUT_CI_)
-#define _IR_HOMEDEF___OUT_CI_
-
-// *************************************************************
-// Inline operations for class IR_HomeDef_out
-// *************************************************************
-
-ACE_INLINE
-IR_HomeDef_out::IR_HomeDef_out (IR_HomeDef_ptr &p)
- : ptr_ (p)
-{
- this->ptr_ = ::IR_HomeDef::_nil ();
-}
-
-ACE_INLINE
-IR_HomeDef_out::IR_HomeDef_out (IR_HomeDef_var &p) // constructor from _var
- : ptr_ (p.out ())
-{
- CORBA::release (this->ptr_);
- this->ptr_ = ::IR_HomeDef::_nil ();
-}
-
-ACE_INLINE
-IR_HomeDef_out::IR_HomeDef_out (const ::IR_HomeDef_out &p) // copy constructor
- : ptr_ (ACE_const_cast (IR_HomeDef_out &, p).ptr_)
-{}
-
-ACE_INLINE ::IR_HomeDef_out &
-IR_HomeDef_out::operator= (const ::IR_HomeDef_out &p)
-{
- this->ptr_ = ACE_const_cast (IR_HomeDef_out&, p).ptr_;
- return *this;
-}
-
-ACE_INLINE IR_HomeDef_out &
-IR_HomeDef_out::operator= (const ::IR_HomeDef_var &p)
-{
- this->ptr_ = ::IR_HomeDef::_duplicate (p.ptr ());
- return *this;
-}
-
-ACE_INLINE IR_HomeDef_out &
-IR_HomeDef_out::operator= (IR_HomeDef_ptr p)
-{
- this->ptr_ = p;
- return *this;
-}
-
-ACE_INLINE
-IR_HomeDef_out::operator ::IR_HomeDef_ptr &() // cast
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_HomeDef_ptr &
-IR_HomeDef_out::ptr (void) // ptr
-{
- return this->ptr_;
-}
-
-ACE_INLINE ::IR_HomeDef_ptr
-IR_HomeDef_out::operator-> (void)
-{
- return this->ptr_;
-}
-
-
-#endif /* end #if !defined */
-
// *************************************************************
// Inline operations for class IR_HomeDescription_var
// *************************************************************
@@ -19968,20 +18902,20 @@ IR_HomeDescription_var::operator const ::IR_HomeDescription &() const // cast
}
ACE_INLINE
-IR_HomeDescription_var::operator ::IR_HomeDescription &() // cast
+IR_HomeDescription_var::operator ::IR_HomeDescription &() // cast
{
return *this->ptr_;
}
ACE_INLINE
-IR_HomeDescription_var::operator ::IR_HomeDescription &() const // cast
+IR_HomeDescription_var::operator ::IR_HomeDescription &() const // cast
{
return *this->ptr_;
}
// variable-size types only
ACE_INLINE
-IR_HomeDescription_var::operator ::IR_HomeDescription *&() // cast
+IR_HomeDescription_var::operator ::IR_HomeDescription *&() // cast
{
return this->ptr_;
}
@@ -19998,7 +18932,7 @@ IR_HomeDescription_var::inout (void)
return *this->ptr_;
}
-// mapping for variable size
+// mapping for variable size
ACE_INLINE ::IR_HomeDescription *&
IR_HomeDescription_var::out (void)
{
@@ -20059,7 +18993,7 @@ IR_HomeDescription_out::operator= (IR_HomeDescription *p)
return *this;
}
-ACE_INLINE
+ACE_INLINE
IR_HomeDescription_out::operator ::IR_HomeDescription *&() // cast
{
return this->ptr_;
@@ -20077,49 +19011,60 @@ IR_HomeDescription_out::operator-> (void)
return this->ptr_;
}
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::DefinitionKind &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_DefinitionKind &_tao_enumval)
{
CORBA::ULong _tao_temp = _tao_enumval;
return strm << _tao_temp;
}
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::DefinitionKind &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_DefinitionKind &_tao_enumval)
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
- _tao_enumval = ACE_static_cast (IR::DefinitionKind, _tao_temp);
+ _tao_enumval = ACE_static_cast (IR_DefinitionKind, _tao_temp);
}
-
+
return _tao_result;
}
ACE_INLINE CORBA::Boolean
operator<< (
+ TAO_OutputCDR &,
+ const CORBA::IRObject_ptr
+ );
+ACE_INLINE CORBA::Boolean
+operator>> (
+ TAO_InputCDR &,
+ CORBA::IRObject_ptr &
+ );
+
+ACE_INLINE CORBA::Boolean
+operator<< (
TAO_OutputCDR &strm,
- const CORBA_IRObject_ptr _tao_objref
+ const CORBA::IRObject_ptr _tao_objref
)
{
- CORBA_Object_ptr _tao_corba_obj = _tao_objref;
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
return (strm << _tao_corba_obj);
}
ACE_INLINE CORBA::Boolean
operator>> (
TAO_InputCDR &strm,
- CORBA_IRObject_ptr &_tao_objref
+ CORBA::IRObject_ptr &_tao_objref
)
{
ACE_TRY_NEW_ENV
{
- CORBA_Object_var obj;
+ CORBA::Object_var obj;
if ((strm >> obj.inout ()) == 0)
return 0;
// narrow to the right type
_tao_objref =
- CORBA_IRObject::_unchecked_narrow (
+ CORBA::IRObject::_unchecked_narrow (
obj.in (),
ACE_TRY_ENV
);
@@ -20184,7 +19129,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Contained::D
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Contained::Description &_tao_aggregate)
@@ -20196,7 +19141,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Contained::Descript
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -20341,11 +19286,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_InterfaceDefSeq_I_
#define _TAO_CDR_OP_IR_InterfaceDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_InterfaceDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_InterfaceDefSeq &
);
@@ -20366,11 +19311,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_ValueDefSeq_I_
#define _TAO_CDR_OP_IR_ValueDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ValueDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ValueDefSeq &
);
@@ -20401,11 +19346,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_ComponentDefSeq_I_
#define _TAO_CDR_OP_IR_ComponentDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ComponentDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ComponentDefSeq &
);
@@ -20426,11 +19371,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_I_
#define _TAO_CDR_OP_IR_ProvidesDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ProvidesDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ProvidesDefSeq &
);
@@ -20451,11 +19396,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_UsesDefSeq_I_
#define _TAO_CDR_OP_IR_UsesDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_UsesDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_UsesDefSeq &
);
@@ -20476,11 +19421,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_HomeDefSeq_I_
#define _TAO_CDR_OP_IR_HomeDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_HomeDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_HomeDefSeq &
);
@@ -20511,11 +19456,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_EmitsDefSeq_I_
#define _TAO_CDR_OP_IR_EmitsDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_EmitsDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_EmitsDefSeq &
);
@@ -20536,11 +19481,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_PublishesDefSeq_I_
#define _TAO_CDR_OP_IR_PublishesDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_PublishesDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_PublishesDefSeq &
);
@@ -20561,11 +19506,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_I_
#define _TAO_CDR_OP_IR_ConsumesDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ConsumesDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ConsumesDefSeq &
);
@@ -20586,11 +19531,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_FactoryDefSeq_I_
#define _TAO_CDR_OP_IR_FactoryDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_FactoryDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_FactoryDefSeq &
);
@@ -20611,11 +19556,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_FinderDefSeq_I_
#define _TAO_CDR_OP_IR_FinderDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_FinderDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_FinderDefSeq &
);
@@ -20636,11 +19581,11 @@ operator>> (
#if !defined _TAO_CDR_OP_IR_ContainedSeq_I_
#define _TAO_CDR_OP_IR_ContainedSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ContainedSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ContainedSeq &
);
@@ -20657,7 +19602,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_StructMember
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_StructMember &_tao_aggregate)
@@ -20670,18 +19615,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_StructMember &_tao_
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_StructMemberSeq_I_
#define _TAO_CDR_OP_IR_StructMemberSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_StructMemberSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_StructMemberSeq &
);
@@ -20697,7 +19642,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Initializer
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Initializer &_tao_aggregate)
@@ -20709,18 +19654,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Initializer &_tao_a
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_InitializerSeq_I_
#define _TAO_CDR_OP_IR_InitializerSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_InitializerSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_InitializerSeq &
);
@@ -20738,7 +19683,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UnionMember
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UnionMember &_tao_aggregate)
@@ -20752,18 +19697,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UnionMember &_tao_a
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_UnionMemberSeq_I_
#define _TAO_CDR_OP_IR_UnionMemberSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_UnionMemberSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_UnionMemberSeq &
);
@@ -20774,11 +19719,11 @@ CORBA::Boolean TAO_Export operator>> (
#if !defined _TAO_CDR_OP_IR_EnumMemberSeq_I_
#define _TAO_CDR_OP_IR_EnumMemberSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_EnumMemberSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_EnumMemberSeq &
);
@@ -20806,7 +19751,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Container::D
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Container::Description &_tao_aggregate)
@@ -20819,18 +19764,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Container::Descript
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
#define _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_Container::DescriptionSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_Container::DescriptionSeq &
);
@@ -20984,22 +19929,22 @@ operator>> (
TAO_InputCDR &,
IR_FixedDef_ptr &
);
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::PrimitiveKind &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_PrimitiveKind &_tao_enumval)
{
CORBA::ULong _tao_temp = _tao_enumval;
return strm << _tao_temp;
}
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::PrimitiveKind &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimitiveKind &_tao_enumval)
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
- _tao_enumval = ACE_static_cast (IR::PrimitiveKind, _tao_temp);
+ _tao_enumval = ACE_static_cast (IR_PrimitiveKind, _tao_temp);
}
-
+
return _tao_result;
}
@@ -21161,7 +20106,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ModuleDescri
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ModuleDescription &_tao_aggregate)
@@ -21175,7 +20120,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ModuleDescription &
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -21240,7 +20185,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ConstantDesc
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ConstantDescription &_tao_aggregate)
@@ -21256,7 +20201,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ConstantDescription
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -21320,7 +20265,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_TypeDescript
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_TypeDescription &_tao_aggregate)
@@ -21335,7 +20280,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_TypeDescription &_t
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -21938,7 +20883,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ExceptionDes
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ExceptionDescription &_tao_aggregate)
@@ -21953,18 +20898,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ExceptionDescriptio
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_ExceptionDefSeq_I_
#define _TAO_CDR_OP_IR_ExceptionDefSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ExceptionDefSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ExceptionDefSeq &
);
@@ -21975,33 +20920,33 @@ CORBA::Boolean TAO_Export operator>> (
#if !defined _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
#define _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ExcDescriptionSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ExcDescriptionSeq &
);
#endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_I_ */
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::AttributeMode &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_AttributeMode &_tao_enumval)
{
CORBA::ULong _tao_temp = _tao_enumval;
return strm << _tao_temp;
}
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::AttributeMode &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeMode &_tao_enumval)
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
- _tao_enumval = ACE_static_cast (IR::AttributeMode, _tao_temp);
+ _tao_enumval = ACE_static_cast (IR_AttributeMode, _tao_temp);
}
-
+
return _tao_result;
}
@@ -22069,7 +21014,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_AttributeDes
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeDescription &_tao_aggregate)
@@ -22087,44 +21032,44 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeDescriptio
return 1;
else
return 0;
-
+
}
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::OperationMode &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_OperationMode &_tao_enumval)
{
CORBA::ULong _tao_temp = _tao_enumval;
return strm << _tao_temp;
}
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::OperationMode &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationMode &_tao_enumval)
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
- _tao_enumval = ACE_static_cast (IR::OperationMode, _tao_temp);
+ _tao_enumval = ACE_static_cast (IR_OperationMode, _tao_temp);
}
-
+
return _tao_result;
}
-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ParameterMode &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ParameterMode &_tao_enumval)
{
CORBA::ULong _tao_temp = _tao_enumval;
return strm << _tao_temp;
}
-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ParameterMode &_tao_enumval)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterMode &_tao_enumval)
{
CORBA::ULong _tao_temp = 0;
CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+
if (_tao_result == 1)
{
- _tao_enumval = ACE_static_cast (IR::ParameterMode, _tao_temp);
+ _tao_enumval = ACE_static_cast (IR_ParameterMode, _tao_temp);
}
-
+
return _tao_result;
}
@@ -22139,7 +21084,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ParameterDes
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterDescription &_tao_aggregate)
@@ -22153,18 +21098,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterDescriptio
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_I_
#define _TAO_CDR_OP_IR_ParDescriptionSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ParDescriptionSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ParDescriptionSeq &
);
@@ -22175,11 +21120,11 @@ CORBA::Boolean TAO_Export operator>> (
#if !defined _TAO_CDR_OP_IR_ContextIdSeq_I_
#define _TAO_CDR_OP_IR_ContextIdSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ContextIdSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ContextIdSeq &
);
@@ -22251,7 +21196,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_OperationDes
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationDescription &_tao_aggregate)
@@ -22270,18 +21215,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationDescriptio
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_I_
#define _TAO_CDR_OP_IR_RepositoryIdSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_RepositoryIdSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_RepositoryIdSeq &
);
@@ -22292,11 +21237,11 @@ CORBA::Boolean TAO_Export operator>> (
#if !defined _TAO_CDR_OP_IR_OpDescriptionSeq_I_
#define _TAO_CDR_OP_IR_OpDescriptionSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_OpDescriptionSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_OpDescriptionSeq &
);
@@ -22307,11 +21252,11 @@ CORBA::Boolean TAO_Export operator>> (
#if !defined _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
#define _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_AttrDescriptionSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_AttrDescriptionSeq &
);
@@ -22384,7 +21329,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_InterfaceDes
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_InterfaceDescription &_tao_aggregate)
@@ -22404,7 +21349,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_InterfaceDescriptio
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueMember &_tao_aggregate)
@@ -22421,7 +21366,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueMember
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueMember &_tao_aggregate)
@@ -22438,18 +21383,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueMember &_tao_a
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_ValueMemberSeq_I_
#define _TAO_CDR_OP_IR_ValueMemberSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ValueMemberSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ValueMemberSeq &
);
@@ -22576,7 +21521,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueDescrip
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueDescription &_tao_aggregate)
@@ -22601,7 +21546,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueDescription &_
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -22714,7 +21659,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ProvidesDesc
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ProvidesDescription &_tao_aggregate)
@@ -22729,7 +21674,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ProvidesDescription
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -22794,7 +21739,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UsesDescript
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UsesDescription &_tao_aggregate)
@@ -22810,18 +21755,18 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UsesDescription &_t
return 1;
else
return 0;
-
+
}
#if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_I_
#define _TAO_CDR_OP_IR_ProvidesDescSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_ProvidesDescSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_ProvidesDescSeq &
);
@@ -22832,11 +21777,11 @@ CORBA::Boolean TAO_Export operator>> (
#if !defined _TAO_CDR_OP_IR_UsesDescSeq_I_
#define _TAO_CDR_OP_IR_UsesDescSeq_I_
-CORBA::Boolean TAO_Export operator<< (
+CORBA::Boolean operator<< (
TAO_OutputCDR &,
const IR_UsesDescSeq &
);
-CORBA::Boolean TAO_Export operator>> (
+CORBA::Boolean operator>> (
TAO_InputCDR &,
IR_UsesDescSeq &
);
@@ -22904,7 +21849,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_EventDescrip
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_EventDescription &_tao_aggregate)
@@ -22919,7 +21864,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_EventDescription &_
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -23138,7 +22083,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ComponentDes
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ComponentDescription &_tao_aggregate)
@@ -23161,7 +22106,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ComponentDescriptio
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -23225,7 +22170,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_PrimaryKeyDe
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimaryKeyDescription &_tao_aggregate)
@@ -23240,7 +22185,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimaryKeyDescripti
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean
@@ -23409,7 +22354,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_HomeDescript
return 1;
else
return 0;
-
+
}
ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_HomeDescription &_tao_aggregate)
@@ -23431,6 +22376,6 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_HomeDescription &_t
return 1;
else
return 0;
-
+
}
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 2e04190abde..446d3894f9c 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -15,7 +15,8 @@ DIRS = \
DynamicInterface \
IORManipulation \
IORTable \
- Strategies
+ Strategies \
+ SmartProxies
# These are headers for things which are exported and must be
# installed. (Currently not used).
@@ -164,7 +165,6 @@ ORB_CORE_FILES = \
DynamicC \
OctetSeqC \
StringSeqC \
- Smart_Proxies \
ORB_Core \
ORB_Table \
Leader_Follower \
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index eb3140c9bc4..12c9a8ab657 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -125,7 +125,6 @@ ORB_CORE_FILES = \
DynamicC.cpp \
OctetSeqC.cpp \
StringSeqC.cpp \
- Smart_Proxies.cpp \
ORB_Core.cpp \
ORB_Table.cpp \
Leader_Follower.cpp \
@@ -324,7 +323,6 @@ HEADER_FILES = \
DynamicC.h \
OctetSeqC.h \
StringSeqC.h \
- Smart_Proxies.h \
ORB_Core.h \
ORB_Table.h \
Object.h \
diff --git a/TAO/tao/Makefile.bor b/TAO/tao/Makefile.bor
index 0749f4f9cbd..c541d24b76c 100644
--- a/TAO/tao/Makefile.bor
+++ b/TAO/tao/Makefile.bor
@@ -10,7 +10,8 @@ DIRS = \
DynamicInterface \
IORTable \
IORManipulation \
- Strategies
+ Strategies \
+ SmartProxies
OBJFILES = \
$(OBJDIR)\Abstract_Servant_Base.obj \
@@ -106,7 +107,6 @@ OBJFILES = \
$(OBJDIR)\DynamicC.obj \
$(OBJDIR)\OctetSeqC.obj \
$(OBJDIR)\StringSeqC.obj \
- $(OBJDIR)\Smart_Proxies.obj \
$(OBJDIR)\Object_Ref_Table.obj \
$(OBJDIR)\ORB_Core.obj \
$(OBJDIR)\ORB_Table.obj \
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp
index 95c026de1a0..f524903f9a0 100644
--- a/TAO/tao/MessagingC.cpp
+++ b/TAO/tao/MessagingC.cpp
@@ -1702,7 +1702,7 @@ Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow (
if (CORBA::is_nil (default_proxy))
ACE_NEW_RETURN (default_proxy, ::Messaging::ReplyHandler (stub, 0, obj->_servant ()), ReplyHandler::_nil ());
-#if (TAO_HAS_SMART_PROXIES == 1)
+#if 0//(TAO_HAS_SMART_PROXIES == 1)
return TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (default_proxy);
# else
return default_proxy;
@@ -1765,137 +1765,11 @@ const char* Messaging::ReplyHandler::_interface_repository_id (void) const
return "IDL:omg.org/Messaging/ReplyHandler:1.0";
}
-#if (TAO_HAS_SMART_PROXIES == 1)
-Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory)
+static const CORBA::Long _oc_Messaging_ReplyHandler[] =
{
- if (register_proxy_factory)
- {
- TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->register_proxy_factory (this);
- }
-}
-
-Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void)
-{
-}
-
-Messaging::ReplyHandler_ptr
-Messaging::TAO_Messaging_ReplyHandler_Default_Proxy_Factory::create_proxy (
- ::Messaging::ReplyHandler_ptr proxy,
- CORBA::Environment &
- )
-{
- return proxy;
-}
-
-Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void)
- : proxy_factory_ (0),
- delete_proxy_factory_ (0)
-{
-}
-
-Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::~TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void)
-{
- // Making sure the factory which the adapter has is destroyed with it.
- if (this->proxy_factory_ != 0)
- delete this->proxy_factory_;
-}
-
-int
-Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::register_proxy_factory (
- TAO_Messaging_ReplyHandler_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Remove any existing <proxy_factory_> and replace with the new one.
- this->unregister_proxy_factory (ACE_TRY_ENV);
- this->proxy_factory_ = df;
- this->delete_proxy_factory_ = 0;
-return 0;
-}
-
-int
-Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::unregister_proxy_factory (
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- if (this->delete_proxy_factory_ == 0 && this->proxy_factory_ != 0)
- {
- // Its necessary to set <delete_proxy_factory_> to 1 to make sure that it
- // doesnt get into an infinite loop in <unregister_proxy_factory> as it is
- // invoked in the destructor of the class too.
- this->delete_proxy_factory_ = 1;
- delete this->proxy_factory_;
- this->proxy_factory_ = 0;
- }
-return 0;
-}
-
-Messaging::ReplyHandler_ptr
-Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter::create_proxy (
- ::Messaging::ReplyHandler_ptr proxy,
- CORBA::Environment &
- )
-{
- ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon,
- this->lock_, 0));
- // Verify that an <proxy_factory_> is available else make one.
- if (this->proxy_factory_ == 0)
- ACE_NEW_RETURN (this->proxy_factory_,
- TAO_Messaging_ReplyHandler_Default_Proxy_Factory (1),
- 0);
-
-
- return this->proxy_factory_->create_proxy (proxy);
-}
-
-Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void)
-{
-}
-
-Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::~TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void)
-{
-}
-
-TAO_Stub *
-Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::_stubobj (void) const
-{
- return this->base_proxy_->_stubobj ();
-}
-
-Messaging::ReplyHandler_ptr
-Messaging::TAO_Messaging_ReplyHandler_Smart_Proxy_Base::get_proxy (void)
-
-{
- // Obtain the real proxy stored in <base_proxy_>
- if (CORBA::is_nil (this->proxy_.in ()))
- {
- // Necessary to do this else you are stuck in an infinte loop
- // creating smart proxies!
- TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER::instance ()->unregister_proxy_factory ();
- this->proxy_ = ::Messaging::ReplyHandler::_unchecked_narrow (this->base_proxy_.in ());
- }
-
- return this->proxy_.in ();
- }
-
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
- defined (ACE_HAS_GNU_REPO)
- template class TAO_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX >;
- #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
- #pragma instantiate TAO_Singleton<Messaging::TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#endif /* TAO_HAS_SMART_PROXIES */
-
- static const CORBA::Long _oc_Messaging_ReplyHandler[] =
- {
- TAO_ENCAP_BYTE_ORDER, // byte order
- 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7948), ACE_NTOHL (0x616e646c), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
- 13, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x7948616e), ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0), // name = ReplyHandler
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x4d657373), ACE_NTOHL (0x6167696e), ACE_NTOHL (0x672f5265), ACE_NTOHL (0x706c7948), ACE_NTOHL (0x616e646c), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
+ 13, ACE_NTOHL (0x5265706c), ACE_NTOHL (0x7948616e), ACE_NTOHL (0x646c6572), ACE_NTOHL (0x0), // name = ReplyHandler
};
static CORBA::TypeCode _tc_TAO_tc_Messaging_ReplyHandler (CORBA::tk_objref, sizeof (_oc_Messaging_ReplyHandler), (char *) &_oc_Messaging_ReplyHandler, 0, sizeof (Messaging::ReplyHandler));
TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 109e6b389ec..2163a56c9f4 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -34,11 +34,6 @@
#include "tao/IOPC.h"
#include "tao/PollableC.h"
-#if (TAO_HAS_SMART_PROXIES == 1)
-#include "tao/Smart_Proxies.h"
-#include "tao/TAO_Singleton.h"
-#endif /*TAO_HAS_SMART_PROXIES == 1*/
-
#if defined (TAO_EXPORT_MACRO)
#undef TAO_EXPORT_MACRO
#endif
@@ -2675,76 +2670,6 @@ class TAO_Export ReplyHandler : public virtual CORBA_Object
// End Remote Proxy Broker Declaration
///////////////////////////////////////////////////////////////////////
-#if (TAO_HAS_SMART_PROXIES == 1)
-class TAO_Export TAO_Messaging_ReplyHandler_Default_Proxy_Factory
- {
- public:
-
- TAO_Messaging_ReplyHandler_Default_Proxy_Factory (int register_proxy_factory = 1);
-
- virtual ~TAO_Messaging_ReplyHandler_Default_Proxy_Factory (void);
-
- virtual ReplyHandler_ptr create_proxy (
- ReplyHandler_ptr proxy,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-};
-
-
-class TAO_Export TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter
- {
- public:
-
- friend class TAO_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX>;
-
- int register_proxy_factory (
- TAO_Messaging_ReplyHandler_Default_Proxy_Factory *df,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
- int unregister_proxy_factory (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
- ReplyHandler_ptr create_proxy (
- ReplyHandler_ptr proxy,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
-
- protected:
- TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void);
- ~TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter (void);
- TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter &operator= (
- const TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter &
- );
- TAO_Messaging_ReplyHandler_Default_Proxy_Factory *proxy_factory_;
- int delete_proxy_factory_;
- ACE_SYNCH_RECURSIVE_MUTEX lock_;
-
- };
-
- typedef TAO_Singleton<TAO_Messaging_ReplyHandler_Proxy_Factory_Adapter, ACE_SYNCH_RECURSIVE_MUTEX> TAO_Messaging_ReplyHandler_PROXY_FACTORY_ADAPTER;
-
- class TAO_Export TAO_Messaging_ReplyHandler_Smart_Proxy_Base
- : public virtual ReplyHandler,
- public virtual TAO_Smart_Proxy_Base
- {
- public:
- TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void);
- ~TAO_Messaging_ReplyHandler_Smart_Proxy_Base (void);
- virtual TAO_Stub *_stubobj (void) const;
- protected:
- ::Messaging::ReplyHandler_ptr get_proxy (void);
- ::Messaging::ReplyHandler_var proxy_;
- };
-
-#endif /* TAO_HAS_SMART_PROXIES */
-
-
#endif /* end #if !defined */
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ReplyHandler;
diff --git a/TAO/tao/PortableServer/POA_CORBA.h b/TAO/tao/PortableServer/POA_CORBA.h
index 021fb96c891..4a448040afc 100644
--- a/TAO/tao/PortableServer/POA_CORBA.h
+++ b/TAO/tao/PortableServer/POA_CORBA.h
@@ -38,6 +38,9 @@
#endif /* ACE_LACKS_PRAGMA_ONCE */
#include "Servant_Base.h"
+#include "ThruPOA_Object_Proxy_Impl.h"
+#include "Direct_Object_Proxy_Impl.h"
+#include "tao/ORB_Core.h"
#include "tao/PolicyC.h"
#include "tao/DomainC.h"
#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
@@ -217,6 +220,10 @@ public:
class IRObject;
typedef IRObject *IRObject_ptr;
+ // Forward Classes Declaration
+ class _TAO_IRObject_ThruPOA_Proxy_Impl;
+ class _TAO_IRObject_Strategized_Proxy_Broker;
+
class IRObject : public virtual PortableServer::ServantBase
{
protected:
@@ -227,110 +234,162 @@ public:
virtual ~IRObject (void);
virtual CORBA::Boolean _is_a (
- const char* logical_type_id,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
+ const char* logical_type_id,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
virtual void* _downcast (
- const char* logical_type_id
- );
+ const char* logical_type_id
+ );
static void _is_a_skel (
- TAO_ServerRequest &req,
- void *obj,
- void *context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
static void _non_existent_skel (
- TAO_ServerRequest &req,
- void *obj,
- void *context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
+ TAO_ServerRequest &req,
+ void *obj,
+ void *context,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
virtual void _dispatch (
- TAO_ServerRequest &_tao_req,
- void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
+ TAO_ServerRequest &_tao_req,
+ void *_tao_context,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
::CORBA::IRObject *_this (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
virtual const char* _interface_repository_id (void) const;
virtual IR::DefinitionKind def_kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ CORBA::SystemException
+ )) = 0;
static void _get_def_kind_skel (
- TAO_ServerRequest &_tao_req,
- void *_tao_obj,
- void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
+ TAO_ServerRequest &_tao_req,
+ void *_tao_obj,
+ void *_tao_context,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
virtual void destroy (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
ACE_THROW_SPEC ((
- CORBA::SystemException
- )) = 0;
+ CORBA::SystemException
+ )) = 0;
static void destroy_skel (
- TAO_ServerRequest &_tao_req,
- void *_tao_obj,
- void *_tao_context,
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- );
+ TAO_ServerRequest &_tao_req,
+ void *_tao_obj,
+ void *_tao_context,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
};
- class _tao_thru_poa_collocated_IRObject : public virtual CORBA::IRObject
+ ///////////////////////////////////////////////////////////////////////
+ // Strategized Proxy Broker Declaration
+ //
+
+ class _TAO_IRObject_Strategized_Proxy_Broker
+ : public virtual _TAO_IRObject_Proxy_Broker
{
+ public:
+ _TAO_IRObject_Strategized_Proxy_Broker (void);
+
+ virtual ~_TAO_IRObject_Strategized_Proxy_Broker (void);
+
+ virtual _TAO_IRObject_Proxy_Impl &select_proxy (
+ CORBA_IRObject *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+ private:
+
+ // Helper methods that takes care to create the proxy
+ // as soon as their use is necessary.
+ void create_proxy (
+ TAO_ORB_Core::TAO_Collocation_Strategies strategy,
+ CORBA::Environment &ACE_TRY_ENV
+ );
+
+ private:
+
+ // Caches the proxy implementations. The proxy implementation
+ // are totally stateless, and those can be shared by all the
+ // instances of a given IDL interface type.
+ _TAO_IRObject_Proxy_Impl *proxy_cache_[TAO_ORB_Core::COLLOCATION_STRATEGIES_NUM];
+
+ ACE_SYNCH_MUTEX mutex_;
+ // This funxtion is used to get an handle to the unique instance
+ // of the Strategized Proxy Broker that is available for a given
+ // interface.
+
public:
- _tao_thru_poa_collocated_IRObject (
- TAO_Stub *stub
- );
- virtual CORBA::Boolean _is_a(
- const CORBA::Char *logical_type_id,
- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
- );
+ static _TAO_IRObject_Strategized_Proxy_Broker *the_TAO_IRObject_Strategized_Proxy_Broker (void);
+ };
- virtual CORBA::Boolean _non_existent(
- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
- );
- virtual IR::DefinitionKind def_kind (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ //
+ // End Strategized Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////
+ // ThruPOA Impl. Declaration
+ //
+
+ class _TAO_IRObject_ThruPOA_Proxy_Impl
+ : public virtual _TAO_IRObject_Proxy_Impl,
+ public virtual TAO_ThruPOA_Object_Proxy_Impl
+ {
+ public:
+ _TAO_IRObject_ThruPOA_Proxy_Impl (void);
+
+ virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void);
+
+ virtual IR::DefinitionKind def_kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+ CORBA::SystemException
+ ));
virtual void destroy (
- CORBA::Environment &ACE_TRY_ENV =
- TAO_default_environment ()
- )
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
ACE_THROW_SPEC ((
- CORBA::SystemException
- ));
+ CORBA::SystemException
+ ));
+
};
+
+ //
+ // ThruPOA Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+
#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
};
diff --git a/TAO/tao/SmartProxies/Makefile b/TAO/tao/SmartProxies/Makefile
new file mode 100644
index 00000000000..8864cb25c27
--- /dev/null
+++ b/TAO/tao/SmartProxies/Makefile
@@ -0,0 +1,50 @@
+#----------------------------------------------------------------------------
+#
+# $Id$
+#
+#----------------------------------------------------------------------------
+ifndef TAO_ROOT
+ TAO_ROOT = $(ACE_ROOT)/TAO
+endif # ! TAO_ROOT
+
+MAKEFILE = Makefile
+LIBNAME = libTAO_SmartProxies
+LIB = $(LIBNAME).a
+SHLIB = $(LIBNAME).$(SOEXT)
+
+ACE_SHLIBS = -lTAO -lACE
+
+
+CPP_SRCS += Smart_Proxies
+
+FILES = $(CPP_SRCS)
+DEFS = $(addsuffix .h,$(FILES))
+LSRC = $(addsuffix .cpp,$(FILES))
+
+#----------------------------------------------------------------------------
+# Include macros and targets
+#----------------------------------------------------------------------------
+
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+include $(TAO_ROOT)/rules.tao.GNU
+include $(ACE_ROOT)/include/makeinclude/macros.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+
+#----------------------------------------------------------------------------
+# Local targets (and local hacks)
+#----------------------------------------------------------------------------
+
+LDFLAGS += -L$(TAO_ROOT)/tao
+CPPFLAGS += -I$(TAO_ROOT)
+
+#----------------------------------------------------------------------------
+# Dependencies
+#----------------------------------------------------------------------------
+
+# DO NOT DELETE THIS LINE -- g++dep uses it.
+# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
+
diff --git a/TAO/tao/SmartProxies/Makefile.bor b/TAO/tao/SmartProxies/Makefile.bor
new file mode 100644
index 00000000000..0533a049d72
--- /dev/null
+++ b/TAO/tao/SmartProxies/Makefile.bor
@@ -0,0 +1,22 @@
+#
+# Makefile for building the TAO Smart Proxies library
+#
+
+NAME = TAO_SmartProxies
+
+OBJFILES = \
+ $(OBJDIR)\Smart_Proxies.obj
+
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SMARTPROXIES_CFLAGS) \
+ -DTAO_SMARTPROXIES_BUILD_DLL
+
+CPPDIR = .
+
+INCDIR_NAME = tao/SmartProxies
+INCLUDES = \
+ *.h *.inl
+
+LIBFILES = $(TAO_SMARTPROXIES_LIB) $(TAO_LIB) $(ACE_LIB)
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+!include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
diff --git a/TAO/tao/SmartProxies/SmartProxies.dsp b/TAO/tao/SmartProxies/SmartProxies.dsp
new file mode 100644
index 00000000000..e5b35ebaedf
--- /dev/null
+++ b/TAO/tao/SmartProxies/SmartProxies.dsp
@@ -0,0 +1,121 @@
+# Microsoft Developer Studio Project File - Name="SmartProxies" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
+
+CFG=SmartProxies - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "SmartProxies.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "SmartProxies.mak" CFG="SmartProxies - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "SmartProxies - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "SmartProxies - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "SmartProxies - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Release\SmartProxies"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SMARTPROXIES_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /O2 /I "../" /I "../../" /I "../../../" /D "NDEBUG" /D "TAO_SMARTPROXIES_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 TAO.lib ace.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_SmartProxies.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ELSEIF "$(CFG)" == "SmartProxies - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir ""
+# PROP Intermediate_Dir "DLL\Debug\SmartProxies"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "SMARTPROXIES_EXPORTS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "../" /I "../../" /I "../../../" /D "_DEBUG" /D "TAO_SMARTPROXIES_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_SmartProxiesd.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+
+!ENDIF
+
+# Begin Target
+
+# Name "SmartProxies - Win32 Release"
+# Name "SmartProxies - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\Smart_Proxies.cpp
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\Smart_Proxies.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\smartproxies_export.h
+# End Source File
+# End Group
+# Begin Group "Inline Files"
+
+# PROP Default_Filter "inl"
+# Begin Source File
+
+SOURCE=.\Smart_Proxies.inl
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/TAO/tao/SmartProxies/Smart_Proxies.cpp b/TAO/tao/SmartProxies/Smart_Proxies.cpp
new file mode 100644
index 00000000000..a098d371991
--- /dev/null
+++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp
@@ -0,0 +1,11 @@
+// $Id$
+
+#include "Smart_Proxies.h"
+
+ACE_RCSID(SmartProxies, Smart_Proxies, "$Id$")
+
+#if !defined (__ACE_INLINE__)
+#include "Smart_Proxies.inl"
+#endif /* defined INLINE */
+
+
diff --git a/TAO/tao/Smart_Proxies.h b/TAO/tao/SmartProxies/Smart_Proxies.h
index 88633efc9c9..cc6b2bad672 100644
--- a/TAO/tao/Smart_Proxies.h
+++ b/TAO/tao/SmartProxies/Smart_Proxies.h
@@ -23,23 +23,24 @@
#define TAO_SMARTPROXIES_H
#include "ace/pre.h"
+#include "smartproxies_export.h"
#include "tao/Object.h"
#if !defined (ACE_LACKS_PRAGMA_ONCE)
# pragma once
#endif /* ACE_LACKS_PRAGMA_ONCE */
-class TAO_Export TAO_Smart_Proxy_Base
+class TAO_SmartProxies_Export TAO_Smart_Proxy_Base
{
// = TITLE
- // TAO_Smart_Proxy_Base
+ // TAO_Smart_Proxy_Base
//
// = DESCRIPTION
- // A base class for all TAO_IDL generated smart proxy base classes
- // Contains the _var pointer to the real proxy
+ // A base class for all TAO_IDL generated smart proxy base classes
+ // Contains the _var pointer to the real proxy
public:
- virtual ~TAO_Smart_Proxy_Base(void);
+ virtual ~TAO_Smart_Proxy_Base (void);
// Destructor
protected:
@@ -52,7 +53,7 @@ protected:
};
#if defined (__ACE_INLINE__)
-#include "tao/Smart_Proxies.i"
+#include "Smart_Proxies.inl"
#endif /* defined INLINE */
#include "ace/post.h"
diff --git a/TAO/tao/Smart_Proxies.i b/TAO/tao/SmartProxies/Smart_Proxies.inl
index 6f6605fc0e7..b75c0a5d096 100644
--- a/TAO/tao/Smart_Proxies.i
+++ b/TAO/tao/SmartProxies/Smart_Proxies.inl
@@ -1,4 +1,4 @@
-/* -*- C++ -*- Smart_Proxies.i */
+/* -*- C++ -*- */
// $Id$
ACE_INLINE
diff --git a/TAO/tao/SmartProxies/smartproxies_export.h b/TAO/tao/SmartProxies/smartproxies_export.h
new file mode 100644
index 00000000000..62fb3430f21
--- /dev/null
+++ b/TAO/tao/SmartProxies/smartproxies_export.h
@@ -0,0 +1,40 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_SMARTPROXIES_EXPORT_H
+#define TAO_SMARTPROXIES_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+# if !defined (TAO_SMARTPROXIES_HAS_DLL)
+# define TAO_SMARTPROXIES_HAS_DLL 0
+# endif /* ! TAO_SMARTPROXIES_HAS_DLL */
+#else
+# if !defined (TAO_SMARTPROXIES_HAS_DLL)
+# define TAO_SMARTPROXIES_HAS_DLL 1
+# endif /* ! TAO_SMARTPROXIES_HAS_DLL */
+#endif
+
+#if defined (TAO_SMARTPROXIES_HAS_DLL) && (TAO_SMARTPROXIES_HAS_DLL == 1)
+# if defined (TAO_SMARTPROXIES_BUILD_DLL)
+# define TAO_SmartProxies_Export ACE_Proper_Export_Flag
+# define TAO_SMARTPROXIES_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+# define TAO_SMARTPROXIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# else /* TAO_SMARTPROXIES_BUILD_DLL */
+# define TAO_SmartProxies_Export ACE_Proper_Import_Flag
+# define TAO_SMARTPROXIES_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+# define TAO_SMARTPROXIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+# endif /* TAO_SMARTPROXIES_BUILD_DLL */
+#else /* TAO_SMARTPROXIES_HAS_DLL == 1 */
+# define TAO_SmartProxies_Export
+# define TAO_SMARTPROXIES_SINGLETON_DECLARATION(T)
+# define TAO_SMARTPROXIES_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_SMARTPROXIES_HAS_DLL == 1 */
+
+#endif /* TAO_SMARTPROXIES_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/Smart_Proxies.cpp b/TAO/tao/Smart_Proxies.cpp
deleted file mode 100644
index d4b58d8a1f8..00000000000
--- a/TAO/tao/Smart_Proxies.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#include "tao/Smart_Proxies.h"
-
-ACE_RCSID(tao, Smart_Proxies, "$Id$")
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Smart_Proxies.i"
-#endif /* defined INLINE */
-
-
diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h
index cab6aaa1c79..31bc070b8ce 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -65,19 +65,6 @@ class TAO_PrivateConnectionPolicy;
// Descriptions of parameters.
-enum TAO_Param_Type
-{
- // = TITLE
- // TAO_Param_Type
- //
- // = DESCRIPTION
- // Parameter mode of a given parameter.
- PARAM_IN,
- PARAM_OUT,
- PARAM_INOUT,
- PARAM_RETURN // = PARAM_OUT
-};
-
class TAO_Profile;
// Function pointer returning a pointer to CORBA::Exception. This is used to
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 455191cb4ad..274438be490 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -2817,25 +2817,6 @@ SOURCE=.\skip.cpp
# End Source File
# Begin Source File
-SOURCE=.\Smart_Proxies.cpp
-
-!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Release"
-
-!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
SOURCE=.\StringSeqC.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
@@ -3915,10 +3896,6 @@ SOURCE=.\singletons.h
# End Source File
# Begin Source File
-SOURCE=.\Smart_Proxies.h
-# End Source File
-# Begin Source File
-
SOURCE=.\StringSeqC.h
# End Source File
# Begin Source File
@@ -4503,10 +4480,6 @@ SOURCE=.\Single_Reactor.i
# End Source File
# Begin Source File
-SOURCE=.\Smart_Proxies.i
-# End Source File
-# Begin Source File
-
SOURCE=.\StringSeqC.i
# End Source File
# Begin Source File
diff --git a/TAO/tao/TAO_Static.dsp b/TAO/tao/TAO_Static.dsp
index c377a1ea71a..2d9fa1ebc16 100644
--- a/TAO/tao/TAO_Static.dsp
+++ b/TAO/tao/TAO_Static.dsp
@@ -675,10 +675,6 @@ SOURCE=.\singletons.h
# End Source File
# Begin Source File
-SOURCE=.\Smart_Proxies.h
-# End Source File
-# Begin Source File
-
SOURCE=.\StringSeqC.h
# End Source File
# Begin Source File
@@ -1263,10 +1259,6 @@ SOURCE=.\Single_Reactor.i
# End Source File
# Begin Source File
-SOURCE=.\Smart_Proxies.i
-# End Source File
-# Begin Source File
-
SOURCE=.\StringSeqC.i
# End Source File
# Begin Source File
@@ -1911,10 +1903,6 @@ SOURCE=.\skip.cpp
# End Source File
# Begin Source File
-SOURCE=.\Smart_Proxies.cpp
-# End Source File
-# Begin Source File
-
SOURCE=.\StringSeqC.cpp
# End Source File
# Begin Source File
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 81ce893d146..6d30324f5df 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -54,9 +54,6 @@
// TAO specific files, avoid them as much as possible.
-#if (TAO_HAS_SMART_PROXIES == 1)
-#include "tao/Smart_Proxies.h"
-#endif /*TAO_HAS_SMART_PROXIES == 1*/
#include "tao/Stub.h"
#include "tao/params.h"
#include "tao/ORB_Core.h"
diff --git a/TAO/tao/diffs/InterfaceC.cpp.diff b/TAO/tao/diffs/InterfaceC.cpp.diff
new file mode 100644
index 00000000000..a2afebcaec1
--- /dev/null
+++ b/TAO/tao/diffs/InterfaceC.cpp.diff
@@ -0,0 +1,51738 @@
+--- InterfaceC.cpp Fri Dec 01 16:26:18 2000
++++ ..\..\..\tao\InterfaceC.cpp Mon Nov 27 19:24:33 2000
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++/* $Id$ */
+
+ // **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -21,6 +21,11 @@
+
+ #include "InterfaceC.h"
+
++#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
++
++#include "tao/Stub.h"
++#include "tao/Invocation.h"
++
+ #if !defined (__ACE_INLINE__)
+ #include "InterfaceC.i"
+ #endif /* !defined INLINE */
+@@ -66,7 +71,7 @@
+ 12, ACE_NTOHL (0x646b5f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657300), // name = dk_Provides
+ 8, ACE_NTOHL (0x646b5f55), ACE_NTOHL (0x73657300), // name = dk_Uses
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (CORBA::tk_enum, sizeof (_oc_IR_DefinitionKind), (char *) &_oc_IR_DefinitionKind, 0, sizeof (IR::DefinitionKind));
++static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (CORBA::tk_enum, sizeof (_oc_IR_DefinitionKind), (char *) &_oc_IR_DefinitionKind, 0, sizeof (IR_DefinitionKind));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DefinitionKind, &_tc_TAO_tc_IR_DefinitionKind)
+@@ -76,15 +81,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-CORBA::_TAO_IRObject_Proxy_Impl::_TAO_IRObject_Proxy_Impl (void)
++_TAO_IRObject_Proxy_Impl::_TAO_IRObject_Proxy_Impl (void)
+ {}
+
+-CORBA::_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
++_TAO_IRObject_Remote_Proxy_Impl::_TAO_IRObject_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::DefinitionKind CORBA::_TAO_IRObject_Remote_Proxy_Impl::def_kind (
++IR_DefinitionKind _TAO_IRObject_Remote_Proxy_Impl::def_kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -93,7 +98,7 @@
+ ))
+ {
+
+- IR::DefinitionKind _tao_retval = (IR::DefinitionKind)0;
++ IR_DefinitionKind _tao_retval = (IR_DefinitionKind)0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -109,46 +114,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get ri (
+- "_get_def_kind",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -157,7 +137,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -167,55 +147,24 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::DefinitionKind _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void CORBA::_TAO_IRObject_Remote_Proxy_Impl::destroy (
++void _TAO_IRObject_Remote_Proxy_Impl::destroy (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+-
+-
+-
++{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -229,46 +178,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy ri (
+- "destroy",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -277,36 +201,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -319,32 +220,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-CORBA::_TAO_IRObject_Proxy_Broker::_TAO_IRObject_Proxy_Broker (void)
++_TAO_IRObject_Proxy_Broker::_TAO_IRObject_Proxy_Broker (void)
+ {
+ }
+
+-CORBA::_TAO_IRObject_Proxy_Broker::~_TAO_IRObject_Proxy_Broker (void)
++_TAO_IRObject_Proxy_Broker::~_TAO_IRObject_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker *CORBA::_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void)
+ {
+- static ::CORBA::_TAO_IRObject_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_IRObject_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker::_TAO_IRObject_Remote_Proxy_Broker (void)
++_TAO_IRObject_Remote_Proxy_Broker::_TAO_IRObject_Remote_Proxy_Broker (void)
+ {
+ }
+
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker::~_TAO_IRObject_Remote_Proxy_Broker (void)
++_TAO_IRObject_Remote_Proxy_Broker::~_TAO_IRObject_Remote_Proxy_Broker (void)
+ {
+ }
+
+-CORBA::_TAO_IRObject_Proxy_Impl&
+-CORBA::_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
+- ::CORBA::IRObject *object,
++_TAO_IRObject_Proxy_Impl&
++_TAO_IRObject_Remote_Proxy_Broker::select_proxy (
++ CORBA_IRObject *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -360,109 +261,109 @@
+
+
+ // default constructor
+-CORBA::IRObject::IRObject (int collocated)
++CORBA_IRObject::CORBA_IRObject (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-CORBA::IRObject::~IRObject (void)
++CORBA_IRObject::~CORBA_IRObject (void)
+ {}
+
+ void
+-CORBA::IRObject::_tao_setup_collocation (int collocated)
++CORBA_IRObject::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_IRObject_Proxy_Broker_ =
+- ::CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_IRObject_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_IRObject_Proxy_Broker_ =
+- ::CORBA::_TAO_IRObject_Remote_Proxy_Broker::the_TAO_IRObject_Remote_Proxy_Broker ();
++ the_TAO_IRObject_Remote_Proxy_Broker ();
+
+
+ }
+
+-void CORBA::IRObject::_tao_any_destructor (void *x)
++void CORBA_IRObject::_tao_any_destructor (void *x)
+ {
+- IRObject *tmp = ACE_static_cast (IRObject*,x);
++ CORBA_IRObject *tmp = ACE_static_cast (CORBA_IRObject*,x);
+ CORBA::release (tmp);
+ }
+
+-CORBA::IRObject_ptr CORBA::IRObject::_narrow (
++CORBA_IRObject_ptr CORBA_IRObject::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return IRObject::_nil ();
++ return CORBA_IRObject::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/IRObject:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (IRObject::_nil ());
++ ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
+ if (is_a == 0)
+- return IRObject::_nil ();
++ return CORBA_IRObject::_nil ();
+ }
+- return IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return CORBA_IRObject::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-CORBA::IRObject_ptr CORBA::IRObject::_unchecked_narrow (
++CORBA_IRObject_ptr CORBA_IRObject::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return IRObject::_nil ();
++ return CORBA_IRObject::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- IRObject_ptr default_proxy = IRObject::_nil ();
++ CORBA_IRObject_ptr default_proxy = CORBA_IRObject::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () && _TAO_IRObject_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::CORBA::IRObject (
++ CORBA_IRObject (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- IRObject::_nil ());
++ CORBA_IRObject::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::CORBA::IRObject (stub, 0, obj->_servant ()), IRObject::_nil ());
++ ACE_NEW_RETURN (default_proxy, CORBA_IRObject (stub, 0, obj->_servant ()), CORBA_IRObject::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- IRObject_ptr,
++ CORBA_IRObject_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &IRObject::_narrow
++ &CORBA_IRObject::_narrow
+ )
+ )
+ );
+ }
+
+-CORBA::IRObject_ptr
+-CORBA::IRObject::_duplicate (IRObject_ptr obj)
++CORBA_IRObject_ptr
++CORBA_IRObject::_duplicate (CORBA_IRObject_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean CORBA::IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+@@ -472,12 +373,12 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *CORBA::IRObject::_tao_QueryInterface (ptr_arith_t type)
++void *CORBA_IRObject::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::CORBA, IRObject)::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+ retv = ACE_reinterpret_cast (void *,
+@@ -488,12 +389,12 @@
+ return retv;
+ }
+
+-const char* CORBA::IRObject::_interface_repository_id (void) const
++const char* CORBA_IRObject::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/CORBA/IRObject:1.0";
+ }
+
+-IR::DefinitionKind CORBA::IRObject::def_kind (
++IR_DefinitionKind CORBA_IRObject::def_kind (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -507,7 +408,7 @@
+ );
+ }
+
+-void CORBA::IRObject::destroy (
++void CORBA_IRObject::destroy (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -521,95 +422,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get::result (IR::DefinitionKind result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::TAO_ClientRequestInfo_CORBA_IRObject_destroy (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-CORBA::IRObject::TAO_ClientRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_CORBA_IRObject[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4952), ACE_NTOHL (0x4f626a65), ACE_NTOHL (0x63743a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/IRObject:1.0
+- 9, ACE_NTOHL (0x49524f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = IRObject
++ 9, ACE_NTOHL (0x49524f62), ACE_NTOHL (0x6a656374), ACE_NTOHL (0x0), // name = CORBA_IRObject
+ };
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (CORBA::tk_objref, sizeof (_oc_CORBA_IRObject), (char *) &_oc_CORBA_IRObject, 0, sizeof (CORBA::IRObject));
++static CORBA::TypeCode _tc_TAO_tc_CORBA_IRObject (CORBA::tk_objref, sizeof (_oc_CORBA_IRObject), (char *) &_oc_CORBA_IRObject, 0, sizeof (CORBA_IRObject));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (CORBA)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IRObject, &_tc_TAO_tc_CORBA_IRObject)
+@@ -635,45 +454,67 @@
+ TAO_NAMESPACE_BEGIN (CORBA)
+ TAO_NAMESPACE_DEFINE (const CORBA::Short, PUBLIC_MEMBER, 1)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_Identifier[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x64656e74), ACE_NTOHL (0x69666965), ACE_NTOHL (0x723a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Identifier:1.0
+ 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
+- CORBA::tk_string,
+- 0U, // string length
++ CORBA::tk_alias, // typecode kind for typedefs
++ 68, // encapsulation length
++ TAO_ENCAP_BYTE_ORDER, // byte order
++ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f4964), ACE_NTOHL (0x656e7469), ACE_NTOHL (0x66696572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++ 11, ACE_NTOHL (0x4964656e), ACE_NTOHL (0x74696669), ACE_NTOHL (0x65720000), // name = Identifier
++ CORBA::tk_string,
++ 0U, // string length
++
+ };
+ static CORBA::TypeCode _tc_TAO_tc_IR_Identifier (CORBA::tk_alias, sizeof (_oc_IR_Identifier), (char *) &_oc_IR_Identifier, 0, sizeof (IR::Identifier));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Identifier, &_tc_TAO_tc_IR_Identifier)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ScopedName[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x636f7065), ACE_NTOHL (0x644e616d), ACE_NTOHL (0x653a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ScopedName:1.0
+ 11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000), // name = ScopedName
+- CORBA::tk_string,
+- 0U, // string length
++ CORBA::tk_alias, // typecode kind for typedefs
++ 68, // encapsulation length
++ TAO_ENCAP_BYTE_ORDER, // byte order
++ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5363), ACE_NTOHL (0x6f706564), ACE_NTOHL (0x4e616d65), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/CORBA/ScopedName:1.0
++ 11, ACE_NTOHL (0x53636f70), ACE_NTOHL (0x65644e61), ACE_NTOHL (0x6d650000), // name = ScopedName
++ CORBA::tk_string,
++ 0U, // string length
++
+ };
+ static CORBA::TypeCode _tc_TAO_tc_IR_ScopedName (CORBA::tk_alias, sizeof (_oc_IR_ScopedName), (char *) &_oc_IR_ScopedName, 0, sizeof (IR::ScopedName));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ScopedName, &_tc_TAO_tc_IR_ScopedName)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_RepositoryId[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x7949643a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/RepositoryId:1.0
+- 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = RepositoryId
+- CORBA::tk_string,
+- 0U, // string length
++ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
++ CORBA::tk_alias, // typecode kind for typedefs
++ 72, // encapsulation length
++ TAO_ENCAP_BYTE_ORDER, // byte order
++ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x434f5242), ACE_NTOHL (0x412f5265), ACE_NTOHL (0x706f7369), ACE_NTOHL (0x746f7279), ACE_NTOHL (0x49643a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++ 13, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72794964), ACE_NTOHL (0x0), // name = IR_RepositoryId
++ CORBA::tk_string,
++ 0U, // string length
++
+ };
+ static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryId (CORBA::tk_alias, sizeof (_oc_IR_RepositoryId), (char *) &_oc_IR_RepositoryId, 0, sizeof (IR::RepositoryId));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryId, &_tc_TAO_tc_IR_RepositoryId)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_VersionSpec[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -692,15 +533,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_Contained_Proxy_Impl::_TAO_Contained_Proxy_Impl (void)
++_TAO_Contained_Proxy_Impl::_TAO_Contained_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_Contained_Remote_Proxy_Impl::_TAO_Contained_Remote_Proxy_Impl (void)
++_TAO_Contained_Remote_Proxy_Impl::_TAO_Contained_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-char * IR::_TAO_Contained_Remote_Proxy_Impl::id (
++char * _TAO_Contained_Remote_Proxy_Impl::id (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -725,46 +566,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get ri (
+- "_get_id",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -773,7 +589,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -783,45 +599,17 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- char * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_Contained_Remote_Proxy_Impl::id (
++void _TAO_Contained_Remote_Proxy_Impl::id (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -829,11 +617,7 @@
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+-
+-
+-
++{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -847,56 +631,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set ri (
+- "_set_id",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << id)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -905,50 +663,25 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-char * IR::_TAO_Contained_Remote_Proxy_Impl::name (
++char * _TAO_Contained_Remote_Proxy_Impl::name (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ CORBA::String_var _tao_safe_retval;
+-
+-
++
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+@@ -962,46 +695,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get ri (
+- "_get_name",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1010,7 +718,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -1020,45 +728,17 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- char * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_Contained_Remote_Proxy_Impl::name (
++void _TAO_Contained_Remote_Proxy_Impl::name (
+ CORBA_Object *_collocated_tao_target_,
+ const char * name,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -1066,11 +746,7 @@
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+-
+-
+-
++{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -1084,56 +760,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set ri (
+- "_set_name",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- name,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << name)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1142,41 +792,18 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-char * IR::_TAO_Contained_Remote_Proxy_Impl::version (
++char * _TAO_Contained_Remote_Proxy_Impl::version (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+@@ -1199,46 +826,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get ri (
+- "_get_version",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1247,7 +849,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -1257,45 +859,17 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- char * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_Contained_Remote_Proxy_Impl::version (
++void _TAO_Contained_Remote_Proxy_Impl::version (
+ CORBA_Object *_collocated_tao_target_,
+ const char * version,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -1303,15 +877,10 @@
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+-
+-
+-
++{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+-
+
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+@@ -1321,56 +890,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set ri (
+- "_set_version",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- version,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << version)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1379,55 +922,30 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::Container_ptr IR::_TAO_Contained_Remote_Proxy_Impl::defined_in (
++IR_Container_ptr _TAO_Contained_Remote_Proxy_Impl::defined_in (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+- IR::Container_ptr _tao_retval = IR::Container::_nil ();
+- IR::Container_var _tao_safe_retval (_tao_retval);
++{
++ IR_Container_ptr _tao_retval = IR_Container::_nil ();
++ IR_Container_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+@@ -1437,46 +955,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get ri (
+- "_get_defined_in",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1485,7 +978,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -1495,60 +988,29 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::Container_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-char * IR::_TAO_Contained_Remote_Proxy_Impl::absolute_name (
++char * _TAO_Contained_Remote_Proxy_Impl::absolute_name (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ CORBA::String_var _tao_safe_retval;
+-
+-
++
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+@@ -1558,46 +1020,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get ri (
+- "_get_absolute_name",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1606,7 +1043,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -1616,61 +1053,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- char * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::Repository_ptr IR::_TAO_Contained_Remote_Proxy_Impl::containing_repository (
++IR_Repository_ptr _TAO_Contained_Remote_Proxy_Impl::containing_repository (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+- IR::Repository_ptr _tao_retval = IR::Repository::_nil ();
+- IR::Repository_var _tao_safe_retval (_tao_retval);
+-
+-
++{
++ IR_Repository_ptr _tao_retval = IR_Repository::_nil ();
++ IR_Repository_var _tao_safe_retval (_tao_retval);
++
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+@@ -1680,46 +1086,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get ri (
+- "_get_containing_repository",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1728,7 +1109,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -1738,62 +1119,32 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::Repository_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::Contained::Description * IR::_TAO_Contained_Remote_Proxy_Impl::describe (
++IR_Contained::Description * _TAO_Contained_Remote_Proxy_Impl::describe (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+- IR::Contained::Description *_tao_retval = 0;
++{
++ IR_Contained::Description *_tao_retval = 0;
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+- ACE_NEW_RETURN (_tao_retval, IR::Contained::Description, _tao_retval);
+- IR::Contained::Description_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_Contained::Description, _tao_retval);
++ IR_Contained::Description_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "describe",
+@@ -1802,46 +1153,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe ri (
+- "describe",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1850,7 +1176,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -1860,47 +1186,19 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::Contained::Description * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_Contained_Remote_Proxy_Impl::move (
++void _TAO_Contained_Remote_Proxy_Impl::move (
+ CORBA_Object *_collocated_tao_target_,
+- IR::Container_ptr new_container,
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -1908,16 +1206,11 @@
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+-
+-
+-
++{
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+-
+-
++
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "move",
+@@ -1926,46 +1219,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Contained::TAO_ClientRequestInfo_IR_Contained_move ri (
+- "move",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- new_container,
+- new_name,
+- new_version,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -1973,13 +1238,13 @@
+ (_tao_out << new_name) &&
+ (_tao_out << new_version)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -1988,36 +1253,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -2030,32 +1272,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_Contained_Proxy_Broker::_TAO_Contained_Proxy_Broker (void)
++_TAO_Contained_Proxy_Broker::_TAO_Contained_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Contained_Proxy_Broker::~_TAO_Contained_Proxy_Broker (void)
++_TAO_Contained_Proxy_Broker::~_TAO_Contained_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_Contained_Remote_Proxy_Broker *IR::_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_Contained_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_Contained_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_Contained_Remote_Proxy_Broker::_TAO_Contained_Remote_Proxy_Broker (void)
++_TAO_Contained_Remote_Proxy_Broker::_TAO_Contained_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Contained_Remote_Proxy_Broker::~_TAO_Contained_Remote_Proxy_Broker (void)
++_TAO_Contained_Remote_Proxy_Broker::~_TAO_Contained_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Contained_Proxy_Impl&
+-IR::_TAO_Contained_Remote_Proxy_Broker::select_proxy (
+- ::IR::Contained *object,
++_TAO_Contained_Proxy_Impl&
++_TAO_Contained_Remote_Proxy_Broker::select_proxy (
++ IR_Contained *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -2071,110 +1313,109 @@
+
+
+ // default constructor
+-IR::Contained::Contained (int collocated)
++IR_Contained::IR_Contained (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::Contained::~Contained (void)
++IR_Contained::~IR_Contained (void)
+ {}
+
+ void
+-IR::Contained::_tao_setup_collocation (int collocated)
++IR_Contained::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_Contained_Proxy_Broker_ =
+- ::IR__TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_Contained_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_Contained_Proxy_Broker_ =
+- ::IR::_TAO_Contained_Remote_Proxy_Broker::the_TAO_Contained_Remote_Proxy_Broker ();
+-
+- ACE_NESTED_CLASS (CORBA,IRObject)::_tao_setup_collocation (collocated);
++ ::the_TAO_Contained_Remote_Proxy_Broker ();
+
++ CORBA_IRObject::_tao_setup_collocation (collocated);
+ }
+
+-void IR::Contained::_tao_any_destructor (void *x)
++void IR_Contained::_tao_any_destructor (void *x)
+ {
+- Contained *tmp = ACE_static_cast (Contained*,x);
++ IR_Contained *tmp = ACE_static_cast (IR_Contained*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::Contained_ptr IR::Contained::_narrow (
++IR_Contained_ptr IR_Contained::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return Contained::_nil ();
++ return IR_Contained::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Contained:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (Contained::_nil ());
++ ACE_CHECK_RETURN (IR_Contained::_nil ());
+ if (is_a == 0)
+- return Contained::_nil ();
++ return IR_Contained::_nil ();
+ }
+- return Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_Contained::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::Contained_ptr IR::Contained::_unchecked_narrow (
++IR_Contained_ptr IR_Contained::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return Contained::_nil ();
++ return IR_Contained::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- Contained_ptr default_proxy = Contained::_nil ();
++ IR_Contained_ptr default_proxy = IR_Contained::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_Contained_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_Contained_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::Contained (
++ IR_Contained (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- Contained::_nil ());
++ IR_Contained::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::Contained (stub, 0, obj->_servant ()), Contained::_nil ());
++ ACE_NEW_RETURN (default_proxy, IR_Contained (stub, 0, obj->_servant ()), IR_Contained::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- Contained_ptr,
++ IR_Contained_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &Contained::_narrow
++ &IR_Contained::_narrow
+ )
+ )
+ );
+ }
+
+-IR::Contained_ptr
+-IR::Contained::_duplicate (Contained_ptr obj)
++IR_Contained_ptr
++IR_Contained::_duplicate (IR_Contained_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Contained:1.0")) ||
+@@ -2185,22 +1426,22 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::Contained::_tao_QueryInterface (ptr_arith_t type)
++void *IR_Contained::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -2213,34 +1454,32 @@
+ return retv;
+ }
+
+-const char* IR::Contained::_interface_repository_id (void) const
++const char* IR_Contained::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/Contained:1.0";
+ }
+
+-char * IR::Contained::id (
++char * IR_Contained::id (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).id (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::Contained::id (
++void IR_Contained::id (
+ const char * id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).id (
+ this,
+ id,
+@@ -2248,7 +1487,7 @@
+ );
+ }
+
+-char * IR::Contained::name (
++char * IR_Contained::name (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -2262,15 +1501,14 @@
+ );
+ }
+
+-void IR::Contained::name (
++void IR_Contained::name (
+ const char * name,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).name (
+ this,
+ name,
+@@ -2278,29 +1516,27 @@
+ );
+ }
+
+-char * IR::Contained::version (
++char * IR_Contained::version (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).version (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::Contained::version (
++void IR_Contained::version (
+ const char * version,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).version (
+ this,
+ version,
+@@ -2308,42 +1544,39 @@
+ );
+ }
+
+-IR::Container_ptr IR::Contained::defined_in (
++IR_Container_ptr IR_Contained::defined_in (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).defined_in (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-char * IR::Contained::absolute_name (
++char * IR_Contained::absolute_name (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).absolute_name (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-IR::Repository_ptr IR::Contained::containing_repository (
++IR_Repository_ptr IR_Contained::containing_repository (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).containing_repository (
+ this,
+ ACE_TRY_ENV
+@@ -2402,31 +1635,30 @@
+ CORBA::tk_any,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_Contained_Description (CORBA::tk_struct, sizeof (_oc_IR_Contained_Description), (char *) &_oc_IR_Contained_Description, 0, sizeof (IR::Contained::Description));
+-CORBA::TypeCode_ptr IR::Contained::_tc_Description = &_tc_TAO_tc_IR_Contained_Description;
++static CORBA::TypeCode _tc_TAO_tc_IR_Contained_Description (CORBA::tk_struct, sizeof (_oc_IR_Contained_Description), (char *) &_oc_IR_Contained_Description, 0, sizeof (IR_Contained::Description));
++CORBA::TypeCode_ptr IR_Contained::_tc_Description = &_tc_TAO_tc_IR_Contained_Description;
+
+-void IR::Contained::Description::_tao_any_destructor (void *x)
++void IR_Contained::Description::_tao_any_destructor (void *x)
+ {
+ Description *tmp = ACE_static_cast (Description*,x);
+ delete tmp;
+ }
+
+-IR::Contained::Description * IR::Contained::describe (
++IR_Contained::Description * IR_Contained::describe (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).describe (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::Contained::move (
+- IR::Container_ptr new_container,
++void IR_Contained::move (
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -2434,8 +1666,7 @@
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ this->the_TAO_Contained_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).move (
+ this,
+ new_container,
+@@ -2445,651 +1676,153 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::TAO_ClientRequestInfo_IR_Contained_id_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++static const CORBA::Long _oc_IR_Contained[] =
+ {
+- // Generate the exception list on demand
+- return 0;
+-}
++ TAO_ENCAP_BYTE_ORDER, // byte order
++ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
++ 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = IR_Contained
++};
++static CORBA::TypeCode _tc_TAO_tc_IR_Contained (CORBA::tk_objref, sizeof (_oc_IR_Contained), (char *) &_oc_IR_Contained, 0, sizeof (IR_Contained));
++TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
++TAO_NAMESPACE_BEGIN (IR)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Contained, &_tc_TAO_tc_IR_Contained)
++TAO_NAMESPACE_END
+
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++
++ // The Base_Sequence functions, please see tao/Sequence.h
++ void
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
++ {
++ IR_InterfaceDef **tmp = 0;
++ tmp = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (length);
++
++ if (this->buffer_ != 0)
++ {
++ IR_InterfaceDef **old = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
++ for (CORBA::ULong i = 0; i < this->length_; ++i)
++ if (!this->release_)
++ tmp[i] = IR_InterfaceDef::_duplicate (old[i]);
++ else
++ tmp[i] = old[i];
++
++ if (this->release_)
++ delete[] old;
++
++ }
++ this->buffer_ = tmp;
++ }
++
++ void
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_deallocate_buffer (void)
++ {
++ if (this->buffer_ == 0 || this->release_ == 0)
++ return;
++ IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
++ for (CORBA::ULong i = 0; i < this->length_; ++i)
++ {
++ CORBA::release (tmp[i]);
++ tmp[i] = IR_InterfaceDef::_nil ();
++ }
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (tmp);
++ this->buffer_ = 0;
++ }
++
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
++ {
++ this->_deallocate_buffer ();
++ }
++
++ void
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ {
++ IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
++
++ for (CORBA::ULong i = nl; i < ol; ++i)
++ {
++ CORBA::release (tmp[i]);
++ tmp[i] = IR_InterfaceDef::_nil ();
++ }
++ }
++ void
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_downcast (
++ void* target,
++ CORBA_Object *src,
++ CORBA_Environment &ACE_TRY_ENV
++ )
++ {
++ IR_InterfaceDef **tmp = ACE_static_cast (IR_InterfaceDef**, target);
++ *tmp = IR_InterfaceDef::_narrow (src, ACE_TRY_ENV);
++ }
+
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
++ CORBA_Object*
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_upcast (void *src) const
++ {
++ IR_InterfaceDef **tmp = ACE_static_cast (IR_InterfaceDef**, src);
++ return *tmp;
++ }
++
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-void
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_get::result (char * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
++// *************************************************************
++// IR_InterfaceDefSeq
++// *************************************************************
+
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::TAO_ClientRequestInfo_IR_Contained_id_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id)
++IR_InterfaceDefSeq::IR_InterfaceDefSeq (void)
+ {}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_InterfaceDefSeq::IR_InterfaceDefSeq (CORBA::ULong max) // uses max size
++ :
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++ TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
++ (max)
++{}
++IR_InterfaceDefSeq::IR_InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, IR_InterfaceDef_ptr *buffer, CORBA::Boolean release)
++ :
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++ TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
++ (max, length, buffer, release)
++{}
++IR_InterfaceDefSeq::IR_InterfaceDefSeq (const IR_InterfaceDefSeq &seq) // copy ctor
++ :
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++ TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
++ (seq)
++{}
++IR_InterfaceDefSeq::~IR_InterfaceDefSeq (void) // dtor
++{}
++void IR_InterfaceDefSeq::_tao_any_destructor (void *x)
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
++ IR_InterfaceDefSeq *tmp = ACE_static_cast (IR_InterfaceDefSeq*,x);
++ delete tmp;
+ }
+
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++static const CORBA::Long _oc_IR_InterfaceDefSeq[] =
+ {
+- // Generate the exception list on demand
+- return 0;
+-}
+-
++ TAO_ENCAP_BYTE_ORDER, // byte order
++ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/InterfaceDefSeq:1.0
++ 16, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100), // name = IR_InterfaceDefSeq
++ CORBA::tk_sequence, // typecode kind
++ 76, // encapsulation length
++ TAO_ENCAP_BYTE_ORDER, // byte order
++ CORBA::tk_objref, // typecode kind
++ 60, // encapsulation length
++ TAO_ENCAP_BYTE_ORDER, // byte order
++ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
++ 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_InterfaceDef
+
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_id_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::TAO_ClientRequestInfo_IR_Contained_name_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_get::result (char * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::TAO_ClientRequestInfo_IR_Contained_name_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * name,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- name_ (name)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_name_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::TAO_ClientRequestInfo_IR_Contained_version_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_get::result (char * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::TAO_ClientRequestInfo_IR_Contained_version_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * version,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- version_ (version)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_version_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::TAO_ClientRequestInfo_IR_Contained_defined_in_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_defined_in_get::result (IR::Container_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::TAO_ClientRequestInfo_IR_Contained_absolute_name_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_absolute_name_get::result (char * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::TAO_ClientRequestInfo_IR_Contained_containing_repository_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_containing_repository_get::result (IR::Repository_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::TAO_ClientRequestInfo_IR_Contained_describe (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_describe::result (ACE_NESTED_CLASS (IR::Contained,Description) * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::TAO_ClientRequestInfo_IR_Contained_move (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::Container_ptr new_container,
+- const char * new_name,
+- const char * new_version,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- new_container_ (new_container),
+- new_name_ (new_name),
+- new_version_ (new_version)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_new_container = this->parameter_list_.length ();
+- this->parameter_list_.length (length_new_container + 1);
+- this->parameter_list_[length_new_container].argument <<= this->new_container_;
+-
+- this->parameter_list_[length_new_container].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_new_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_new_name + 1);
+- this->parameter_list_[length_new_name].argument <<= new_name_;
+- this->parameter_list_[length_new_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_new_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_new_version + 1);
+- this->parameter_list_[length_new_version].argument <<= new_version_;
+- this->parameter_list_[length_new_version].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Contained::TAO_ClientRequestInfo_IR_Contained_move::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-static const CORBA::Long _oc_IR_Contained[] =
+-{
+- TAO_ENCAP_BYTE_ORDER, // byte order
+- 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
+- 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = Contained
+-};
+-static CORBA::TypeCode _tc_TAO_tc_IR_Contained (CORBA::tk_objref, sizeof (_oc_IR_Contained), (char *) &_oc_IR_Contained, 0, sizeof (IR::Contained));
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Contained, &_tc_TAO_tc_IR_Contained)
+-TAO_NAMESPACE_END
+-
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CS_
+-
+- // The Base_Sequence functions, please see tao/Sequence.h
+- void
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_allocate_buffer (CORBA::ULong length)
+- {
+- IR::InterfaceDef **tmp = 0;
+- tmp = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (length);
+-
+- if (this->buffer_ != 0)
+- {
+- IR::InterfaceDef **old = ACE_reinterpret_cast (IR::InterfaceDef**, this->buffer_);
+- for (CORBA::ULong i = 0; i < this->length_; ++i)
+- if (!this->release_)
+- tmp[i] = IR::InterfaceDef::_duplicate (old[i]);
+- else
+- tmp[i] = old[i];
+-
+- if (this->release_)
+- delete[] old;
+-
+- }
+- this->buffer_ = tmp;
+- }
+-
+- void
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_deallocate_buffer (void)
+- {
+- if (this->buffer_ == 0 || this->release_ == 0)
+- return;
+- IR::InterfaceDef **tmp = ACE_reinterpret_cast (IR::InterfaceDef**, this->buffer_);
+- for (CORBA::ULong i = 0; i < this->length_; ++i)
+- {
+- CORBA::release (tmp[i]);
+- tmp[i] = IR::InterfaceDef::_nil ();
+- }
+- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (tmp);
+- this->buffer_ = 0;
+- }
+-
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::~_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
+- {
+- this->_deallocate_buffer ();
+- }
+-
+- void
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+- {
+- IR::InterfaceDef **tmp = ACE_reinterpret_cast (IR::InterfaceDef**, this->buffer_);
+-
+- for (CORBA::ULong i = nl; i < ol; ++i)
+- {
+- CORBA::release (tmp[i]);
+- tmp[i] = IR::InterfaceDef::_nil ();
+- }
+- }
+- void
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_downcast (
+- void* target,
+- CORBA_Object *src,
+- CORBA_Environment &ACE_TRY_ENV
+- )
+- {
+- IR::InterfaceDef **tmp = ACE_static_cast (IR::InterfaceDef**, target);
+- *tmp = IR::InterfaceDef::_narrow (src, ACE_TRY_ENV);
+- }
+-
+- CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_upcast (void *src) const
+- {
+- IR::InterfaceDef **tmp = ACE_static_cast (IR::InterfaceDef**, src);
+- return *tmp;
+- }
+-
+-#endif /* end #if !defined */
+-
+-
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+-
+-#if !defined (_TAO_IR_INTERFACEDEFSEQ_CS_)
+-#define _TAO_IR_INTERFACEDEFSEQ_CS_
+-
+-// *************************************************************
+-// IR::InterfaceDefSeq
+-// *************************************************************
+-
+-IR::InterfaceDefSeq::InterfaceDefSeq (void)
+-{}
+-IR::InterfaceDefSeq::InterfaceDefSeq (CORBA::ULong max) // uses max size
+- :
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::InterfaceDef,IR::InterfaceDef_var>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+- (max)
+-{}
+-IR::InterfaceDefSeq::InterfaceDefSeq (CORBA::ULong max, CORBA::ULong length, IR::InterfaceDef_ptr *buffer, CORBA::Boolean release)
+- :
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::InterfaceDef,IR::InterfaceDef_var>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+- (max, length, buffer, release)
+-{}
+-IR::InterfaceDefSeq::InterfaceDefSeq (const InterfaceDefSeq &seq) // copy ctor
+- :
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+- _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::InterfaceDef,IR::InterfaceDef_var>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+- (seq)
+-{}
+-IR::InterfaceDefSeq::~InterfaceDefSeq (void) // dtor
+-{}
+-void IR::InterfaceDefSeq::_tao_any_destructor (void *x)
+-{
+- InterfaceDefSeq *tmp = ACE_static_cast (InterfaceDefSeq*,x);
+- delete tmp;
+-}
+-
+-
+-#endif /* end #if !defined */
+-
+-static const CORBA::Long _oc_IR_InterfaceDefSeq[] =
+-{
+- TAO_ENCAP_BYTE_ORDER, // byte order
+- 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/InterfaceDefSeq:1.0
+- 16, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100), // name = InterfaceDefSeq
+- CORBA::tk_sequence, // typecode kind
+- 76, // encapsulation length
+- TAO_ENCAP_BYTE_ORDER, // byte order
+- CORBA::tk_objref, // typecode kind
+- 60, // encapsulation length
+- TAO_ENCAP_BYTE_ORDER, // byte order
+- 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
+- 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = InterfaceDef
+-
+- 0U,
++ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDefSeq (CORBA::tk_alias, sizeof (_oc_IR_InterfaceDefSeq), (char *) &_oc_IR_InterfaceDefSeq, 0, sizeof (IR::InterfaceDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDefSeq (CORBA::tk_alias, sizeof (_oc_IR_InterfaceDefSeq), (char *) &_oc_IR_InterfaceDefSeq, 0, sizeof (IR_InterfaceDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDefSeq, &_tc_TAO_tc_IR_InterfaceDefSeq)
+@@ -3097,22 +1830,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ValueDef **tmp = 0;
++ IR_ValueDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ValueDef **old = ACE_reinterpret_cast (IR::ValueDef**, this->buffer_);
++ IR_ValueDef **old = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::ValueDef::_duplicate (old[i]);
++ tmp[i] = IR_ValueDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -3124,111 +1854,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::ValueDef **tmp = ACE_reinterpret_cast (IR::ValueDef**, this->buffer_);
++ IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ValueDef::_nil ();
++ tmp[i] = IR_ValueDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::ValueDef **tmp = ACE_reinterpret_cast (IR::ValueDef**, this->buffer_);
++ IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ValueDef::_nil ();
++ tmp[i] = IR_ValueDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::ValueDef **tmp = ACE_static_cast (IR::ValueDef**, target);
+- *tmp = IR::ValueDef::_narrow (src, ACE_TRY_ENV);
++ IR_ValueDef **tmp = ACE_static_cast (IR_ValueDef**, target);
++ *tmp = IR_ValueDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_upcast (void *src) const
+ {
+- IR::ValueDef **tmp = ACE_static_cast (IR::ValueDef**, src);
++ IR_ValueDef **tmp = ACE_static_cast (IR_ValueDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_VALUEDEFSEQ_CS_)
+-#define _TAO_IR_VALUEDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::ValueDefSeq
++// IR_ValueDefSeq
+ // *************************************************************
+
+-IR::ValueDefSeq::ValueDefSeq (void)
++IR_ValueDefSeq::IR_ValueDefSeq (void)
+ {}
+-IR::ValueDefSeq::ValueDefSeq (CORBA::ULong max) // uses max size
++IR_ValueDefSeq::IR_ValueDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ValueDef,IR::ValueDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ValueDefSeq::ValueDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ValueDef_ptr *buffer, CORBA::Boolean release)
++IR_ValueDefSeq::IR_ValueDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ValueDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ValueDef,IR::ValueDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ValueDefSeq::ValueDefSeq (const ValueDefSeq &seq) // copy ctor
++IR_ValueDefSeq::IR_ValueDefSeq (const IR_ValueDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ValueDef,IR::ValueDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ValueDefSeq::~ValueDefSeq (void) // dtor
++IR_ValueDefSeq::~IR_ValueDefSeq (void) // dtor
+ {}
+-void IR::ValueDefSeq::_tao_any_destructor (void *x)
++void IR_ValueDefSeq::_tao_any_destructor (void *x)
+ {
+- ValueDefSeq *tmp = ACE_static_cast (ValueDefSeq*,x);
++ IR_ValueDefSeq *tmp = ACE_static_cast (IR_ValueDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ValueDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ValueDefSeq:1.0
+- 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100), // name = ValueDefSeq
++ 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x53657100), // name = IR_ValueDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 68, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -3236,12 +1957,12 @@
+ 52, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ValueDef:1.0
+- 9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = ValueDef
++ 9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_ValueDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ValueDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ValueDefSeq), (char *) &_oc_IR_ValueDefSeq, 0, sizeof (IR::ValueDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ValueDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ValueDefSeq), (char *) &_oc_IR_ValueDefSeq, 0, sizeof (IR_ValueDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDefSeq, &_tc_TAO_tc_IR_ValueDefSeq)
+@@ -3249,22 +1970,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ComponentDef **tmp = 0;
++ IR_ComponentDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ComponentDef **old = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
++ IR_ComponentDef **old = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::ComponentDef::_duplicate (old[i]);
++ tmp[i] = IR_ComponentDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -3276,111 +1994,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
++ IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ComponentDef::_nil ();
++ tmp[i] = IR_ComponentDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
++ IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ComponentDef::_nil ();
++ tmp[i] = IR_ComponentDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, target);
+- *tmp = IR::ComponentDef::_narrow (src, ACE_TRY_ENV);
++ IR_ComponentDef **tmp = ACE_static_cast (IR_ComponentDef**, target);
++ *tmp = IR_ComponentDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_upcast (void *src) const
+ {
+- IR::ComponentDef **tmp = ACE_static_cast (IR::ComponentDef**, src);
++ IR_ComponentDef **tmp = ACE_static_cast (IR_ComponentDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_COMPONENTDEFSEQ_CS_)
+-#define _TAO_IR_COMPONENTDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::ComponentDefSeq
++// IR_ComponentDefSeq
+ // *************************************************************
+
+-IR::ComponentDefSeq::ComponentDefSeq (void)
++IR_ComponentDefSeq::IR_ComponentDefSeq (void)
+ {}
+-IR::ComponentDefSeq::ComponentDefSeq (CORBA::ULong max) // uses max size
++IR_ComponentDefSeq::IR_ComponentDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ComponentDefSeq::ComponentDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ComponentDef_ptr *buffer, CORBA::Boolean release)
++IR_ComponentDefSeq::IR_ComponentDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ComponentDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ComponentDefSeq::ComponentDefSeq (const ComponentDefSeq &seq) // copy ctor
++IR_ComponentDefSeq::IR_ComponentDefSeq (const IR_ComponentDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ComponentDef,IR::ComponentDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ComponentDefSeq::~ComponentDefSeq (void) // dtor
++IR_ComponentDefSeq::~IR_ComponentDefSeq (void) // dtor
+ {}
+-void IR::ComponentDefSeq::_tao_any_destructor (void *x)
++void IR_ComponentDefSeq::_tao_any_destructor (void *x)
+ {
+- ComponentDefSeq *tmp = ACE_static_cast (ComponentDefSeq*,x);
++ IR_ComponentDefSeq *tmp = ACE_static_cast (IR_ComponentDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ComponentDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ComponentDefSeq:1.0
+- 16, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x53657100), // name = ComponentDefSeq
++ 16, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x53657100), // name = IR_ComponentDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 76, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -3388,12 +2097,12 @@
+ 60, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ComponentDef:1.0
+- 13, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0), // name = ComponentDef
++ 13, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0), // name = IR_ComponentDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ComponentDefSeq), (char *) &_oc_IR_ComponentDefSeq, 0, sizeof (IR::ComponentDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ComponentDefSeq), (char *) &_oc_IR_ComponentDefSeq, 0, sizeof (IR_ComponentDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDefSeq, &_tc_TAO_tc_IR_ComponentDefSeq)
+@@ -3401,22 +2110,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ProvidesDef **tmp = 0;
++ IR_ProvidesDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ProvidesDef **old = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
++ IR_ProvidesDef **old = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::ProvidesDef::_duplicate (old[i]);
++ tmp[i] = IR_ProvidesDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -3428,111 +2134,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
++ IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ProvidesDef::_nil ();
++ tmp[i] = IR_ProvidesDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
++ IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ProvidesDef::_nil ();
++ tmp[i] = IR_ProvidesDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, target);
+- *tmp = IR::ProvidesDef::_narrow (src, ACE_TRY_ENV);
++ IR_ProvidesDef **tmp = ACE_static_cast (IR_ProvidesDef**, target);
++ *tmp = IR_ProvidesDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_upcast (void *src) const
+ {
+- IR::ProvidesDef **tmp = ACE_static_cast (IR::ProvidesDef**, src);
++ IR_ProvidesDef **tmp = ACE_static_cast (IR_ProvidesDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PROVIDESDEFSEQ_CS_)
+-#define _TAO_IR_PROVIDESDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::ProvidesDefSeq
++// IR_ProvidesDefSeq
+ // *************************************************************
+
+-IR::ProvidesDefSeq::ProvidesDefSeq (void)
++IR_ProvidesDefSeq::IR_ProvidesDefSeq (void)
+ {}
+-IR::ProvidesDefSeq::ProvidesDefSeq (CORBA::ULong max) // uses max size
++IR_ProvidesDefSeq::IR_ProvidesDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ProvidesDefSeq::ProvidesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ProvidesDef_ptr *buffer, CORBA::Boolean release)
++IR_ProvidesDefSeq::IR_ProvidesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ProvidesDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ProvidesDefSeq::ProvidesDefSeq (const ProvidesDefSeq &seq) // copy ctor
++IR_ProvidesDefSeq::IR_ProvidesDefSeq (const IR_ProvidesDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ProvidesDef,IR::ProvidesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ProvidesDefSeq::~ProvidesDefSeq (void) // dtor
++IR_ProvidesDefSeq::~IR_ProvidesDefSeq (void) // dtor
+ {}
+-void IR::ProvidesDefSeq::_tao_any_destructor (void *x)
++void IR_ProvidesDefSeq::_tao_any_destructor (void *x)
+ {
+- ProvidesDefSeq *tmp = ACE_static_cast (ProvidesDefSeq*,x);
++ IR_ProvidesDefSeq *tmp = ACE_static_cast (IR_ProvidesDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ProvidesDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ProvidesDefSeq:1.0
+- 15, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = ProvidesDefSeq
++ 15, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = IR_ProvidesDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -3540,12 +2237,12 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
+- 12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600), // name = ProvidesDef
++ 12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600), // name = IR_ProvidesDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ProvidesDefSeq), (char *) &_oc_IR_ProvidesDefSeq, 0, sizeof (IR::ProvidesDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ProvidesDefSeq), (char *) &_oc_IR_ProvidesDefSeq, 0, sizeof (IR_ProvidesDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDefSeq, &_tc_TAO_tc_IR_ProvidesDefSeq)
+@@ -3553,22 +2250,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::UsesDef **tmp = 0;
++ IR_UsesDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::UsesDef **old = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
++ IR_UsesDef **old = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::UsesDef::_duplicate (old[i]);
++ tmp[i] = IR_UsesDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -3580,111 +2274,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
++ IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::UsesDef::_nil ();
++ tmp[i] = IR_UsesDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
++ IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::UsesDef::_nil ();
++ tmp[i] = IR_UsesDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, target);
+- *tmp = IR::UsesDef::_narrow (src, ACE_TRY_ENV);
++ IR_UsesDef **tmp = ACE_static_cast (IR_UsesDef**, target);
++ *tmp = IR_UsesDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_upcast (void *src) const
+ {
+- IR::UsesDef **tmp = ACE_static_cast (IR::UsesDef**, src);
++ IR_UsesDef **tmp = ACE_static_cast (IR_UsesDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_USESDEFSEQ_CS_)
+-#define _TAO_IR_USESDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::UsesDefSeq
++// IR_UsesDefSeq
+ // *************************************************************
+
+-IR::UsesDefSeq::UsesDefSeq (void)
++IR_UsesDefSeq::IR_UsesDefSeq (void)
+ {}
+-IR::UsesDefSeq::UsesDefSeq (CORBA::ULong max) // uses max size
++IR_UsesDefSeq::IR_UsesDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::UsesDefSeq::UsesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::UsesDef_ptr *buffer, CORBA::Boolean release)
++IR_UsesDefSeq::IR_UsesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_UsesDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::UsesDefSeq::UsesDefSeq (const UsesDefSeq &seq) // copy ctor
++IR_UsesDefSeq::IR_UsesDefSeq (const IR_UsesDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::UsesDef,IR::UsesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::UsesDefSeq::~UsesDefSeq (void) // dtor
++IR_UsesDefSeq::~IR_UsesDefSeq (void) // dtor
+ {}
+-void IR::UsesDefSeq::_tao_any_destructor (void *x)
++void IR_UsesDefSeq::_tao_any_destructor (void *x)
+ {
+- UsesDefSeq *tmp = ACE_static_cast (UsesDefSeq*,x);
++ IR_UsesDefSeq *tmp = ACE_static_cast (IR_UsesDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_UsesDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/UsesDefSeq:1.0
+- 11, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = UsesDefSeq
++ 11, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = IR_UsesDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 64, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -3692,12 +2377,12 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UsesDef:1.0
+- 8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600), // name = UsesDef
++ 8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600), // name = IR_UsesDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_UsesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDefSeq), (char *) &_oc_IR_UsesDefSeq, 0, sizeof (IR::UsesDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_UsesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDefSeq), (char *) &_oc_IR_UsesDefSeq, 0, sizeof (IR_UsesDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDefSeq, &_tc_TAO_tc_IR_UsesDefSeq)
+@@ -3705,22 +2390,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::HomeDef **tmp = 0;
++ IR_HomeDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::HomeDef **old = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
++ IR_HomeDef **old = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::HomeDef::_duplicate (old[i]);
++ tmp[i] = IR_HomeDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -3732,111 +2414,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
++ IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::HomeDef::_nil ();
++ tmp[i] = IR_HomeDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
++ IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::HomeDef::_nil ();
++ tmp[i] = IR_HomeDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, target);
+- *tmp = IR::HomeDef::_narrow (src, ACE_TRY_ENV);
++ IR_HomeDef **tmp = ACE_static_cast (IR_HomeDef**, target);
++ *tmp = IR_HomeDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_upcast (void *src) const
+ {
+- IR::HomeDef **tmp = ACE_static_cast (IR::HomeDef**, src);
++ IR_HomeDef **tmp = ACE_static_cast (IR_HomeDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_HOMEDEFSEQ_CS_)
+-#define _TAO_IR_HOMEDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::HomeDefSeq
++// IR_HomeDefSeq
+ // *************************************************************
+
+-IR::HomeDefSeq::HomeDefSeq (void)
++IR_HomeDefSeq::IR_HomeDefSeq (void)
+ {}
+-IR::HomeDefSeq::HomeDefSeq (CORBA::ULong max) // uses max size
++IR_HomeDefSeq::IR_HomeDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
++ TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::HomeDefSeq::HomeDefSeq (CORBA::ULong max, CORBA::ULong length, IR::HomeDef_ptr *buffer, CORBA::Boolean release)
++IR_HomeDefSeq::IR_HomeDefSeq (CORBA::ULong max, CORBA::ULong length, IR_HomeDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
++ TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::HomeDefSeq::HomeDefSeq (const HomeDefSeq &seq) // copy ctor
++IR_HomeDefSeq::IR_HomeDefSeq (const IR_HomeDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::HomeDef,IR::HomeDef_var>
++ TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::HomeDefSeq::~HomeDefSeq (void) // dtor
++IR_HomeDefSeq::~IR_HomeDefSeq (void) // dtor
+ {}
+-void IR::HomeDefSeq::_tao_any_destructor (void *x)
++void IR_HomeDefSeq::_tao_any_destructor (void *x)
+ {
+- HomeDefSeq *tmp = ACE_static_cast (HomeDefSeq*,x);
++ IR_HomeDefSeq *tmp = ACE_static_cast (IR_HomeDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_HomeDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f48), ACE_NTOHL (0x6f6d6544), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/HomeDefSeq:1.0
+- 11, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = HomeDefSeq
++ 11, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = IR_HomeDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 64, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -3844,12 +2517,12 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f48), ACE_NTOHL (0x6f6d6544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/HomeDef:1.0
+- 8, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656600), // name = HomeDef
++ 8, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656600), // name = IR_HomeDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_HomeDefSeq (CORBA::tk_alias, sizeof (_oc_IR_HomeDefSeq), (char *) &_oc_IR_HomeDefSeq, 0, sizeof (IR::HomeDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_HomeDefSeq (CORBA::tk_alias, sizeof (_oc_IR_HomeDefSeq), (char *) &_oc_IR_HomeDefSeq, 0, sizeof (IR_HomeDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDefSeq, &_tc_TAO_tc_IR_HomeDefSeq)
+@@ -3857,22 +2530,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::EmitsDef **tmp = 0;
++ IR_EmitsDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::EmitsDef **old = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
++ IR_EmitsDef **old = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::EmitsDef::_duplicate (old[i]);
++ tmp[i] = IR_EmitsDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -3884,111 +2554,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
++ IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::EmitsDef::_nil ();
++ tmp[i] = IR_EmitsDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
++ IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::EmitsDef::_nil ();
++ tmp[i] = IR_EmitsDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, target);
+- *tmp = IR::EmitsDef::_narrow (src, ACE_TRY_ENV);
++ IR_EmitsDef **tmp = ACE_static_cast (IR_EmitsDef**, target);
++ *tmp = IR_EmitsDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_upcast (void *src) const
+ {
+- IR::EmitsDef **tmp = ACE_static_cast (IR::EmitsDef**, src);
++ IR_EmitsDef **tmp = ACE_static_cast (IR_EmitsDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EMITSDEFSEQ_CS_)
+-#define _TAO_IR_EMITSDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::EmitsDefSeq
++// IR_EmitsDefSeq
+ // *************************************************************
+
+-IR::EmitsDefSeq::EmitsDefSeq (void)
++IR_EmitsDefSeq::IR_EmitsDefSeq (void)
+ {}
+-IR::EmitsDefSeq::EmitsDefSeq (CORBA::ULong max) // uses max size
++IR_EmitsDefSeq::IR_EmitsDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
++ TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::EmitsDefSeq::EmitsDefSeq (CORBA::ULong max, CORBA::ULong length, IR::EmitsDef_ptr *buffer, CORBA::Boolean release)
++IR_EmitsDefSeq::IR_EmitsDefSeq (CORBA::ULong max, CORBA::ULong length, IR_EmitsDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
++ TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::EmitsDefSeq::EmitsDefSeq (const EmitsDefSeq &seq) // copy ctor
++IR_EmitsDefSeq::IR_EmitsDefSeq (const IR_EmitsDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::EmitsDef,IR::EmitsDef_var>
++ TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::EmitsDefSeq::~EmitsDefSeq (void) // dtor
++IR_EmitsDefSeq::~IR_EmitsDefSeq (void) // dtor
+ {}
+-void IR::EmitsDefSeq::_tao_any_destructor (void *x)
++void IR_EmitsDefSeq::_tao_any_destructor (void *x)
+ {
+- EmitsDefSeq *tmp = ACE_static_cast (EmitsDefSeq*,x);
++ IR_EmitsDefSeq *tmp = ACE_static_cast (IR_EmitsDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_EmitsDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
+- 12, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100), // name = EmitsDefSeq
++ 12, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100), // name = IR_EmitsDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 68, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -3996,12 +2657,12 @@
+ 52, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/EmitsDef:1.0
+- 9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = EmitsDef
++ 9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_EmitsDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDefSeq (CORBA::tk_alias, sizeof (_oc_IR_EmitsDefSeq), (char *) &_oc_IR_EmitsDefSeq, 0, sizeof (IR::EmitsDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDefSeq (CORBA::tk_alias, sizeof (_oc_IR_EmitsDefSeq), (char *) &_oc_IR_EmitsDefSeq, 0, sizeof (IR_EmitsDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDefSeq, &_tc_TAO_tc_IR_EmitsDefSeq)
+@@ -4009,22 +2670,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::PublishesDef **tmp = 0;
++ IR_PublishesDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::PublishesDef **old = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
++ IR_PublishesDef **old = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::PublishesDef::_duplicate (old[i]);
++ tmp[i] = IR_PublishesDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -4036,111 +2694,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
++ IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::PublishesDef::_nil ();
++ tmp[i] = IR_PublishesDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
++ IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::PublishesDef::_nil ();
++ tmp[i] = IR_PublishesDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, target);
+- *tmp = IR::PublishesDef::_narrow (src, ACE_TRY_ENV);
++ IR_PublishesDef **tmp = ACE_static_cast (IR_PublishesDef**, target);
++ *tmp = IR_PublishesDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_upcast (void *src) const
+ {
+- IR::PublishesDef **tmp = ACE_static_cast (IR::PublishesDef**, src);
++ IR_PublishesDef **tmp = ACE_static_cast (IR_PublishesDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PUBLISHESDEFSEQ_CS_)
+-#define _TAO_IR_PUBLISHESDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::PublishesDefSeq
++// IR_PublishesDefSeq
+ // *************************************************************
+
+-IR::PublishesDefSeq::PublishesDefSeq (void)
++IR_PublishesDefSeq::IR_PublishesDefSeq (void)
+ {}
+-IR::PublishesDefSeq::PublishesDefSeq (CORBA::ULong max) // uses max size
++IR_PublishesDefSeq::IR_PublishesDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::PublishesDefSeq::PublishesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::PublishesDef_ptr *buffer, CORBA::Boolean release)
++IR_PublishesDefSeq::IR_PublishesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_PublishesDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::PublishesDefSeq::PublishesDefSeq (const PublishesDefSeq &seq) // copy ctor
++IR_PublishesDefSeq::IR_PublishesDefSeq (const IR_PublishesDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::PublishesDef,IR::PublishesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::PublishesDefSeq::~PublishesDefSeq (void) // dtor
++IR_PublishesDefSeq::~IR_PublishesDefSeq (void) // dtor
+ {}
+-void IR::PublishesDefSeq::_tao_any_destructor (void *x)
++void IR_PublishesDefSeq::_tao_any_destructor (void *x)
+ {
+- PublishesDefSeq *tmp = ACE_static_cast (PublishesDefSeq*,x);
++ IR_PublishesDefSeq *tmp = ACE_static_cast (IR_PublishesDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_PublishesDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
+- 16, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100), // name = PublishesDefSeq
++ 16, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100), // name = IR_PublishesDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 76, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -4148,12 +2797,12 @@
+ 60, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/PublishesDef:1.0
+- 13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = PublishesDef
++ 13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_PublishesDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_PublishesDefSeq), (char *) &_oc_IR_PublishesDefSeq, 0, sizeof (IR::PublishesDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_PublishesDefSeq), (char *) &_oc_IR_PublishesDefSeq, 0, sizeof (IR_PublishesDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDefSeq, &_tc_TAO_tc_IR_PublishesDefSeq)
+@@ -4161,22 +2810,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ConsumesDef **tmp = 0;
++ IR_ConsumesDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ConsumesDef **old = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
++ IR_ConsumesDef **old = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::ConsumesDef::_duplicate (old[i]);
++ tmp[i] = IR_ConsumesDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -4188,111 +2834,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
++ IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ConsumesDef::_nil ();
++ tmp[i] = IR_ConsumesDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
++ IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ConsumesDef::_nil ();
++ tmp[i] = IR_ConsumesDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, target);
+- *tmp = IR::ConsumesDef::_narrow (src, ACE_TRY_ENV);
++ IR_ConsumesDef **tmp = ACE_static_cast (IR_ConsumesDef**, target);
++ *tmp = IR_ConsumesDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_upcast (void *src) const
+ {
+- IR::ConsumesDef **tmp = ACE_static_cast (IR::ConsumesDef**, src);
++ IR_ConsumesDef **tmp = ACE_static_cast (IR_ConsumesDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONSUMESDEFSEQ_CS_)
+-#define _TAO_IR_CONSUMESDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::ConsumesDefSeq
++// IR_ConsumesDefSeq
+ // *************************************************************
+
+-IR::ConsumesDefSeq::ConsumesDefSeq (void)
++IR_ConsumesDefSeq::IR_ConsumesDefSeq (void)
+ {}
+-IR::ConsumesDefSeq::ConsumesDefSeq (CORBA::ULong max) // uses max size
++IR_ConsumesDefSeq::IR_ConsumesDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ConsumesDefSeq::ConsumesDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ConsumesDef_ptr *buffer, CORBA::Boolean release)
++IR_ConsumesDefSeq::IR_ConsumesDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ConsumesDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ConsumesDefSeq::ConsumesDefSeq (const ConsumesDefSeq &seq) // copy ctor
++IR_ConsumesDefSeq::IR_ConsumesDefSeq (const IR_ConsumesDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ConsumesDef,IR::ConsumesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ConsumesDefSeq::~ConsumesDefSeq (void) // dtor
++IR_ConsumesDefSeq::~IR_ConsumesDefSeq (void) // dtor
+ {}
+-void IR::ConsumesDefSeq::_tao_any_destructor (void *x)
++void IR_ConsumesDefSeq::_tao_any_destructor (void *x)
+ {
+- ConsumesDefSeq *tmp = ACE_static_cast (ConsumesDefSeq*,x);
++ IR_ConsumesDefSeq *tmp = ACE_static_cast (IR_ConsumesDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ConsumesDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ConsumesDefSeq:1.0
+- 15, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = ConsumesDefSeq
++ 15, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = IR_ConsumesDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -4300,12 +2937,12 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
+- 12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600), // name = ConsumesDef
++ 12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600), // name = IR_ConsumesDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ConsumesDefSeq), (char *) &_oc_IR_ConsumesDefSeq, 0, sizeof (IR::ConsumesDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ConsumesDefSeq), (char *) &_oc_IR_ConsumesDefSeq, 0, sizeof (IR_ConsumesDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDefSeq, &_tc_TAO_tc_IR_ConsumesDefSeq)
+@@ -4313,22 +2950,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::FactoryDef **tmp = 0;
++ IR_FactoryDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::FactoryDef **old = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
++ IR_FactoryDef **old = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::FactoryDef::_duplicate (old[i]);
++ tmp[i] = IR_FactoryDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -4340,111 +2974,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
++ IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::FactoryDef::_nil ();
++ tmp[i] = IR_FactoryDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
++ IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::FactoryDef::_nil ();
++ tmp[i] = IR_FactoryDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, target);
+- *tmp = IR::FactoryDef::_narrow (src, ACE_TRY_ENV);
++ IR_FactoryDef **tmp = ACE_static_cast (IR_FactoryDef**, target);
++ *tmp = IR_FactoryDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_upcast (void *src) const
+ {
+- IR::FactoryDef **tmp = ACE_static_cast (IR::FactoryDef**, src);
++ IR_FactoryDef **tmp = ACE_static_cast (IR_FactoryDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_FACTORYDEFSEQ_CS_)
+-#define _TAO_IR_FACTORYDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::FactoryDefSeq
++// IR_FactoryDefSeq
+ // *************************************************************
+
+-IR::FactoryDefSeq::FactoryDefSeq (void)
++IR_FactoryDefSeq::IR_FactoryDefSeq (void)
+ {}
+-IR::FactoryDefSeq::FactoryDefSeq (CORBA::ULong max) // uses max size
++IR_FactoryDefSeq::IR_FactoryDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
++ TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::FactoryDefSeq::FactoryDefSeq (CORBA::ULong max, CORBA::ULong length, IR::FactoryDef_ptr *buffer, CORBA::Boolean release)
++IR_FactoryDefSeq::IR_FactoryDefSeq (CORBA::ULong max, CORBA::ULong length, IR_FactoryDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
++ TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::FactoryDefSeq::FactoryDefSeq (const FactoryDefSeq &seq) // copy ctor
++IR_FactoryDefSeq::IR_FactoryDefSeq (const IR_FactoryDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::FactoryDef,IR::FactoryDef_var>
++ TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::FactoryDefSeq::~FactoryDefSeq (void) // dtor
++IR_FactoryDefSeq::~IR_FactoryDefSeq (void) // dtor
+ {}
+-void IR::FactoryDefSeq::_tao_any_destructor (void *x)
++void IR_FactoryDefSeq::_tao_any_destructor (void *x)
+ {
+- FactoryDefSeq *tmp = ACE_static_cast (FactoryDefSeq*,x);
++ IR_FactoryDefSeq *tmp = ACE_static_cast (IR_FactoryDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_FactoryDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
+- 14, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65665365), ACE_NTOHL (0x71000000), // name = FactoryDefSeq
++ 14, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65665365), ACE_NTOHL (0x71000000), // name = IR_FactoryDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -4452,12 +3077,12 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/FactoryDef:1.0
+- 11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000), // name = FactoryDef
++ 11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000), // name = IR_FactoryDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDefSeq (CORBA::tk_alias, sizeof (_oc_IR_FactoryDefSeq), (char *) &_oc_IR_FactoryDefSeq, 0, sizeof (IR::FactoryDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDefSeq (CORBA::tk_alias, sizeof (_oc_IR_FactoryDefSeq), (char *) &_oc_IR_FactoryDefSeq, 0, sizeof (IR_FactoryDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDefSeq, &_tc_TAO_tc_IR_FactoryDefSeq)
+@@ -4465,22 +3090,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::FinderDef **tmp = 0;
++ IR_FinderDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::FinderDef **old = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
++ IR_FinderDef **old = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::FinderDef::_duplicate (old[i]);
++ tmp[i] = IR_FinderDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -4492,111 +3114,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
++ IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::FinderDef::_nil ();
++ tmp[i] = IR_FinderDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
++ IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::FinderDef::_nil ();
++ tmp[i] = IR_FinderDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, target);
+- *tmp = IR::FinderDef::_narrow (src, ACE_TRY_ENV);
++ IR_FinderDef **tmp = ACE_static_cast (IR_FinderDef**, target);
++ *tmp = IR_FinderDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_upcast (void *src) const
+ {
+- IR::FinderDef **tmp = ACE_static_cast (IR::FinderDef**, src);
++ IR_FinderDef **tmp = ACE_static_cast (IR_FinderDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_FINDERDEFSEQ_CS_)
+-#define _TAO_IR_FINDERDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::FinderDefSeq
++// IR_FinderDefSeq
+ // *************************************************************
+
+-IR::FinderDefSeq::FinderDefSeq (void)
++IR_FinderDefSeq::IR_FinderDefSeq (void)
+ {}
+-IR::FinderDefSeq::FinderDefSeq (CORBA::ULong max) // uses max size
++IR_FinderDefSeq::IR_FinderDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
++ TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::FinderDefSeq::FinderDefSeq (CORBA::ULong max, CORBA::ULong length, IR::FinderDef_ptr *buffer, CORBA::Boolean release)
++IR_FinderDefSeq::IR_FinderDefSeq (CORBA::ULong max, CORBA::ULong length, IR_FinderDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
++ TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::FinderDefSeq::FinderDefSeq (const FinderDefSeq &seq) // copy ctor
++IR_FinderDefSeq::IR_FinderDefSeq (const IR_FinderDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::FinderDef,IR::FinderDef_var>
++ TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::FinderDefSeq::~FinderDefSeq (void) // dtor
++IR_FinderDefSeq::~IR_FinderDefSeq (void) // dtor
+ {}
+-void IR::FinderDefSeq::_tao_any_destructor (void *x)
++void IR_FinderDefSeq::_tao_any_destructor (void *x)
+ {
+- FinderDefSeq *tmp = ACE_static_cast (FinderDefSeq*,x);
++ IR_FinderDefSeq *tmp = ACE_static_cast (IR_FinderDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_FinderDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
+- 13, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x0), // name = FinderDefSeq
++ 13, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x0), // name = IR_FinderDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -4604,12 +3217,12 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/FinderDef:1.0
+- 10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000), // name = FinderDef
++ 10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000), // name = IR_FinderDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_FinderDefSeq (CORBA::tk_alias, sizeof (_oc_IR_FinderDefSeq), (char *) &_oc_IR_FinderDefSeq, 0, sizeof (IR::FinderDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_FinderDefSeq (CORBA::tk_alias, sizeof (_oc_IR_FinderDefSeq), (char *) &_oc_IR_FinderDefSeq, 0, sizeof (IR_FinderDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDefSeq, &_tc_TAO_tc_IR_FinderDefSeq)
+@@ -4617,22 +3230,19 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::Contained **tmp = 0;
++ IR_Contained **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::Contained **old = ACE_reinterpret_cast (IR::Contained**, this->buffer_);
++ IR_Contained **old = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::Contained::_duplicate (old[i]);
++ tmp[i] = IR_Contained::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -4644,111 +3254,102 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::Contained **tmp = ACE_reinterpret_cast (IR::Contained**, this->buffer_);
++ IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::Contained::_nil ();
++ tmp[i] = IR_Contained::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::~_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::~_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::Contained **tmp = ACE_reinterpret_cast (IR::Contained**, this->buffer_);
++ IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::Contained::_nil ();
++ tmp[i] = IR_Contained::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::Contained **tmp = ACE_static_cast (IR::Contained**, target);
+- *tmp = IR::Contained::_narrow (src, ACE_TRY_ENV);
++ IR_Contained **tmp = ACE_static_cast (IR_Contained**, target);
++ *tmp = IR_Contained::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_upcast (void *src) const
+ {
+- IR::Contained **tmp = ACE_static_cast (IR::Contained**, src);
++ IR_Contained **tmp = ACE_static_cast (IR_Contained**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONTAINEDSEQ_CS_)
+-#define _TAO_IR_CONTAINEDSEQ_CS_
+-
+ // *************************************************************
+-// IR::ContainedSeq
++// IR_ContainedSeq
+ // *************************************************************
+
+-IR::ContainedSeq::ContainedSeq (void)
++IR_ContainedSeq::IR_ContainedSeq (void)
+ {}
+-IR::ContainedSeq::ContainedSeq (CORBA::ULong max) // uses max size
++IR_ContainedSeq::IR_ContainedSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::Contained,IR::Contained_var>
++ TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ContainedSeq::ContainedSeq (CORBA::ULong max, CORBA::ULong length, IR::Contained_ptr *buffer, CORBA::Boolean release)
++IR_ContainedSeq::IR_ContainedSeq (CORBA::ULong max, CORBA::ULong length, IR_Contained_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::Contained,IR::Contained_var>
++ TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ContainedSeq::ContainedSeq (const ContainedSeq &seq) // copy ctor
++IR_ContainedSeq::IR_ContainedSeq (const IR_ContainedSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::Contained,IR::Contained_var>
++ TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ContainedSeq::~ContainedSeq (void) // dtor
++IR_ContainedSeq::~IR_ContainedSeq (void) // dtor
+ {}
+-void IR::ContainedSeq::_tao_any_destructor (void *x)
++void IR_ContainedSeq::_tao_any_destructor (void *x)
+ {
+- ContainedSeq *tmp = ACE_static_cast (ContainedSeq*,x);
++ IR_ContainedSeq *tmp = ACE_static_cast (IR_ContainedSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ContainedSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ContainedSeq:1.0
+- 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = ContainedSeq
++ 13, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64536571), ACE_NTOHL (0x0), // name = IR_ContainedSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -4756,21 +3357,22 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
+- 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = Contained
++ 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = IR_Contained
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ContainedSeq (CORBA::tk_alias, sizeof (_oc_IR_ContainedSeq), (char *) &_oc_IR_ContainedSeq, 0, sizeof (IR::ContainedSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ContainedSeq (CORBA::tk_alias, sizeof (_oc_IR_ContainedSeq), (char *) &_oc_IR_ContainedSeq, 0, sizeof (IR_ContainedSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContainedSeq, &_tc_TAO_tc_IR_ContainedSeq)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_StructMember[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
+- 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = StructMember
++ 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
+ 3, // member count
+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -4789,35 +3391,32 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_StructMember (CORBA::tk_struct, sizeof (_oc_IR_StructMember), (char *) &_oc_IR_StructMember, 0, sizeof (IR::StructMember));
++static CORBA::TypeCode _tc_TAO_tc_IR_StructMember (CORBA::tk_struct, sizeof (_oc_IR_StructMember), (char *) &_oc_IR_StructMember, 0, sizeof (IR_StructMember));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMember, &_tc_TAO_tc_IR_StructMember)
+ TAO_NAMESPACE_END
+-void IR::StructMember::_tao_any_destructor (void *x)
++
++void IR_StructMember::_tao_any_destructor (void *x)
+ {
+- StructMember *tmp = ACE_static_cast (StructMember*,x);
++ IR_StructMember *tmp = ACE_static_cast (IR_StructMember*,x);
+ delete tmp;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_StructMemberSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::StructMember* tmp = 0;
++ IR_StructMember* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::StructMember *old = ACE_reinterpret_cast (IR::StructMember *,this->buffer_);
++ IR_StructMember *old = ACE_reinterpret_cast (IR_StructMember *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -4830,80 +3429,70 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_StructMemberSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::StructMember *tmp = ACE_reinterpret_cast (IR::StructMember *,this->buffer_);
++ IR_StructMember *tmp = ACE_reinterpret_cast (IR_StructMember *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::~_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_StructMemberSeq::~_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_STRUCTMEMBERSEQ_CS_)
+-#define _TAO_IR_STRUCTMEMBERSEQ_CS_
+-
+ // *************************************************************
+-// IR::StructMemberSeq
++// IR_StructMemberSeq
+ // *************************************************************
+
+-IR::StructMemberSeq::StructMemberSeq (void)
++IR_StructMemberSeq::IR_StructMemberSeq (void)
+ {}
+-IR::StructMemberSeq::StructMemberSeq (CORBA::ULong max) // uses max size
++IR_StructMemberSeq::IR_StructMemberSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::StructMember>
++ TAO_Unbounded_Sequence<IR_StructMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::StructMemberSeq::StructMemberSeq (CORBA::ULong max, CORBA::ULong length, IR::StructMember *buffer, CORBA::Boolean release)
++IR_StructMemberSeq::IR_StructMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_StructMember *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::StructMember>
++ TAO_Unbounded_Sequence<IR_StructMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::StructMemberSeq::StructMemberSeq (const StructMemberSeq &seq) // copy ctor
++IR_StructMemberSeq::IR_StructMemberSeq (const IR_StructMemberSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::StructMember>
++ TAO_Unbounded_Sequence<IR_StructMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::StructMemberSeq::~StructMemberSeq (void) // dtor
++IR_StructMemberSeq::~IR_StructMemberSeq (void) // dtor
+ {}
+-void IR::StructMemberSeq::_tao_any_destructor (void *x)
++void IR_StructMemberSeq::_tao_any_destructor (void *x)
+ {
+- StructMemberSeq *tmp = ACE_static_cast (StructMemberSeq*,x);
++ IR_StructMemberSeq *tmp = ACE_static_cast (IR_StructMemberSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_StructMemberSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
+- 16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = StructMemberSeq
++ 16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = IR_StructMemberSeq
+ CORBA::tk_sequence, // typecode kind
+ 252, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -4911,7 +3500,7 @@
+ 236, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
+- 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = StructMember
++ 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
+ 3, // member count
+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -4930,29 +3519,30 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_StructMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_StructMemberSeq), (char *) &_oc_IR_StructMemberSeq, 0, sizeof (IR::StructMemberSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_StructMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_StructMemberSeq), (char *) &_oc_IR_StructMemberSeq, 0, sizeof (IR_StructMemberSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructMemberSeq, &_tc_TAO_tc_IR_StructMemberSeq)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_Initializer[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/Initializer:1.0
+- 12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200), // name = Initializer
++ 12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200), // name = IR_Initializer
+ 2, // member count
+ 8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
+ CORBA::tk_alias, // typecode kind for typedefs
+ 324, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
+- 16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = StructMemberSeq
++ 16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = IR_StructMemberSeq
+ CORBA::tk_sequence, // typecode kind
+ 252, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -4960,7 +3550,7 @@
+ 236, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
+- 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = StructMember
++ 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
+ 3, // member count
+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -4979,7 +3569,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+
+ 0U,
+@@ -4995,32 +3585,29 @@
+ 0U, // string length
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_Initializer (CORBA::tk_struct, sizeof (_oc_IR_Initializer), (char *) &_oc_IR_Initializer, 0, sizeof (IR::Initializer));
++static CORBA::TypeCode _tc_TAO_tc_IR_Initializer (CORBA::tk_struct, sizeof (_oc_IR_Initializer), (char *) &_oc_IR_Initializer, 0, sizeof (IR_Initializer));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Initializer, &_tc_TAO_tc_IR_Initializer)
+ TAO_NAMESPACE_END
+-void IR::Initializer::_tao_any_destructor (void *x)
++
++void IR_Initializer::_tao_any_destructor (void *x)
+ {
+- Initializer *tmp = ACE_static_cast (Initializer*,x);
++ IR_Initializer *tmp = ACE_static_cast (IR_Initializer*,x);
+ delete tmp;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_InitializerSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::Initializer* tmp = 0;
++ IR_Initializer* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::Initializer *old = ACE_reinterpret_cast (IR::Initializer *,this->buffer_);
++ IR_Initializer *old = ACE_reinterpret_cast (IR_Initializer *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -5033,80 +3620,70 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_InitializerSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::Initializer *tmp = ACE_reinterpret_cast (IR::Initializer *,this->buffer_);
++ IR_Initializer *tmp = ACE_reinterpret_cast (IR_Initializer *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::~_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_InitializerSeq::~_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_INITIALIZERSEQ_CS_)
+-#define _TAO_IR_INITIALIZERSEQ_CS_
+-
+ // *************************************************************
+-// IR::InitializerSeq
++// IR_InitializerSeq
+ // *************************************************************
+
+-IR::InitializerSeq::InitializerSeq (void)
++IR_InitializerSeq::IR_InitializerSeq (void)
+ {}
+-IR::InitializerSeq::InitializerSeq (CORBA::ULong max) // uses max size
++IR_InitializerSeq::IR_InitializerSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_InitializerSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::Initializer>
++ TAO_Unbounded_Sequence<IR_Initializer>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::InitializerSeq::InitializerSeq (CORBA::ULong max, CORBA::ULong length, IR::Initializer *buffer, CORBA::Boolean release)
++IR_InitializerSeq::IR_InitializerSeq (CORBA::ULong max, CORBA::ULong length, IR_Initializer *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_InitializerSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::Initializer>
++ TAO_Unbounded_Sequence<IR_Initializer>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::InitializerSeq::InitializerSeq (const InitializerSeq &seq) // copy ctor
++IR_InitializerSeq::IR_InitializerSeq (const IR_InitializerSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_InitializerSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::Initializer>
++ TAO_Unbounded_Sequence<IR_Initializer>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::InitializerSeq::~InitializerSeq (void) // dtor
++IR_InitializerSeq::~IR_InitializerSeq (void) // dtor
+ {}
+-void IR::InitializerSeq::_tao_any_destructor (void *x)
++void IR_InitializerSeq::_tao_any_destructor (void *x)
+ {
+- InitializerSeq *tmp = ACE_static_cast (InitializerSeq*,x);
++ IR_InitializerSeq *tmp = ACE_static_cast (IR_InitializerSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_InitializerSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/InitializerSeq:1.0
+- 15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000), // name = InitializerSeq
++ 15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000), // name = IR_InitializerSeq
+ CORBA::tk_sequence, // typecode kind
+ 504, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -5114,14 +3691,14 @@
+ 488, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/Initializer:1.0
+- 12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200), // name = Initializer
++ 12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200), // name = IR_Initializer
+ 2, // member count
+ 8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
+ CORBA::tk_alias, // typecode kind for typedefs
+ 324, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
+- 16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = StructMemberSeq
++ 16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = IR_StructMemberSeq
+ CORBA::tk_sequence, // typecode kind
+ 252, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -5129,7 +3706,7 @@
+ 236, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
+- 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = StructMember
++ 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
+ 3, // member count
+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -5148,7 +3725,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+
+ 0U,
+@@ -5167,16 +3744,17 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_InitializerSeq (CORBA::tk_alias, sizeof (_oc_IR_InitializerSeq), (char *) &_oc_IR_InitializerSeq, 0, sizeof (IR::InitializerSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_InitializerSeq (CORBA::tk_alias, sizeof (_oc_IR_InitializerSeq), (char *) &_oc_IR_InitializerSeq, 0, sizeof (IR_InitializerSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InitializerSeq, &_tc_TAO_tc_IR_InitializerSeq)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_UnionMember[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UnionMember:1.0
+- 12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200), // name = UnionMember
++ 12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200), // name = IR_UnionMember
+ 4, // member count
+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -5198,35 +3776,32 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_UnionMember (CORBA::tk_struct, sizeof (_oc_IR_UnionMember), (char *) &_oc_IR_UnionMember, 0, sizeof (IR::UnionMember));
++static CORBA::TypeCode _tc_TAO_tc_IR_UnionMember (CORBA::tk_struct, sizeof (_oc_IR_UnionMember), (char *) &_oc_IR_UnionMember, 0, sizeof (IR_UnionMember));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMember, &_tc_TAO_tc_IR_UnionMember)
+ TAO_NAMESPACE_END
+-void IR::UnionMember::_tao_any_destructor (void *x)
++
++void IR_UnionMember::_tao_any_destructor (void *x)
+ {
+- UnionMember *tmp = ACE_static_cast (UnionMember*,x);
++ IR_UnionMember *tmp = ACE_static_cast (IR_UnionMember*,x);
+ delete tmp;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::UnionMember* tmp = 0;
++ IR_UnionMember* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::UnionMember *old = ACE_reinterpret_cast (IR::UnionMember *,this->buffer_);
++ IR_UnionMember *old = ACE_reinterpret_cast (IR_UnionMember *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -5239,80 +3814,70 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_UnionMemberSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::UnionMember *tmp = ACE_reinterpret_cast (IR::UnionMember *,this->buffer_);
++ IR_UnionMember *tmp = ACE_reinterpret_cast (IR_UnionMember *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::~_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_UnionMemberSeq::~_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_UNIONMEMBERSEQ_CS_)
+-#define _TAO_IR_UNIONMEMBERSEQ_CS_
+-
+ // *************************************************************
+-// IR::UnionMemberSeq
++// IR_UnionMemberSeq
+ // *************************************************************
+
+-IR::UnionMemberSeq::UnionMemberSeq (void)
++IR_UnionMemberSeq::IR_UnionMemberSeq (void)
+ {}
+-IR::UnionMemberSeq::UnionMemberSeq (CORBA::ULong max) // uses max size
++IR_UnionMemberSeq::IR_UnionMemberSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::UnionMember>
++ TAO_Unbounded_Sequence<IR_UnionMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::UnionMemberSeq::UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, IR::UnionMember *buffer, CORBA::Boolean release)
++IR_UnionMemberSeq::IR_UnionMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_UnionMember *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::UnionMember>
++ TAO_Unbounded_Sequence<IR_UnionMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::UnionMemberSeq::UnionMemberSeq (const UnionMemberSeq &seq) // copy ctor
++IR_UnionMemberSeq::IR_UnionMemberSeq (const IR_UnionMemberSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::UnionMember>
++ TAO_Unbounded_Sequence<IR_UnionMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::UnionMemberSeq::~UnionMemberSeq (void) // dtor
++IR_UnionMemberSeq::~IR_UnionMemberSeq (void) // dtor
+ {}
+-void IR::UnionMemberSeq::_tao_any_destructor (void *x)
++void IR_UnionMemberSeq::_tao_any_destructor (void *x)
+ {
+- UnionMemberSeq *tmp = ACE_static_cast (UnionMemberSeq*,x);
++ IR_UnionMemberSeq *tmp = ACE_static_cast (IR_UnionMemberSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_UnionMemberSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/UnionMemberSeq:1.0
+- 15, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000), // name = UnionMemberSeq
++ 15, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65710000), // name = IR_UnionMemberSeq
+ CORBA::tk_sequence, // typecode kind
+ 264, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -5320,7 +3885,7 @@
+ 248, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UnionMember:1.0
+- 12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200), // name = UnionMember
++ 12, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e4d656d), ACE_NTOHL (0x62657200), // name = IR_UnionMember
+ 4, // member count
+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -5342,28 +3907,25 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_UnionMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_UnionMemberSeq), (char *) &_oc_IR_UnionMemberSeq, 0, sizeof (IR::UnionMemberSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_UnionMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_UnionMemberSeq), (char *) &_oc_IR_UnionMemberSeq, 0, sizeof (IR_UnionMemberSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionMemberSeq, &_tc_TAO_tc_IR_UnionMemberSeq)
+ TAO_NAMESPACE_END
+
+-#if !defined (_TAO_IR_ENUMMEMBERSEQ_CS_)
+-#define _TAO_IR_ENUMMEMBERSEQ_CS_
+-
+ // *************************************************************
+-// IR::EnumMemberSeq
++// IR_EnumMemberSeq
+ // *************************************************************
+
+-IR::EnumMemberSeq::EnumMemberSeq (void)
++IR_EnumMemberSeq::IR_EnumMemberSeq (void)
+ {}
+-IR::EnumMemberSeq::EnumMemberSeq (CORBA::ULong max) // uses max size
++IR_EnumMemberSeq::IR_EnumMemberSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -5372,7 +3934,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::EnumMemberSeq::EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
++IR_EnumMemberSeq::IR_EnumMemberSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -5381,7 +3943,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::EnumMemberSeq::EnumMemberSeq (const EnumMemberSeq &seq) // copy ctor
++IR_EnumMemberSeq::IR_EnumMemberSeq (const IR_EnumMemberSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -5390,22 +3952,19 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::EnumMemberSeq::~EnumMemberSeq (void) // dtor
++IR_EnumMemberSeq::~IR_EnumMemberSeq (void) // dtor
+ {}
+-void IR::EnumMemberSeq::_tao_any_destructor (void *x)
++void IR_EnumMemberSeq::_tao_any_destructor (void *x)
+ {
+- EnumMemberSeq *tmp = ACE_static_cast (EnumMemberSeq*,x);
++ IR_EnumMemberSeq *tmp = ACE_static_cast (IR_EnumMemberSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_EnumMemberSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6e756d4d), ACE_NTOHL (0x656d6265), ACE_NTOHL (0x72536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/EnumMemberSeq:1.0
+- 14, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x71000000), // name = EnumMemberSeq
++ 14, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65725365), ACE_NTOHL (0x71000000), // name = IR_EnumMemberSeq
+ CORBA::tk_sequence, // typecode kind
+ 80, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -5420,7 +3979,7 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_EnumMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_EnumMemberSeq), (char *) &_oc_IR_EnumMemberSeq, 0, sizeof (IR::EnumMemberSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_EnumMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_EnumMemberSeq), (char *) &_oc_IR_EnumMemberSeq, 0, sizeof (IR_EnumMemberSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumMemberSeq, &_tc_TAO_tc_IR_EnumMemberSeq)
+@@ -5430,15 +3989,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
++_TAO_Container_Proxy_Impl::_TAO_Container_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
++_TAO_Container_Remote_Proxy_Impl::_TAO_Container_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::Contained_ptr IR::_TAO_Container_Remote_Proxy_Impl::lookup (
++IR_Contained_ptr _TAO_Container_Remote_Proxy_Impl::lookup (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -5446,10 +4005,9 @@
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+- IR::Contained_ptr _tao_retval = IR::Contained::_nil ();
+- IR::Contained_var _tao_safe_retval (_tao_retval);
++{
++ IR_Contained_ptr _tao_retval = IR_Contained::_nil ();
++ IR_Contained_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -5465,57 +4023,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_lookup ri (
+- "lookup",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- search_name,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << search_name)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -5524,7 +4056,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -5534,65 +4066,34 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ContainedSeq * IR::_TAO_Container_Remote_Proxy_Impl::contents (
++IR_ContainedSeq * _TAO_Container_Remote_Proxy_Impl::contents (
+ CORBA_Object *_collocated_tao_target_,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+- IR::ContainedSeq *_tao_retval = 0;
+-
+-
++{
++ IR_ContainedSeq *_tao_retval = 0;
++
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+- ACE_NEW_RETURN (_tao_retval, IR::ContainedSeq, _tao_retval);
+- IR::ContainedSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_ContainedSeq, _tao_retval);
++ IR_ContainedSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "contents",
+@@ -5601,59 +4102,32 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_contents ri (
+- "contents",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- limit_type,
+- exclude_inherited,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << limit_type) &&
+ (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -5662,7 +4136,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -5672,67 +4146,36 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ContainedSeq * IR::_TAO_Container_Remote_Proxy_Impl::lookup_name (
++IR_ContainedSeq * _TAO_Container_Remote_Proxy_Impl::lookup_name (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Long levels_to_search,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
+- IR::ContainedSeq *_tao_retval = 0;
+-
++{
++ IR_ContainedSeq *_tao_retval = 0;
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+- ACE_NEW_RETURN (_tao_retval, IR::ContainedSeq, _tao_retval);
+- IR::ContainedSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_ContainedSeq, _tao_retval);
++ IR_ContainedSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "lookup_name",
+@@ -5741,47 +4184,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name ri (
+- "lookup_name",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- search_name,
+- levels_to_search,
+- limit_type,
+- exclude_inherited,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -5790,14 +4204,14 @@
+ (_tao_out << limit_type) &&
+ (_tao_out << CORBA::Any::from_boolean (exclude_inherited))
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -5806,7 +4220,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -5816,47 +4230,20 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ContainedSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::Container::DescriptionSeq * IR::_TAO_Container_Remote_Proxy_Impl::describe_contents (
++IR_Container::DescriptionSeq * _TAO_Container_Remote_Proxy_Impl::describe_contents (
+ CORBA_Object *_collocated_tao_target_,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -5865,17 +4252,14 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::Container::DescriptionSeq *_tao_retval = 0;
+-
++ IR_Container::DescriptionSeq *_tao_retval = 0;
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+- ACE_NEW_RETURN (_tao_retval, IR::Container::DescriptionSeq, _tao_retval);
+- IR::Container::DescriptionSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_Container::DescriptionSeq, _tao_retval);
++ IR_Container::DescriptionSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "describe_contents",
+@@ -5884,46 +4268,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents ri (
+- "describe_contents",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- limit_type,
+- exclude_inherited,
+- max_returned_objs,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -5931,14 +4287,14 @@
+ (_tao_out << CORBA::Any::from_boolean (exclude_inherited)) &&
+ (_tao_out << max_returned_objs)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -5947,7 +4303,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -5957,45 +4313,17 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::Container::DescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ModuleDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_module (
++IR_ModuleDef_ptr _TAO_Container_Remote_Proxy_Impl::create_module (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -6006,16 +4334,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::ModuleDef_ptr _tao_retval = IR::ModuleDef::_nil ();
+- IR::ModuleDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_ModuleDef_ptr _tao_retval = IR_ModuleDef::_nil ();
++ IR_ModuleDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_module",
+@@ -6024,46 +4349,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_module ri (
+- "create_module",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -6071,14 +4368,14 @@
+ (_tao_out << name) &&
+ (_tao_out << version)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -6087,7 +4384,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -6097,50 +4394,23 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ModuleDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ConstantDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_constant (
++IR_ConstantDef_ptr _TAO_Container_Remote_Proxy_Impl::create_constant (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -6148,15 +4418,12 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::ConstantDef_ptr _tao_retval = IR::ConstantDef::_nil ();
+- IR::ConstantDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_ConstantDef_ptr _tao_retval = IR_ConstantDef::_nil ();
++ IR_ConstantDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+@@ -6166,48 +4433,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant ri (
+- "create_constant",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- type,
+- value,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -6217,14 +4454,14 @@
+ (_tao_out << type) &&
+ (_tao_out << value)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -6233,7 +4470,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -6243,66 +4480,36 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ConstantDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::StructDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_struct (
++IR_StructDef_ptr _TAO_Container_Remote_Proxy_Impl::create_struct (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::StructDef_ptr _tao_retval = IR::StructDef::_nil ();
+- IR::StructDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_StructDef_ptr _tao_retval = IR_StructDef::_nil ();
++ IR_StructDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_struct",
+@@ -6311,47 +4518,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct ri (
+- "create_struct",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- members,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -6360,14 +4538,14 @@
+ (_tao_out << version) &&
+ (_tao_out << members)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -6376,7 +4554,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -6386,67 +4564,37 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::StructDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::UnionDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_union (
++IR_UnionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_union (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr discriminator_type,
+- const IR::UnionMemberSeq & members,
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::UnionDef_ptr _tao_retval = IR::UnionDef::_nil ();
+- IR::UnionDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_UnionDef_ptr _tao_retval = IR_UnionDef::_nil ();
++ IR_UnionDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_union",
+@@ -6455,48 +4603,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_union ri (
+- "create_union",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- discriminator_type,
+- members,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -6506,14 +4624,14 @@
+ (_tao_out << discriminator_type) &&
+ (_tao_out << members)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -6522,7 +4640,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -6532,66 +4650,36 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::UnionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::EnumDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_enum (
++IR_EnumDef_ptr _TAO_Container_Remote_Proxy_Impl::create_enum (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::EnumDef_ptr _tao_retval = IR::EnumDef::_nil ();
+- IR::EnumDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_EnumDef_ptr _tao_retval = IR_EnumDef::_nil ();
++ IR_EnumDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_enum",
+@@ -6600,47 +4688,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum ri (
+- "create_enum",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- members,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -6649,14 +4708,14 @@
+ (_tao_out << version) &&
+ (_tao_out << members)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -6665,7 +4724,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -6675,66 +4734,36 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::EnumDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::AliasDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_alias (
++IR_AliasDef_ptr _TAO_Container_Remote_Proxy_Impl::create_alias (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type,
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::AliasDef_ptr _tao_retval = IR::AliasDef::_nil ();
+- IR::AliasDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_AliasDef_ptr _tao_retval = IR_AliasDef::_nil ();
++ IR_AliasDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_alias",
+@@ -6743,47 +4772,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias ri (
+- "create_alias",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- original_type,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -6792,14 +4792,14 @@
+ (_tao_out << version) &&
+ (_tao_out << original_type)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -6808,7 +4808,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -6818,50 +4818,23 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::AliasDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::InterfaceDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_interface (
++IR_InterfaceDef_ptr _TAO_Container_Remote_Proxy_Impl::create_interface (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -6870,16 +4843,14 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::InterfaceDef_ptr _tao_retval = IR::InterfaceDef::_nil ();
+- IR::InterfaceDef_var _tao_safe_retval (_tao_retval);
++ IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
++ IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_interface",
+@@ -6888,49 +4859,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface ri (
+- "create_interface",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- base_interfaces,
+- is_abstract,
+- is_local,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -6941,14 +4881,14 @@
+ (_tao_out << CORBA::Any::from_boolean (is_abstract)) &&
+ (_tao_out << CORBA::Any::from_boolean (is_local))
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -6957,7 +4897,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -6967,72 +4907,42 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ValueDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_value (
++IR_ValueDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Boolean is_custom,
+ CORBA::Boolean is_abstract,
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Boolean is_truncatable,
+- const IR::ValueDefSeq & abstract_base_values,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- const IR::InitializerSeq & initializers,
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
+- IR::ValueDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
++ IR_ValueDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_value",
+@@ -7041,53 +4951,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_value ri (
+- "create_value",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- is_custom,
+- is_abstract,
+- base_value,
+- is_truncatable,
+- abstract_base_values,
+- supported_interfaces,
+- initializers,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -7102,14 +4977,14 @@
+ (_tao_out << supported_interfaces) &&
+ (_tao_out << initializers)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -7118,7 +4993,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -7128,66 +5003,36 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ValueBoxDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_value_box (
++IR_ValueBoxDef_ptr _TAO_Container_Remote_Proxy_Impl::create_value_box (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::ValueBoxDef_ptr _tao_retval = IR::ValueBoxDef::_nil ();
+- IR::ValueBoxDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_ValueBoxDef_ptr _tao_retval = IR_ValueBoxDef::_nil ();
++ IR_ValueBoxDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_value_box",
+@@ -7196,47 +5041,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box ri (
+- "create_value_box",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- original_type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -7245,14 +5061,14 @@
+ (_tao_out << version) &&
+ (_tao_out << original_type_def)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -7261,7 +5077,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -7271,66 +5087,36 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ValueBoxDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ExceptionDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_exception (
++IR_ExceptionDef_ptr _TAO_Container_Remote_Proxy_Impl::create_exception (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::ExceptionDef_ptr _tao_retval = IR::ExceptionDef::_nil ();
+- IR::ExceptionDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_ExceptionDef_ptr _tao_retval = IR_ExceptionDef::_nil ();
++ IR_ExceptionDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_exception",
+@@ -7339,47 +5125,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception ri (
+- "create_exception",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- members,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -7388,14 +5145,14 @@
+ (_tao_out << version) &&
+ (_tao_out << members)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -7404,7 +5161,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -7414,45 +5171,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ExceptionDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::NativeDef_ptr IR::_TAO_Container_Remote_Proxy_Impl::create_native (
++IR_NativeDef_ptr _TAO_Container_Remote_Proxy_Impl::create_native (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -7463,16 +5193,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::NativeDef_ptr _tao_retval = IR::NativeDef::_nil ();
+- IR::NativeDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_NativeDef_ptr _tao_retval = IR_NativeDef::_nil ();
++ IR_NativeDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_native",
+@@ -7481,46 +5208,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Container::TAO_ClientRequestInfo_IR_Container_create_native ri (
+- "create_native",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -7528,14 +5227,14 @@
+ (_tao_out << name) &&
+ (_tao_out << version)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -7544,7 +5243,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -7554,41 +5253,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::NativeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -7602,32 +5274,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_Container_Proxy_Broker::_TAO_Container_Proxy_Broker (void)
++_TAO_Container_Proxy_Broker::_TAO_Container_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
++_TAO_Container_Proxy_Broker::~_TAO_Container_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_Container_Remote_Proxy_Broker *IR::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_Container_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_Container_Remote_Proxy_Broker::_TAO_Container_Remote_Proxy_Broker (void)
++_TAO_Container_Remote_Proxy_Broker::_TAO_Container_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Container_Remote_Proxy_Broker::~_TAO_Container_Remote_Proxy_Broker (void)
++_TAO_Container_Remote_Proxy_Broker::~_TAO_Container_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Container_Proxy_Impl&
+-IR::_TAO_Container_Remote_Proxy_Broker::select_proxy (
+- ::IR::Container *object,
++_TAO_Container_Proxy_Impl&
++_TAO_Container_Remote_Proxy_Broker::select_proxy (
++ ::IR_Container *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -7643,110 +5315,110 @@
+
+
+ // default constructor
+-IR::Container::Container (int collocated)
++IR_Container::IR_Container (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::Container::~Container (void)
++IR_Container::~IR_Container (void)
+ {}
+
+ void
+-IR::Container::_tao_setup_collocation (int collocated)
++IR_Container::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_Container_Proxy_Broker_ =
+- ::IR__TAO_Container_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_Container_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_Container_Proxy_Broker_ =
+- ::IR::_TAO_Container_Remote_Proxy_Broker::the_TAO_Container_Remote_Proxy_Broker ();
++ ::the_TAO_Container_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (CORBA,IRObject)::_tao_setup_collocation (collocated);
++ CORBA_IRObject::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::Container::_tao_any_destructor (void *x)
++void IR_Container::_tao_any_destructor (void *x)
+ {
+- Container *tmp = ACE_static_cast (Container*,x);
++ IR_Container *tmp = ACE_static_cast (IR_Container*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::Container_ptr IR::Container::_narrow (
++IR_Container_ptr IR_Container::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return Container::_nil ();
++ return IR_Container::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Container:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (Container::_nil ());
++ ACE_CHECK_RETURN (IR_Container::_nil ());
+ if (is_a == 0)
+- return Container::_nil ();
++ return IR_Container::_nil ();
+ }
+- return Container::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_Container::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::Container_ptr IR::Container::_unchecked_narrow (
++IR_Container_ptr IR_Container::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return Container::_nil ();
++ return IR_Container::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- Container_ptr default_proxy = Container::_nil ();
++ IR_Container_ptr default_proxy = IR_Container::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_Container_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_Container_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::Container (
++ ::IR_Container (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- Container::_nil ());
++ IR_Container::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::Container (stub, 0, obj->_servant ()), Container::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_Container (stub, 0, obj->_servant ()), IR_Container::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- Container_ptr,
++ IR_Container_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &Container::_narrow
++ &IR_Container::_narrow
+ )
+ )
+ );
+ }
+
+-IR::Container_ptr
+-IR::Container::_duplicate (Container_ptr obj)
++IR_Container_ptr
++IR_Container::_duplicate (IR_Container_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Container:1.0")) ||
+@@ -7757,22 +5429,22 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::Container::_tao_QueryInterface (ptr_arith_t type)
++void *IR_Container::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -7785,20 +5457,19 @@
+ return retv;
+ }
+
+-const char* IR::Container::_interface_repository_id (void) const
++const char* IR_Container::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/Container:1.0";
+ }
+
+-IR::Contained_ptr IR::Container::lookup (
++IR_Contained_ptr IR_Container::lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).lookup (
+ this,
+ search_name,
+@@ -7806,8 +5477,8 @@
+ );
+ }
+
+-IR::ContainedSeq * IR::Container::contents (
+- IR::DefinitionKind limit_type,
++IR_ContainedSeq * IR_Container::contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -7815,7 +5486,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contents (
+ this,
+ limit_type,
+@@ -7824,10 +5494,10 @@
+ );
+ }
+
+-IR::ContainedSeq * IR::Container::lookup_name (
++IR_ContainedSeq * IR_Container::lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -7835,7 +5505,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).lookup_name (
+ this,
+ search_name,
+@@ -7857,7 +5526,7 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
+- 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = Contained
++ 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = IR_Contained
+
+ 5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
+ CORBA::tk_enum, // typecode kind
+@@ -7905,30 +5574,26 @@
+ CORBA::tk_any,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_Container_Description (CORBA::tk_struct, sizeof (_oc_IR_Container_Description), (char *) &_oc_IR_Container_Description, 0, sizeof (IR::Container::Description));
+-CORBA::TypeCode_ptr IR::Container::_tc_Description = &_tc_TAO_tc_IR_Container_Description;
++static CORBA::TypeCode _tc_TAO_tc_IR_Container_Description (CORBA::tk_struct, sizeof (_oc_IR_Container_Description), (char *) &_oc_IR_Container_Description, 0, sizeof (IR_Container::Description));
++CORBA::TypeCode_ptr IR_Container::_tc_Description = &_tc_TAO_tc_IR_Container_Description;
+
+-void IR::Container::Description::_tao_any_destructor (void *x)
++void IR_Container::Description::_tao_any_destructor (void *x)
+ {
+ Description *tmp = ACE_static_cast (Description*,x);
+ delete tmp;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CS_
+-
+ void
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::Container::Description* tmp = 0;
++ IR_Container::Description* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::Container::Description *old = ACE_reinterpret_cast (IR::Container::Description *,this->buffer_);
++ IR_Container::Description *old = ACE_reinterpret_cast (IR_Container::Description *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -7941,75 +5606,66 @@
+ }
+
+ void
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_deallocate_buffer (void)
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::Container::Description *tmp = ACE_reinterpret_cast (IR::Container::Description *,this->buffer_);
++ IR_Container::Description *tmp = ACE_reinterpret_cast (IR_Container::Description *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Dtor.
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::~_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONTAINER_DESCRIPTIONSEQ_CS_)
+-#define _TAO_IR_CONTAINER_DESCRIPTIONSEQ_CS_
+-
+ // *************************************************************
+-// IR::Container::DescriptionSeq
++// IR_Container::DescriptionSeq
+ // *************************************************************
+
+-IR::Container::DescriptionSeq::DescriptionSeq (void)
++IR_Container::DescriptionSeq::DescriptionSeq (void)
+ {}
+-IR::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
++IR_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::Container::Description>
++ TAO_Unbounded_Sequence<IR_Container::Description>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::Container::Description *buffer, CORBA::Boolean release)
++IR_Container::DescriptionSeq::DescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_Container::Description *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::Container::Description>
++ TAO_Unbounded_Sequence<IR_Container::Description>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
++IR_Container::DescriptionSeq::DescriptionSeq (const DescriptionSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::Container::Description>
++ TAO_Unbounded_Sequence<IR_Container::Description>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::Container::DescriptionSeq::~DescriptionSeq (void) // dtor
++IR_Container::DescriptionSeq::~DescriptionSeq (void) // dtor
+ {}
+-void IR::Container::DescriptionSeq::_tao_any_destructor (void *x)
++void IR_Container::DescriptionSeq::_tao_any_destructor (void *x)
+ {
+ DescriptionSeq *tmp = ACE_static_cast (DescriptionSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_Container_DescriptionSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -8029,7 +5685,7 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6564), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Contained:1.0
+- 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = Contained
++ 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x64000000), // name = IR_Contained
+
+ 5, ACE_NTOHL (0x6b696e64), ACE_NTOHL (0x0), // name = kind
+ CORBA::tk_enum, // typecode kind
+@@ -8080,11 +5736,11 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_Container_DescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_Container_DescriptionSeq), (char *) &_oc_IR_Container_DescriptionSeq, 0, sizeof (IR::Container::DescriptionSeq));
+-CORBA::TypeCode_ptr IR::Container::_tc_DescriptionSeq = &_tc_TAO_tc_IR_Container_DescriptionSeq;
++static CORBA::TypeCode _tc_TAO_tc_IR_Container_DescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_Container_DescriptionSeq), (char *) &_oc_IR_Container_DescriptionSeq, 0, sizeof (IR_Container::DescriptionSeq));
++CORBA::TypeCode_ptr IR_Container::_tc_DescriptionSeq = &_tc_TAO_tc_IR_Container_DescriptionSeq;
+
+-IR::Container::DescriptionSeq * IR::Container::describe_contents (
+- IR::DefinitionKind limit_type,
++IR_Container::DescriptionSeq * IR_Container::describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -8093,7 +5749,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).describe_contents (
+ this,
+ limit_type,
+@@ -8103,7 +5758,7 @@
+ );
+ }
+
+-IR::ModuleDef_ptr IR::Container::create_module (
++IR_ModuleDef_ptr IR_Container::create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -8113,7 +5768,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_module (
+ this,
+ id,
+@@ -8123,11 +5777,11 @@
+ );
+ }
+
+-IR::ConstantDef_ptr IR::Container::create_constant (
++IR_ConstantDef_ptr IR_Container::create_constant (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -8135,7 +5789,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_constant (
+ this,
+ id,
+@@ -8147,18 +5800,17 @@
+ );
+ }
+
+-IR::StructDef_ptr IR::Container::create_struct (
++IR_StructDef_ptr IR_Container::create_struct (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_struct (
+ this,
+ id,
+@@ -8169,19 +5821,18 @@
+ );
+ }
+
+-IR::UnionDef_ptr IR::Container::create_union (
++IR_UnionDef_ptr IR_Container::create_union (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr discriminator_type,
+- const IR::UnionMemberSeq & members,
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_union (
+ this,
+ id,
+@@ -8193,18 +5844,17 @@
+ );
+ }
+
+-IR::EnumDef_ptr IR::Container::create_enum (
++IR_EnumDef_ptr IR_Container::create_enum (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_enum (
+ this,
+ id,
+@@ -8215,18 +5865,17 @@
+ );
+ }
+
+-IR::AliasDef_ptr IR::Container::create_alias (
++IR_AliasDef_ptr IR_Container::create_alias (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type,
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_alias (
+ this,
+ id,
+@@ -8237,11 +5886,11 @@
+ );
+ }
+
+-IR::InterfaceDef_ptr IR::Container::create_interface (
++IR_InterfaceDef_ptr IR_Container::create_interface (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -8250,7 +5899,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_interface (
+ this,
+ id,
+@@ -8263,24 +5911,23 @@
+ );
+ }
+
+-IR::ValueDef_ptr IR::Container::create_value (
++IR_ValueDef_ptr IR_Container::create_value (
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Boolean is_custom,
+ CORBA::Boolean is_abstract,
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Boolean is_truncatable,
+- const IR::ValueDefSeq & abstract_base_values,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- const IR::InitializerSeq & initializers,
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_value (
+ this,
+ id,
+@@ -8297,18 +5944,17 @@
+ );
+ }
+
+-IR::ValueBoxDef_ptr IR::Container::create_value_box (
++IR_ValueBoxDef_ptr IR_Container::create_value_box (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_value_box (
+ this,
+ id,
+@@ -8319,18 +5965,17 @@
+ );
+ }
+
+-IR::ExceptionDef_ptr IR::Container::create_exception (
++IR_ExceptionDef_ptr IR_Container::create_exception (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_exception (
+ this,
+ id,
+@@ -8341,7 +5986,7 @@
+ );
+ }
+
+-IR::NativeDef_ptr IR::Container::create_native (
++IR_NativeDef_ptr IR_Container::create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -8351,7 +5996,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Container_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_native (
+ this,
+ id,
+@@ -8361,1453 +6005,316 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::TAO_ClientRequestInfo_IR_Container_lookup (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * search_name,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- search_name_ (search_name)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++static const CORBA::Long _oc_IR_Container[] =
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_search_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_search_name + 1);
+- this->parameter_list_[length_search_name].argument <<= search_name_;
+- this->parameter_list_[length_search_name].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
++ TAO_ENCAP_BYTE_ORDER, // byte order
++ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Container:1.0
++ 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x72000000), // name = IR_Container
++};
++static CORBA::TypeCode _tc_TAO_tc_IR_Container (CORBA::tk_objref, sizeof (_oc_IR_Container), (char *) &_oc_IR_Container, 0, sizeof (IR_Container));
++TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
++TAO_NAMESPACE_BEGIN (IR)
++TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Container, &_tc_TAO_tc_IR_Container)
++TAO_NAMESPACE_END
+
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
++///////////////////////////////////////////////////////////////////////
++// Base & Remote Proxy Implementation.
++//
+
++_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
++{}
+
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
++_TAO_IDLType_Remote_Proxy_Impl::_TAO_IDLType_Remote_Proxy_Impl (void)
++{}
+
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup::result (IR::Contained_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
++// Remote Implementation of the IDL interface methods
+
+-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::TAO_ClientRequestInfo_IR_Container_contents (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::DefinitionKind & limit_type,
+- const CORBA::Boolean & exclude_inherited,
+- CORBA::Environment &
++CORBA::TypeCode_ptr _TAO_IDLType_Remote_Proxy_Impl::type (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- limit_type_ (limit_type),
+- exclude_inherited_ (exclude_inherited)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_limit_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_limit_type + 1);
+- this->parameter_list_[length_limit_type].argument <<= this->limit_type_;
+-
+- this->parameter_list_[length_limit_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_exclude_inherited = this->parameter_list_.length ();
+- this->parameter_list_.length (length_exclude_inherited + 1);
+- this->parameter_list_[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
+- this->parameter_list_[length_exclude_inherited].mode = Dynamic::PARAM_IN;
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
++{
++ CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
++ CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
+
+- return &this->parameter_list_;
+-}
++ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
++ if (istub == 0)
++ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
++ TAO_GIOP_Twoway_Invocation _tao_call (
++ istub,
++ "_get_type",
++ 9,
++ 0,
++ istub->orb_core ()
++ );
+
++ for (;;)
++ {
++ _tao_call.start (ACE_TRY_ENV);
++ ACE_CHECK_RETURN (0);
++
++ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
++
++ _tao_call.prepare_header (
++ ACE_static_cast (CORBA::Octet, _tao_response_flag),
++ ACE_TRY_ENV
++ );
++ ACE_CHECK_RETURN (0);
++ int _invoke_status =
++ _tao_call.invoke (0, 0, ACE_TRY_ENV);
++ ACE_CHECK_RETURN (0);
++
++ if (_invoke_status == TAO_INVOKE_RESTART)
++ {
++ _tao_call.restart_flag (1);
++ continue;
++ }
++ if (_invoke_status != TAO_INVOKE_OK)
++ {
++ ACE_THROW_RETURN (
++ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
++ 0
++ );
++ }
++ TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
++ if (!(
++ (_tao_in >> _tao_safe_retval.inout ())
++ ))
++ {
++ ACE_THROW_RETURN (
++ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
++ 0
++ );
++ }
++ break;
++ }
+
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
++ return _tao_safe_retval._retn ();
+ }
+
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_contents::result (IR::ContainedSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::TAO_ClientRequestInfo_IR_Container_lookup_name (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * search_name,
+- const CORBA::Long & levels_to_search,
+- IR::DefinitionKind & limit_type,
+- const CORBA::Boolean & exclude_inherited,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- search_name_ (search_name),
+- levels_to_search_ (levels_to_search),
+- limit_type_ (limit_type),
+- exclude_inherited_ (exclude_inherited)
+-{}
++//
++// End Base & Remote Proxy Implemeentation.
++///////////////////////////////////////////////////////////////////////
++
+
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++///////////////////////////////////////////////////////////////////////
++// Remote & Base Proxy Broker Implementation
++//
++
++_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_search_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_search_name + 1);
+- this->parameter_list_[length_search_name].argument <<= search_name_;
+- this->parameter_list_[length_search_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_levels_to_search = this->parameter_list_.length ();
+- this->parameter_list_.length (length_levels_to_search + 1);
+- this->parameter_list_[length_levels_to_search].argument <<= levels_to_search_;
+- this->parameter_list_[length_levels_to_search].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_limit_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_limit_type + 1);
+- this->parameter_list_[length_limit_type].argument <<= this->limit_type_;
+-
+- this->parameter_list_[length_limit_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_exclude_inherited = this->parameter_list_.length ();
+- this->parameter_list_.length (length_exclude_inherited + 1);
+- this->parameter_list_[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
+- this->parameter_list_[length_exclude_inherited].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+ }
+
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
+ {
+- // Generate the exception list on demand
+- return 0;
+ }
+
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++// Factory function Implementation.
++_TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void)
+ {
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
++ static ::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
++ return &remote_proxy_broker;
+ }
+
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_lookup_name::result (IR::ContainedSeq * result)
++_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
+ {
+- // update the result
+- this->result_ = result;
+ }
+
+-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::TAO_ClientRequestInfo_IR_Container_describe_contents (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::DefinitionKind & limit_type,
+- const CORBA::Boolean & exclude_inherited,
+- const CORBA::Long & max_returned_objs,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- limit_type_ (limit_type),
+- exclude_inherited_ (exclude_inherited),
+- max_returned_objs_ (max_returned_objs)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_limit_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_limit_type + 1);
+- this->parameter_list_[length_limit_type].argument <<= this->limit_type_;
+-
+- this->parameter_list_[length_limit_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_exclude_inherited = this->parameter_list_.length ();
+- this->parameter_list_.length (length_exclude_inherited + 1);
+- this->parameter_list_[length_exclude_inherited].argument <<= CORBA::Any::from_boolean (this->exclude_inherited_);
+- this->parameter_list_[length_exclude_inherited].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_max_returned_objs = this->parameter_list_.length ();
+- this->parameter_list_.length (length_max_returned_objs + 1);
+- this->parameter_list_[length_max_returned_objs].argument <<= max_returned_objs_;
+- this->parameter_list_[length_max_returned_objs].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+ }
+
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++_TAO_IDLType_Proxy_Impl&
++_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
++ ::IR_IDLType *object,
++ CORBA::Environment &ACE_TRY_ENV
++)
+ {
+- // Generate the exception list on demand
+- return 0;
++ ACE_UNUSED_ARG (object);
++ ACE_UNUSED_ARG (ACE_TRY_ENV);
++ return remote_proxy_impl_;
+ }
+
+
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
++//
++// End Remote & Base Proxy Broker Implementation
++///////////////////////////////////////////////////////////////////////
++
+
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_describe_contents::result (ACE_NESTED_CLASS (IR::Container,DescriptionSeq) * result)
++// default constructor
++IR_IDLType::IR_IDLType (int collocated)
+ {
+- // update the result
+- this->result_ = result;
++ this->_tao_setup_collocation (collocated);
+ }
+
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::TAO_ClientRequestInfo_IR_Container_create_module (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version)
++// destructor
++IR_IDLType::~IR_IDLType (void)
+ {}
+
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++void
++IR_IDLType::_tao_setup_collocation (int collocated)
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
++ if (collocated)
++ this->the_TAO_IDLType_Proxy_Broker_ =
++ _TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
++ else
++ this->the_TAO_IDLType_Proxy_Broker_ =
++ ::the_TAO_IDLType_Remote_Proxy_Broker ();
++
++ CORBA_IRObject::_tao_setup_collocation (collocated);
+
+- return &this->parameter_list_;
+ }
+
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++void IR_IDLType::_tao_any_destructor (void *x)
+ {
+- // Generate the exception list on demand
+- return 0;
++ IR_IDLType *tmp = ACE_static_cast (IR_IDLType*,x);
++ CORBA::release (tmp);
+ }
+
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_IDLType_ptr IR_IDLType::_narrow (
++ CORBA::Object_ptr obj,
++ CORBA::Environment &ACE_TRY_ENV
++ )
+ {
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
++ if (CORBA::is_nil (obj))
++ return IR_IDLType::_nil ();
++ if (! obj->_is_local ())
++ {
++ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/IDLType:1.0", ACE_TRY_ENV);
++ ACE_CHECK_RETURN (IR_IDLType::_nil ());
++ if (is_a == 0)
++ return IR_IDLType::_nil ();
++ }
++ return IR_IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_module::result (IR::ModuleDef_ptr result)
++IR_IDLType_ptr IR_IDLType::_unchecked_narrow (
++ CORBA::Object_ptr obj,
++ CORBA::Environment &
++ )
+ {
+- // update the result
+- this->result_ = result;
+-}
++ if (CORBA::is_nil (obj))
++ return IR_IDLType::_nil ();
++ if (! obj->_is_local ())
++ {
++ TAO_Stub* stub = obj->_stubobj ();
++ if (stub)
++ stub->_incr_refcnt ();
++ IR_IDLType_ptr default_proxy = IR_IDLType::_nil ();
+
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::TAO_ClientRequestInfo_IR_Container_create_constant (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- const CORBA::Any & value,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- type_ (type),
+- value_ (value)
+-{}
++ if (
++ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
++ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
++ obj->_is_collocated () &&_TAO_IDLType_Proxy_Broker_Factory_function_pointer != 0
++ )
++ {
++ ACE_NEW_RETURN (
++ default_proxy,
++ ::IR_IDLType (
++ stub,
++ 1,
++ obj->_servant ()),
++
++ IR_IDLType::_nil ());
++ }
++ if (CORBA::is_nil (default_proxy))
++ ACE_NEW_RETURN (default_proxy, ::IR_IDLType (stub, 0, obj->_servant ()), IR_IDLType::_nil ());
++ return default_proxy;
++ }
++ else
++ return
++ ACE_reinterpret_cast
++ (
++ IR_IDLType_ptr,
++ obj->_tao_QueryInterface
++ (
++ ACE_reinterpret_cast
++ (
++ ptr_arith_t,
++ &IR_IDLType::_narrow
++ )
++ )
++ );
++}
+
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_IDLType_ptr
++IR_IDLType::_duplicate (IR_IDLType_ptr obj)
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_type + 1);
+- this->parameter_list_[length_type].argument <<= this->type_;
+-
+- this->parameter_list_[length_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_value = this->parameter_list_.length ();
+- this->parameter_list_.length (length_value + 1);
+- this->parameter_list_[length_value].argument <<= value_;
+- this->parameter_list_[length_value].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
++ if (!CORBA::is_nil (obj))
++ obj->_add_ref ();
++ return obj;
+ }
+
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++CORBA::Boolean IR_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+- // Generate the exception list on demand
+- return 0;
++ if (
++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
++ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
++ return 1; // success using local knowledge
++ else
++ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++void *IR_IDLType::_tao_QueryInterface (ptr_arith_t type)
+ {
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
++ void *retv = 0;
++ if (type == ACE_reinterpret_cast
++ (ptr_arith_t,
++ &IR_IDLType::_narrow))
++ retv = ACE_reinterpret_cast (void*, this);
++ else if (type == ACE_reinterpret_cast
++ (ptr_arith_t,
++ &CORBA_IRObject::_narrow))
++ retv = ACE_reinterpret_cast
++ (
++ void *,
++ ACE_static_cast
++ (
++ CORBA_IRObject_ptr,
++ this
++ )
++ );
++ else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
++ retv = ACE_reinterpret_cast (void *,
++ ACE_static_cast (CORBA::Object_ptr, this));
++
++ if (retv)
++ this->_add_ref ();
++ return retv;
+ }
+
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_constant::result (IR::ConstantDef_ptr result)
++const char* IR_IDLType::_interface_repository_id (void) const
+ {
+- // update the result
+- this->result_ = result;
++ return "IDL:omg.org/IR/IDLType:1.0";
+ }
+
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::TAO_ClientRequestInfo_IR_Container_create_struct (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::StructMemberSeq & members,
+- CORBA::Environment &
++CORBA::TypeCode_ptr IR_IDLType::type (
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- members_ (members)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_members = this->parameter_list_.length ();
+- this->parameter_list_.length (length_members + 1);
+- this->parameter_list_[length_members].argument <<= this->members_;
+-
+- this->parameter_list_[length_members].mode = Dynamic::PARAM_IN;
+
+- return &this->parameter_list_;
++ return this->the_TAO_IDLType_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
++ this,
++ ACE_TRY_ENV
++ );
+ }
+
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_struct::result (IR::StructDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::TAO_ClientRequestInfo_IR_Container_create_union (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr discriminator_type,
+- const IR::UnionMemberSeq & members,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- discriminator_type_ (discriminator_type),
+- members_ (members)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_discriminator_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_discriminator_type + 1);
+- this->parameter_list_[length_discriminator_type].argument <<= this->discriminator_type_;
+-
+- this->parameter_list_[length_discriminator_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_members = this->parameter_list_.length ();
+- this->parameter_list_.length (length_members + 1);
+- this->parameter_list_[length_members].argument <<= this->members_;
+-
+- this->parameter_list_[length_members].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_union::result (IR::UnionDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::TAO_ClientRequestInfo_IR_Container_create_enum (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::EnumMemberSeq & members,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- members_ (members)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_members = this->parameter_list_.length ();
+- this->parameter_list_.length (length_members + 1);
+- this->parameter_list_[length_members].argument <<= this->members_;
+-
+- this->parameter_list_[length_members].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_enum::result (IR::EnumDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::TAO_ClientRequestInfo_IR_Container_create_alias (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr original_type,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- original_type_ (original_type)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_original_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_original_type + 1);
+- this->parameter_list_[length_original_type].argument <<= this->original_type_;
+-
+- this->parameter_list_[length_original_type].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_alias::result (IR::AliasDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::TAO_ClientRequestInfo_IR_Container_create_interface (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::InterfaceDefSeq & base_interfaces,
+- const CORBA::Boolean & is_abstract,
+- const CORBA::Boolean & is_local,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- base_interfaces_ (base_interfaces),
+- is_abstract_ (is_abstract),
+- is_local_ (is_local)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_base_interfaces = this->parameter_list_.length ();
+- this->parameter_list_.length (length_base_interfaces + 1);
+- this->parameter_list_[length_base_interfaces].argument <<= this->base_interfaces_;
+-
+- this->parameter_list_[length_base_interfaces].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_is_abstract = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_abstract + 1);
+- this->parameter_list_[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+- this->parameter_list_[length_is_abstract].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_is_local = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_local + 1);
+- this->parameter_list_[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
+- this->parameter_list_[length_is_local].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_interface::result (IR::InterfaceDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::TAO_ClientRequestInfo_IR_Container_create_value (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const CORBA::Boolean & is_custom,
+- const CORBA::Boolean & is_abstract,
+- IR::ValueDef_ptr base_value,
+- const CORBA::Boolean & is_truncatable,
+- const IR::ValueDefSeq & abstract_base_values,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- const IR::InitializerSeq & initializers,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- is_custom_ (is_custom),
+- is_abstract_ (is_abstract),
+- base_value_ (base_value),
+- is_truncatable_ (is_truncatable),
+- abstract_base_values_ (abstract_base_values),
+- supported_interfaces_ (supported_interfaces),
+- initializers_ (initializers)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_is_custom = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_custom + 1);
+- this->parameter_list_[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
+- this->parameter_list_[length_is_custom].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_is_abstract = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_abstract + 1);
+- this->parameter_list_[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+- this->parameter_list_[length_is_abstract].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_base_value = this->parameter_list_.length ();
+- this->parameter_list_.length (length_base_value + 1);
+- this->parameter_list_[length_base_value].argument <<= this->base_value_;
+-
+- this->parameter_list_[length_base_value].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_is_truncatable = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_truncatable + 1);
+- this->parameter_list_[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
+- this->parameter_list_[length_is_truncatable].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_abstract_base_values = this->parameter_list_.length ();
+- this->parameter_list_.length (length_abstract_base_values + 1);
+- this->parameter_list_[length_abstract_base_values].argument <<= this->abstract_base_values_;
+-
+- this->parameter_list_[length_abstract_base_values].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_supported_interfaces = this->parameter_list_.length ();
+- this->parameter_list_.length (length_supported_interfaces + 1);
+- this->parameter_list_[length_supported_interfaces].argument <<= this->supported_interfaces_;
+-
+- this->parameter_list_[length_supported_interfaces].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_initializers = this->parameter_list_.length ();
+- this->parameter_list_.length (length_initializers + 1);
+- this->parameter_list_[length_initializers].argument <<= this->initializers_;
+-
+- this->parameter_list_[length_initializers].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value::result (IR::ValueDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::TAO_ClientRequestInfo_IR_Container_create_value_box (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr original_type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- original_type_def_ (original_type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_original_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_original_type_def + 1);
+- this->parameter_list_[length_original_type_def].argument <<= this->original_type_def_;
+-
+- this->parameter_list_[length_original_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_value_box::result (IR::ValueBoxDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::TAO_ClientRequestInfo_IR_Container_create_exception (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::StructMemberSeq & members,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- members_ (members)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_members = this->parameter_list_.length ();
+- this->parameter_list_.length (length_members + 1);
+- this->parameter_list_[length_members].argument <<= this->members_;
+-
+- this->parameter_list_[length_members].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_exception::result (IR::ExceptionDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::TAO_ClientRequestInfo_IR_Container_create_native (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Container::TAO_ClientRequestInfo_IR_Container_create_native::result (IR::NativeDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-static const CORBA::Long _oc_IR_Container[] =
+-{
+- TAO_ENCAP_BYTE_ORDER, // byte order
+- 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7461), ACE_NTOHL (0x696e6572), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/Container:1.0
+- 10, ACE_NTOHL (0x436f6e74), ACE_NTOHL (0x61696e65), ACE_NTOHL (0x72000000), // name = Container
+-};
+-static CORBA::TypeCode _tc_TAO_tc_IR_Container (CORBA::tk_objref, sizeof (_oc_IR_Container), (char *) &_oc_IR_Container, 0, sizeof (IR::Container));
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (IR)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Container, &_tc_TAO_tc_IR_Container)
+-TAO_NAMESPACE_END
+-
+-///////////////////////////////////////////////////////////////////////
+-// Base & Remote Proxy Implementation.
+-//
+-
+-IR::_TAO_IDLType_Proxy_Impl::_TAO_IDLType_Proxy_Impl (void)
+-{}
+-
+-IR::_TAO_IDLType_Remote_Proxy_Impl::_TAO_IDLType_Remote_Proxy_Impl (void)
+-{}
+-
+-// Remote Implementation of the IDL interface methods
+-
+-CORBA::TypeCode_ptr IR::_TAO_IDLType_Remote_Proxy_Impl::type (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
+- CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
+-
+-
+- TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+- if (istub == 0)
+- ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+-
+- TAO_GIOP_Twoway_Invocation _tao_call (
+- istub,
+- "_get_type",
+- 9,
+- 0,
+- istub->orb_core ()
+- );
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get ri (
+- "_get_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+- for (;;)
+- {
+- _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+-
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+- CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+-
+- _tao_call.prepare_header (
+- ACE_static_cast (CORBA::Octet, _tao_response_flag),
+- ACE_TRY_ENV
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+- int _invoke_status =
+- _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+-
+- if (_invoke_status == TAO_INVOKE_RESTART)
+- {
+- _tao_call.restart_flag (1);
+- continue;
+- }
+- if (_invoke_status != TAO_INVOKE_OK)
+- {
+- TAO_INTERCEPTOR_THROW_RETURN (
+- CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+- 0
+- );
+- }
+- TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
+- if (!(
+- (_tao_in >> _tao_safe_retval.inout ())
+- ))
+- {
+- TAO_INTERCEPTOR_THROW_RETURN (
+- CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+- 0
+- );
+- }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+- break;
+- }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+- return _tao_safe_retval._retn ();
+-}
+-
+-
+-//
+-// End Base & Remote Proxy Implemeentation.
+-///////////////////////////////////////////////////////////////////////
+-
+-
+-///////////////////////////////////////////////////////////////////////
+-// Remote & Base Proxy Broker Implementation
+-//
+-
+-IR::_TAO_IDLType_Proxy_Broker::_TAO_IDLType_Proxy_Broker (void)
+-{
+-}
+-
+-IR::_TAO_IDLType_Proxy_Broker::~_TAO_IDLType_Proxy_Broker (void)
+-{
+-}
+-
+-// Factory Member function Implementation.
+-IR::_TAO_IDLType_Remote_Proxy_Broker *IR::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker (void)
+-{
+- static ::IR::_TAO_IDLType_Remote_Proxy_Broker remote_proxy_broker;
+- return &remote_proxy_broker;
+-}
+-
+-IR::_TAO_IDLType_Remote_Proxy_Broker::_TAO_IDLType_Remote_Proxy_Broker (void)
+-{
+-}
+-
+-IR::_TAO_IDLType_Remote_Proxy_Broker::~_TAO_IDLType_Remote_Proxy_Broker (void)
+-{
+-}
+-
+-IR::_TAO_IDLType_Proxy_Impl&
+-IR::_TAO_IDLType_Remote_Proxy_Broker::select_proxy (
+- ::IR::IDLType *object,
+- CORBA::Environment &ACE_TRY_ENV
+-)
+-{
+- ACE_UNUSED_ARG (object);
+- ACE_UNUSED_ARG (ACE_TRY_ENV);
+- return remote_proxy_impl_;
+-}
+-
+-
+-//
+-// End Remote & Base Proxy Broker Implementation
+-///////////////////////////////////////////////////////////////////////
+-
+-
+-// default constructor
+-IR::IDLType::IDLType (int collocated)
+-{
+- this->_tao_setup_collocation (collocated);
+-}
+-
+-// destructor
+-IR::IDLType::~IDLType (void)
+-{}
+-
+-void
+-IR::IDLType::_tao_setup_collocation (int collocated)
+-{
+- if (collocated)
+- this->the_TAO_IDLType_Proxy_Broker_ =
+- ::IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer (this);
+- else
+- this->the_TAO_IDLType_Proxy_Broker_ =
+- ::IR::_TAO_IDLType_Remote_Proxy_Broker::the_TAO_IDLType_Remote_Proxy_Broker ();
+-
+- ACE_NESTED_CLASS (CORBA,IRObject)::_tao_setup_collocation (collocated);
+-
+-}
+-
+-void IR::IDLType::_tao_any_destructor (void *x)
+-{
+- IDLType *tmp = ACE_static_cast (IDLType*,x);
+- CORBA::release (tmp);
+-}
+-
+-IR::IDLType_ptr IR::IDLType::_narrow (
+- CORBA::Object_ptr obj,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+-{
+- if (CORBA::is_nil (obj))
+- return IDLType::_nil ();
+- if (! obj->_is_local ())
+- {
+- CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/IDLType:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (IDLType::_nil ());
+- if (is_a == 0)
+- return IDLType::_nil ();
+- }
+- return IDLType::_unchecked_narrow (obj, ACE_TRY_ENV);
+-}
+-
+-IR::IDLType_ptr IR::IDLType::_unchecked_narrow (
+- CORBA::Object_ptr obj,
+- CORBA::Environment &
+- )
+-{
+- if (CORBA::is_nil (obj))
+- return IDLType::_nil ();
+- if (! obj->_is_local ())
+- {
+- TAO_Stub* stub = obj->_stubobj ();
+- if (stub)
+- stub->_incr_refcnt ();
+- IDLType_ptr default_proxy = IDLType::_nil ();
+-
+- if (
+- !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+- stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer != 0
+- )
+- {
+- ACE_NEW_RETURN (
+- default_proxy,
+- ::IR::IDLType (
+- stub,
+- 1,
+- obj->_servant ()),
+-
+- IDLType::_nil ());
+- }
+- if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::IDLType (stub, 0, obj->_servant ()), IDLType::_nil ());
+- return default_proxy;
+- }
+- else
+- return
+- ACE_reinterpret_cast
+- (
+- IDLType_ptr,
+- obj->_tao_QueryInterface
+- (
+- ACE_reinterpret_cast
+- (
+- ptr_arith_t,
+- &IDLType::_narrow
+- )
+- )
+- );
+-}
+-
+-IR::IDLType_ptr
+-IR::IDLType::_duplicate (IDLType_ptr obj)
+-{
+- if (!CORBA::is_nil (obj))
+- obj->_add_ref ();
+- return obj;
+-}
+-
+-CORBA::Boolean IR::IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+-{
+- if (
+- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/IDLType:1.0")) ||
+- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+- (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+- return 1; // success using local knowledge
+- else
+- return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+-}
+-
+-void *IR::IDLType::_tao_QueryInterface (ptr_arith_t type)
+-{
+- void *retv = 0;
+- if (type == ACE_reinterpret_cast
+- (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
+- retv = ACE_reinterpret_cast (void*, this);
+- else if (type == ACE_reinterpret_cast
+- (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
+- retv = ACE_reinterpret_cast
+- (
+- void *,
+- ACE_static_cast
+- (
+- CORBA::IRObject_ptr,
+- this
+- )
+- );
+- else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+- retv = ACE_reinterpret_cast (void *,
+- ACE_static_cast (CORBA::Object_ptr, this));
+-
+- if (retv)
+- this->_add_ref ();
+- return retv;
+-}
+-
+-const char* IR::IDLType::_interface_repository_id (void) const
+-{
+- return "IDL:omg.org/IR/IDLType:1.0";
+-}
+-
+-CORBA::TypeCode_ptr IR::IDLType::type (
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_IDLType_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
+- this,
+- ACE_TRY_ENV
+- );
+-}
+-
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::TAO_ClientRequestInfo_IR_IDLType_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::IDLType::TAO_ClientRequestInfo_IR_IDLType_type_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_IDLType[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_IDLType (CORBA::tk_objref, sizeof (_oc_IR_IDLType), (char *) &_oc_IR_IDLType, 0, sizeof (IR::IDLType));
++static CORBA::TypeCode _tc_TAO_tc_IR_IDLType (CORBA::tk_objref, sizeof (_oc_IR_IDLType), (char *) &_oc_IR_IDLType, 0, sizeof (IR_IDLType));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_IDLType, &_tc_TAO_tc_IR_IDLType)
+@@ -9841,7 +6348,7 @@
+ 11, ACE_NTOHL (0x706b5f77), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e670000), // name = pk_wstring
+ 14, ACE_NTOHL (0x706b5f76), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x5f626173), ACE_NTOHL (0x65000000), // name = pk_value_base
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveKind (CORBA::tk_enum, sizeof (_oc_IR_PrimitiveKind), (char *) &_oc_IR_PrimitiveKind, 0, sizeof (IR::PrimitiveKind));
++static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveKind (CORBA::tk_enum, sizeof (_oc_IR_PrimitiveKind), (char *) &_oc_IR_PrimitiveKind, 0, sizeof (IR_PrimitiveKind));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveKind, &_tc_TAO_tc_IR_PrimitiveKind)
+@@ -9851,15 +6358,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
++_TAO_Repository_Proxy_Impl::_TAO_Repository_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (void)
++_TAO_Repository_Remote_Proxy_Impl::_TAO_Repository_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::Contained_ptr IR::_TAO_Repository_Remote_Proxy_Impl::lookup_id (
++IR_Contained_ptr _TAO_Repository_Remote_Proxy_Impl::lookup_id (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -9868,16 +6375,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::Contained_ptr _tao_retval = IR::Contained::_nil ();
+- IR::Contained_var _tao_safe_retval (_tao_retval);
+-
++ IR_Contained_ptr _tao_retval = IR_Contained::_nil ();
++ IR_Contained_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "lookup_id",
+@@ -9886,57 +6390,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id ri (
+- "lookup_id",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- search_id,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << search_id)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -9945,7 +6423,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -9955,45 +6433,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::Contained_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-CORBA::TypeCode_ptr IR::_TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
++CORBA::TypeCode_ptr _TAO_Repository_Remote_Proxy_Impl::get_canonical_typecode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::TypeCode_ptr tc,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -10002,16 +6453,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
+ CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
+
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "get_canonical_typecode",
+@@ -10020,57 +6468,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode ri (
+- "get_canonical_typecode",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- tc,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << tc)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -10079,7 +6501,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -10089,63 +6511,33 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::PrimitiveDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::get_primitive (
++IR_PrimitiveDef_ptr _TAO_Repository_Remote_Proxy_Impl::get_primitive (
+ CORBA_Object *_collocated_tao_target_,
+- IR::PrimitiveKind kind,
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::PrimitiveDef_ptr _tao_retval = IR::PrimitiveDef::_nil ();
+- IR::PrimitiveDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_PrimitiveDef_ptr _tao_retval = IR_PrimitiveDef::_nil ();
++ IR_PrimitiveDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "get_primitive",
+@@ -10154,57 +6546,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive ri (
+- "get_primitive",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- kind,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << kind)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -10213,7 +6579,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -10223,45 +6589,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::StringDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_string (
++IR_StringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_string (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -10270,15 +6609,12 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::StringDef_ptr _tao_retval = IR::StringDef::_nil ();
+- IR::StringDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_StringDef_ptr _tao_retval = IR_StringDef::_nil ();
++ IR_StringDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+@@ -10288,57 +6624,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string ri (
+- "create_string",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- bound,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << bound)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -10347,7 +6657,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -10357,45 +6667,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::StringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::WstringDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_wstring (
++IR_WstringDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_wstring (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -10404,16 +6687,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::WstringDef_ptr _tao_retval = IR::WstringDef::_nil ();
+- IR::WstringDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_WstringDef_ptr _tao_retval = IR_WstringDef::_nil ();
++ IR_WstringDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_wstring",
+@@ -10422,57 +6702,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring ri (
+- "create_wstring",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- bound,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << bound)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -10481,7 +6735,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -10491,64 +6745,34 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::WstringDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::SequenceDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_sequence (
++IR_SequenceDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_sequence (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::SequenceDef_ptr _tao_retval = IR::SequenceDef::_nil ();
+- IR::SequenceDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_SequenceDef_ptr _tao_retval = IR_SequenceDef::_nil ();
++ IR_SequenceDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_sequence",
+@@ -10557,59 +6781,32 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence ri (
+- "create_sequence",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- bound,
+- element_type,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << bound) &&
+ (_tao_out << element_type)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -10618,7 +6815,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -10628,125 +6825,68 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::SequenceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ArrayDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_array (
++IR_ArrayDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_array (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong length,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::ArrayDef_ptr _tao_retval = IR::ArrayDef::_nil ();
+- IR::ArrayDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_ArrayDef_ptr _tao_retval = IR_ArrayDef::_nil ();
++ IR_ArrayDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_array",
+ 12,
+ 1,
+- istub->orb_core ()
+- );
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array ri (
+- "create_array",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- length,
+- element_type,
+- ACE_TRY_ENV
++ istub->orb_core ()
+ );
+- ACE_CHECK_RETURN (0);
+
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << length) &&
+ (_tao_out << element_type)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -10755,7 +6895,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -10765,45 +6905,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ArrayDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::FixedDef_ptr IR::_TAO_Repository_Remote_Proxy_Impl::create_fixed (
++IR_FixedDef_ptr _TAO_Repository_Remote_Proxy_Impl::create_fixed (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::UShort digits,
+ CORBA::Short scale,
+@@ -10813,16 +6926,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::FixedDef_ptr _tao_retval = IR::FixedDef::_nil ();
+- IR::FixedDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_FixedDef_ptr _tao_retval = IR_FixedDef::_nil ();
++ IR_FixedDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_fixed",
+@@ -10831,59 +6941,32 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed ri (
+- "create_fixed",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- digits,
+- scale,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << digits) &&
+ (_tao_out << scale)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -10892,7 +6975,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -10902,41 +6985,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::FixedDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -10950,32 +7006,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_Repository_Proxy_Broker::_TAO_Repository_Proxy_Broker (void)
++_TAO_Repository_Proxy_Broker::_TAO_Repository_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
++_TAO_Repository_Proxy_Broker::~_TAO_Repository_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_Repository_Remote_Proxy_Broker *IR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_Repository_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_Repository_Remote_Proxy_Broker::_TAO_Repository_Remote_Proxy_Broker (void)
++_TAO_Repository_Remote_Proxy_Broker::_TAO_Repository_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Repository_Remote_Proxy_Broker::~_TAO_Repository_Remote_Proxy_Broker (void)
++_TAO_Repository_Remote_Proxy_Broker::~_TAO_Repository_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_Repository_Proxy_Impl&
+-IR::_TAO_Repository_Remote_Proxy_Broker::select_proxy (
+- ::IR::Repository *object,
++_TAO_Repository_Proxy_Impl&
++_TAO_Repository_Remote_Proxy_Broker::select_proxy (
++ ::IR_Repository *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -10991,110 +7047,110 @@
+
+
+ // default constructor
+-IR::Repository::Repository (int collocated)
++IR_Repository::IR_Repository (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::Repository::~Repository (void)
++IR_Repository::~IR_Repository (void)
+ {}
+
+ void
+-IR::Repository::_tao_setup_collocation (int collocated)
++IR_Repository::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_Repository_Proxy_Broker_ =
+- ::IR__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_Repository_Proxy_Broker_ =
+- ::IR::_TAO_Repository_Remote_Proxy_Broker::the_TAO_Repository_Remote_Proxy_Broker ();
++ ::the_TAO_Repository_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Container)::_tao_setup_collocation (collocated);
++ IR_Container::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::Repository::_tao_any_destructor (void *x)
++void IR_Repository::_tao_any_destructor (void *x)
+ {
+- Repository *tmp = ACE_static_cast (Repository*,x);
++ IR_Repository *tmp = ACE_static_cast (IR_Repository*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::Repository_ptr IR::Repository::_narrow (
++IR_Repository_ptr IR_Repository::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return Repository::_nil ();
++ return IR_Repository::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/Repository:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (Repository::_nil ());
++ ACE_CHECK_RETURN (IR_Repository::_nil ());
+ if (is_a == 0)
+- return Repository::_nil ();
++ return IR_Repository::_nil ();
+ }
+- return Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_Repository::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::Repository_ptr IR::Repository::_unchecked_narrow (
++IR_Repository_ptr IR_Repository::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return Repository::_nil ();
++ return IR_Repository::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- Repository_ptr default_proxy = Repository::_nil ();
++ IR_Repository_ptr default_proxy = IR_Repository::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_Repository_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_Repository_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::Repository (
++ ::IR_Repository (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- Repository::_nil ());
++ IR_Repository::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::Repository (stub, 0, obj->_servant ()), Repository::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_Repository (stub, 0, obj->_servant ()), IR_Repository::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- Repository_ptr,
++ IR_Repository_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &Repository::_narrow
++ &IR_Repository::_narrow
+ )
+ )
+ );
+ }
+
+-IR::Repository_ptr
+-IR::Repository::_duplicate (Repository_ptr obj)
++IR_Repository_ptr
++IR_Repository::_duplicate (IR_Repository_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/Repository:1.0")) ||
+@@ -11106,34 +7162,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::Repository::_tao_QueryInterface (ptr_arith_t type)
++void *IR_Repository::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Repository)::_narrow))
++ &IR_Repository::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -11146,20 +7202,19 @@
+ return retv;
+ }
+
+-const char* IR::Repository::_interface_repository_id (void) const
++const char* IR_Repository::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/Repository:1.0";
+ }
+
+-IR::Contained_ptr IR::Repository::lookup_id (
+- const char * search_id,
++IR_Contained_ptr IR_Repository::lookup_id (
++ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).lookup_id (
+ this,
+ search_id,
+@@ -11167,7 +7222,7 @@
+ );
+ }
+
+-CORBA::TypeCode_ptr IR::Repository::get_canonical_typecode (
++CORBA::TypeCode_ptr IR_Repository::get_canonical_typecode (
+ CORBA::TypeCode_ptr tc,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -11175,7 +7230,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).get_canonical_typecode (
+ this,
+ tc,
+@@ -11183,15 +7237,14 @@
+ );
+ }
+
+-IR::PrimitiveDef_ptr IR::Repository::get_primitive (
+- IR::PrimitiveKind kind,
++IR_PrimitiveDef_ptr IR_Repository::get_primitive (
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).get_primitive (
+ this,
+ kind,
+@@ -11199,7 +7252,7 @@
+ );
+ }
+
+-IR::StringDef_ptr IR::Repository::create_string (
++IR_StringDef_ptr IR_Repository::create_string (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -11207,7 +7260,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_string (
+ this,
+ bound,
+@@ -11215,7 +7267,7 @@
+ );
+ }
+
+-IR::WstringDef_ptr IR::Repository::create_wstring (
++IR_WstringDef_ptr IR_Repository::create_wstring (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -11223,7 +7275,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_wstring (
+ this,
+ bound,
+@@ -11231,16 +7282,15 @@
+ );
+ }
+
+-IR::SequenceDef_ptr IR::Repository::create_sequence (
++IR_SequenceDef_ptr IR_Repository::create_sequence (
+ CORBA::ULong bound,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_sequence (
+ this,
+ bound,
+@@ -11249,16 +7299,15 @@
+ );
+ }
+
+-IR::ArrayDef_ptr IR::Repository::create_array (
++IR_ArrayDef_ptr IR_Repository::create_array (
+ CORBA::ULong length,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_array (
+ this,
+ length,
+@@ -11267,7 +7316,7 @@
+ );
+ }
+
+-IR::FixedDef_ptr IR::Repository::create_fixed (
++IR_FixedDef_ptr IR_Repository::create_fixed (
+ CORBA::UShort digits,
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -11276,7 +7325,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_Repository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_fixed (
+ this,
+ digits,
+@@ -11285,430 +7333,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::TAO_ClientRequestInfo_IR_Repository_lookup_id (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * search_id,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- search_id_ (search_id)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_search_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_search_id + 1);
+- this->parameter_list_[length_search_id].argument <<= search_id_;
+- this->parameter_list_[length_search_id].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_lookup_id::result (IR::Contained_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::TypeCode_ptr tc,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- tc_ (tc)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_tc = this->parameter_list_.length ();
+- this->parameter_list_.length (length_tc + 1);
+- this->parameter_list_[length_tc].argument <<= tc_;
+- this->parameter_list_[length_tc].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::TAO_ClientRequestInfo_IR_Repository_get_primitive (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::PrimitiveKind & kind,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- kind_ (kind)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_kind = this->parameter_list_.length ();
+- this->parameter_list_.length (length_kind + 1);
+- this->parameter_list_[length_kind].argument <<= this->kind_;
+-
+- this->parameter_list_[length_kind].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_get_primitive::result (IR::PrimitiveDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::TAO_ClientRequestInfo_IR_Repository_create_string (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- bound_ (bound)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_bound = this->parameter_list_.length ();
+- this->parameter_list_.length (length_bound + 1);
+- this->parameter_list_[length_bound].argument <<= bound_;
+- this->parameter_list_[length_bound].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_string::result (IR::StringDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::TAO_ClientRequestInfo_IR_Repository_create_wstring (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- bound_ (bound)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_bound = this->parameter_list_.length ();
+- this->parameter_list_.length (length_bound + 1);
+- this->parameter_list_[length_bound].argument <<= bound_;
+- this->parameter_list_[length_bound].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_wstring::result (IR::WstringDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::TAO_ClientRequestInfo_IR_Repository_create_sequence (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- IR::IDLType_ptr element_type,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- bound_ (bound),
+- element_type_ (element_type)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_bound = this->parameter_list_.length ();
+- this->parameter_list_.length (length_bound + 1);
+- this->parameter_list_[length_bound].argument <<= bound_;
+- this->parameter_list_[length_bound].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_element_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_element_type + 1);
+- this->parameter_list_[length_element_type].argument <<= this->element_type_;
+-
+- this->parameter_list_[length_element_type].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_sequence::result (IR::SequenceDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::TAO_ClientRequestInfo_IR_Repository_create_array (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & length,
+- IR::IDLType_ptr element_type,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- length_ (length),
+- element_type_ (element_type)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_length = this->parameter_list_.length ();
+- this->parameter_list_.length (length_length + 1);
+- this->parameter_list_[length_length].argument <<= length_;
+- this->parameter_list_[length_length].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_element_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_element_type + 1);
+- this->parameter_list_[length_element_type].argument <<= this->element_type_;
+-
+- this->parameter_list_[length_element_type].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_array::result (IR::ArrayDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::TAO_ClientRequestInfo_IR_Repository_create_fixed (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::UShort & digits,
+- const CORBA::Short & scale,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- digits_ (digits),
+- scale_ (scale)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_digits = this->parameter_list_.length ();
+- this->parameter_list_.length (length_digits + 1);
+- this->parameter_list_[length_digits].argument <<= digits_;
+- this->parameter_list_[length_digits].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_scale = this->parameter_list_.length ();
+- this->parameter_list_.length (length_scale + 1);
+- this->parameter_list_[length_scale].argument <<= scale_;
+- this->parameter_list_[length_scale].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::Repository::TAO_ClientRequestInfo_IR_Repository_create_fixed::result (IR::FixedDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_Repository[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f52), ACE_NTOHL (0x65706f73), ACE_NTOHL (0x69746f72), ACE_NTOHL (0x793a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/Repository:1.0
+- 11, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72790000), // name = Repository
++ 11, ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72790000), // name = IR_Repository
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_Repository (CORBA::tk_objref, sizeof (_oc_IR_Repository), (char *) &_oc_IR_Repository, 0, sizeof (IR::Repository));
++static CORBA::TypeCode _tc_TAO_tc_IR_Repository (CORBA::tk_objref, sizeof (_oc_IR_Repository), (char *) &_oc_IR_Repository, 0, sizeof (IR_Repository));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Repository, &_tc_TAO_tc_IR_Repository)
+@@ -11718,36 +7349,33 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_Proxy_Impl (void)
++_TAO_ComponentRepository_Proxy_Impl::_TAO_ComponentRepository_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_Proxy_Impl (void)
++_TAO_ComponentRepository_Remote_Proxy_Impl::_TAO_ComponentRepository_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::ComponentDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
++IR_ComponentDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_component (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ComponentDef_ptr base_component,
+- const IR::InterfaceDefSeq & supports_interfaces,
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
+- IR::ComponentDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
++ IR_ComponentDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+-
+
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+@@ -11757,48 +7385,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component ri (
+- "create_component",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- base_component,
+- supports_interfaces,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -11808,14 +7406,14 @@
+ (_tao_out << base_component) &&
+ (_tao_out << supports_interfaces)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -11824,7 +7422,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -11834,68 +7432,38 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::HomeDef_ptr IR::_TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
++IR_HomeDef_ptr _TAO_ComponentRepository_Remote_Proxy_Impl::create_home (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::HomeDef_ptr base_home,
+- IR::ComponentDef_ptr managed_component,
+- IR::ValueDef_ptr primary_key,
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::HomeDef_ptr _tao_retval = IR::HomeDef::_nil ();
+- IR::HomeDef_var _tao_safe_retval (_tao_retval);
+-
++ IR_HomeDef_ptr _tao_retval = IR_HomeDef::_nil ();
++ IR_HomeDef_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "create_home",
+@@ -11904,49 +7472,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home ri (
+- "create_home",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- base_home,
+- managed_component,
+- primary_key,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -11957,14 +7494,14 @@
+ (_tao_out << managed_component) &&
+ (_tao_out << primary_key)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -11973,7 +7510,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -11983,41 +7520,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -12031,32 +7541,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
++_TAO_ComponentRepository_Proxy_Broker::_TAO_ComponentRepository_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (void)
++_TAO_ComponentRepository_Proxy_Broker::~_TAO_ComponentRepository_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ComponentRepository_Remote_Proxy_Broker *IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ComponentRepository_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ComponentRepository_Remote_Proxy_Broker::_TAO_ComponentRepository_Remote_Proxy_Broker (void)
++_TAO_ComponentRepository_Remote_Proxy_Broker::_TAO_ComponentRepository_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remote_Proxy_Broker (void)
++_TAO_ComponentRepository_Remote_Proxy_Broker::~_TAO_ComponentRepository_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ComponentRepository_Proxy_Impl&
+-IR::_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
+- ::IR::ComponentRepository *object,
++_TAO_ComponentRepository_Proxy_Impl&
++_TAO_ComponentRepository_Remote_Proxy_Broker::select_proxy (
++ ::IR_ComponentRepository *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -12072,110 +7582,110 @@
+
+
+ // default constructor
+-IR::ComponentRepository::ComponentRepository (int collocated)
++IR_ComponentRepository::IR_ComponentRepository (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ComponentRepository::~ComponentRepository (void)
++IR_ComponentRepository::~IR_ComponentRepository (void)
+ {}
+
+ void
+-IR::ComponentRepository::_tao_setup_collocation (int collocated)
++IR_ComponentRepository::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ComponentRepository_Proxy_Broker_ =
+- ::IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ComponentRepository_Proxy_Broker_ =
+- ::IR::_TAO_ComponentRepository_Remote_Proxy_Broker::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
++ ::the_TAO_ComponentRepository_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Repository)::_tao_setup_collocation (collocated);
++ IR_Repository::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ComponentRepository::_tao_any_destructor (void *x)
++void IR_ComponentRepository::_tao_any_destructor (void *x)
+ {
+- ComponentRepository *tmp = ACE_static_cast (ComponentRepository*,x);
++ IR_ComponentRepository *tmp = ACE_static_cast (IR_ComponentRepository*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ComponentRepository_ptr IR::ComponentRepository::_narrow (
++IR_ComponentRepository_ptr IR_ComponentRepository::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ComponentRepository::_nil ();
++ return IR_ComponentRepository::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentRepository:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ComponentRepository::_nil ());
++ ACE_CHECK_RETURN (IR_ComponentRepository::_nil ());
+ if (is_a == 0)
+- return ComponentRepository::_nil ();
++ return IR_ComponentRepository::_nil ();
+ }
+- return ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ComponentRepository::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ComponentRepository_ptr IR::ComponentRepository::_unchecked_narrow (
++IR_ComponentRepository_ptr IR_ComponentRepository::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ComponentRepository::_nil ();
++ return IR_ComponentRepository::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ComponentRepository_ptr default_proxy = ComponentRepository::_nil ();
++ IR_ComponentRepository_ptr default_proxy = IR_ComponentRepository::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ComponentRepository (
++ ::IR_ComponentRepository (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ComponentRepository::_nil ());
++ IR_ComponentRepository::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ComponentRepository (stub, 0, obj->_servant ()), ComponentRepository::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ComponentRepository (stub, 0, obj->_servant ()), IR_ComponentRepository::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ComponentRepository_ptr,
++ IR_ComponentRepository_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ComponentRepository::_narrow
++ &IR_ComponentRepository::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ComponentRepository_ptr
+-IR::ComponentRepository::_duplicate (ComponentRepository_ptr obj)
++IR_ComponentRepository_ptr
++IR_ComponentRepository::_duplicate (IR_ComponentRepository_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ComponentRepository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ComponentRepository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentRepository:1.0")) ||
+@@ -12188,46 +7698,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ComponentRepository::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ComponentRepository)::_narrow))
++ &IR_ComponentRepository::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Repository)::_narrow))
++ &IR_Repository::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Repository_ptr,
++ IR_Repository_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -12240,24 +7750,23 @@
+ return retv;
+ }
+
+-const char* IR::ComponentRepository::_interface_repository_id (void) const
++const char* IR_ComponentRepository::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ComponentRepository:1.0";
+ }
+
+-IR::ComponentDef_ptr IR::ComponentRepository::create_component (
++IR_ComponentDef_ptr IR_ComponentRepository::create_component (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ComponentDef_ptr base_component,
+- const IR::InterfaceDefSeq & supports_interfaces,
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_component (
+ this,
+ id,
+@@ -12269,20 +7778,19 @@
+ );
+ }
+
+-IR::HomeDef_ptr IR::ComponentRepository::create_home (
++IR_HomeDef_ptr IR_ComponentRepository::create_home (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::HomeDef_ptr base_home,
+- IR::ComponentDef_ptr managed_component,
+- IR::ValueDef_ptr primary_key,
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_ComponentRepository_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_home (
+ this,
+ id,
+@@ -12295,173 +7803,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ComponentDef_ptr base_component,
+- const IR::InterfaceDefSeq & supports_interfaces,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- base_component_ (base_component),
+- supports_interfaces_ (supports_interfaces)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_base_component = this->parameter_list_.length ();
+- this->parameter_list_.length (length_base_component + 1);
+- this->parameter_list_[length_base_component].argument <<= this->base_component_;
+-
+- this->parameter_list_[length_base_component].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_supports_interfaces = this->parameter_list_.length ();
+- this->parameter_list_.length (length_supports_interfaces + 1);
+- this->parameter_list_[length_supports_interfaces].argument <<= this->supports_interfaces_;
+-
+- this->parameter_list_[length_supports_interfaces].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_component::result (IR::ComponentDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::HomeDef_ptr base_home,
+- IR::ComponentDef_ptr managed_component,
+- IR::ValueDef_ptr primary_key,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- base_home_ (base_home),
+- managed_component_ (managed_component),
+- primary_key_ (primary_key)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_base_home = this->parameter_list_.length ();
+- this->parameter_list_.length (length_base_home + 1);
+- this->parameter_list_[length_base_home].argument <<= this->base_home_;
+-
+- this->parameter_list_[length_base_home].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_managed_component = this->parameter_list_.length ();
+- this->parameter_list_.length (length_managed_component + 1);
+- this->parameter_list_[length_managed_component].argument <<= this->managed_component_;
+-
+- this->parameter_list_[length_managed_component].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_primary_key = this->parameter_list_.length ();
+- this->parameter_list_.length (length_primary_key + 1);
+- this->parameter_list_[length_primary_key].argument <<= this->primary_key_;
+-
+- this->parameter_list_[length_primary_key].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentRepository::TAO_ClientRequestInfo_IR_ComponentRepository_create_home::result (IR::HomeDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ComponentRepository[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 39, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x5265706f), ACE_NTOHL (0x7369746f), ACE_NTOHL (0x72793a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ComponentRepository:1.0
+- 20, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74526570), ACE_NTOHL (0x6f736974), ACE_NTOHL (0x6f727900), // name = ComponentRepository
++ 20, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74526570), ACE_NTOHL (0x6f736974), ACE_NTOHL (0x6f727900), // name = IR_ComponentRepository
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ComponentRepository (CORBA::tk_objref, sizeof (_oc_IR_ComponentRepository), (char *) &_oc_IR_ComponentRepository, 0, sizeof (IR::ComponentRepository));
++static CORBA::TypeCode _tc_TAO_tc_IR_ComponentRepository (CORBA::tk_objref, sizeof (_oc_IR_ComponentRepository), (char *) &_oc_IR_ComponentRepository, 0, sizeof (IR_ComponentRepository));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentRepository, &_tc_TAO_tc_IR_ComponentRepository)
+@@ -12471,10 +7819,10 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
++_TAO_ModuleDef_Proxy_Impl::_TAO_ModuleDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
++_TAO_ModuleDef_Remote_Proxy_Impl::_TAO_ModuleDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -12489,32 +7837,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
++_TAO_ModuleDef_Proxy_Broker::_TAO_ModuleDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
++_TAO_ModuleDef_Proxy_Broker::~_TAO_ModuleDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ModuleDef_Remote_Proxy_Broker *IR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ModuleDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ModuleDef_Remote_Proxy_Broker::_TAO_ModuleDef_Remote_Proxy_Broker (void)
++_TAO_ModuleDef_Remote_Proxy_Broker::_TAO_ModuleDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ModuleDef_Remote_Proxy_Broker::~_TAO_ModuleDef_Remote_Proxy_Broker (void)
++_TAO_ModuleDef_Remote_Proxy_Broker::~_TAO_ModuleDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ModuleDef_Proxy_Impl&
+-IR::_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ModuleDef *object,
++_TAO_ModuleDef_Proxy_Impl&
++_TAO_ModuleDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ModuleDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -12530,111 +7878,111 @@
+
+
+ // default constructor
+-IR::ModuleDef::ModuleDef (int collocated)
++IR_ModuleDef::IR_ModuleDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ModuleDef::~ModuleDef (void)
++IR_ModuleDef::~IR_ModuleDef (void)
+ {}
+
+ void
+-IR::ModuleDef::_tao_setup_collocation (int collocated)
++IR_ModuleDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ModuleDef_Proxy_Broker_ =
+- ::IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ModuleDef_Proxy_Broker_ =
+- ::IR::_TAO_ModuleDef_Remote_Proxy_Broker::the_TAO_ModuleDef_Remote_Proxy_Broker ();
++ ::the_TAO_ModuleDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Container)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Container::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ModuleDef::_tao_any_destructor (void *x)
++void IR_ModuleDef::_tao_any_destructor (void *x)
+ {
+- ModuleDef *tmp = ACE_static_cast (ModuleDef*,x);
++ IR_ModuleDef *tmp = ACE_static_cast (IR_ModuleDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ModuleDef_ptr IR::ModuleDef::_narrow (
++IR_ModuleDef_ptr IR_ModuleDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ModuleDef::_nil ();
++ return IR_ModuleDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ModuleDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ModuleDef::_nil ());
++ ACE_CHECK_RETURN (IR_ModuleDef::_nil ());
+ if (is_a == 0)
+- return ModuleDef::_nil ();
++ return IR_ModuleDef::_nil ();
+ }
+- return ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ModuleDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ModuleDef_ptr IR::ModuleDef::_unchecked_narrow (
++IR_ModuleDef_ptr IR_ModuleDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ModuleDef::_nil ();
++ return IR_ModuleDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ModuleDef_ptr default_proxy = ModuleDef::_nil ();
++ IR_ModuleDef_ptr default_proxy = IR_ModuleDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ModuleDef (
++ ::IR_ModuleDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ModuleDef::_nil ());
++ IR_ModuleDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ModuleDef (stub, 0, obj->_servant ()), ModuleDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ModuleDef (stub, 0, obj->_servant ()), IR_ModuleDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ModuleDef_ptr,
++ IR_ModuleDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ModuleDef::_narrow
++ &IR_ModuleDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ModuleDef_ptr
+-IR::ModuleDef::_duplicate (ModuleDef_ptr obj)
++IR_ModuleDef_ptr
++IR_ModuleDef::_duplicate (IR_ModuleDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ModuleDef:1.0")) ||
+@@ -12647,46 +7995,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ModuleDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ModuleDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ModuleDef)::_narrow))
++ &IR_ModuleDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -12699,25 +8047,23 @@
+ return retv;
+ }
+
+-const char* IR::ModuleDef::_interface_repository_id (void) const
++const char* IR_ModuleDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ModuleDef:1.0";
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ModuleDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4d), ACE_NTOHL (0x6f64756c), ACE_NTOHL (0x65446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/ModuleDef:1.0
+- 10, ACE_NTOHL (0x4d6f6475), ACE_NTOHL (0x6c654465), ACE_NTOHL (0x66000000), // name = ModuleDef
++ 10, ACE_NTOHL (0x4d6f6475), ACE_NTOHL (0x6c654465), ACE_NTOHL (0x66000000), // name = IR_ModuleDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ModuleDef (CORBA::tk_objref, sizeof (_oc_IR_ModuleDef), (char *) &_oc_IR_ModuleDef, 0, sizeof (IR::ModuleDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ModuleDef (CORBA::tk_objref, sizeof (_oc_IR_ModuleDef), (char *) &_oc_IR_ModuleDef, 0, sizeof (IR_ModuleDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDef, &_tc_TAO_tc_IR_ModuleDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ModuleDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -12761,31 +8107,31 @@
+ 0U, // string length
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ModuleDescription (CORBA::tk_struct, sizeof (_oc_IR_ModuleDescription), (char *) &_oc_IR_ModuleDescription, 0, sizeof (IR::ModuleDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_ModuleDescription (CORBA::tk_struct, sizeof (_oc_IR_ModuleDescription), (char *) &_oc_IR_ModuleDescription, 0, sizeof (IR_ModuleDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ModuleDescription, &_tc_TAO_tc_IR_ModuleDescription)
+ TAO_NAMESPACE_END
+-void IR::ModuleDescription::_tao_any_destructor (void *x)
++
++void IR_ModuleDescription::_tao_any_destructor (void *x)
+ {
+- ModuleDescription *tmp = ACE_static_cast (ModuleDescription*,x);
++ IR_ModuleDescription *tmp = ACE_static_cast (IR_ModuleDescription*,x);
+ delete tmp;
+ }
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_Proxy_Impl (void)
++_TAO_ConstantDef_Proxy_Impl::_TAO_ConstantDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ConstantDef_Remote_Proxy_Impl::_TAO_ConstantDef_Remote_Proxy_Impl (void)
++_TAO_ConstantDef_Remote_Proxy_Impl::_TAO_ConstantDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::TypeCode_ptr IR::_TAO_ConstantDef_Remote_Proxy_Impl::type (
++CORBA::TypeCode_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12793,16 +8139,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
+ CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
+
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_type",
+@@ -12811,46 +8154,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get ri (
+- "_get_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -12859,7 +8177,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -12869,45 +8187,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::IDLType_ptr IR::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
++IR_IDLType_ptr _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12915,16 +8206,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
+-
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_type_def",
+@@ -12933,46 +8221,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get ri (
+- "_get_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -12981,7 +8244,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -12991,57 +8254,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ConstantDef_Remote_Proxy_Impl::type_def (
++void _TAO_ConstantDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -13055,56 +8287,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set ri (
+- "_set_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << type_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -13113,39 +8319,17 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Any * IR::_TAO_ConstantDef_Remote_Proxy_Impl::value (
++CORBA::Any * _TAO_ConstantDef_Remote_Proxy_Impl::value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13153,15 +8337,12 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ CORBA::Any *_tao_retval = 0;
+
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ ACE_NEW_RETURN (_tao_retval, CORBA::Any, _tao_retval);
+ CORBA::Any_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+@@ -13172,46 +8353,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get ri (
+- "_get_value",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -13220,7 +8376,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -13230,45 +8386,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Any * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ConstantDef_Remote_Proxy_Impl::value (
++void _TAO_ConstantDef_Remote_Proxy_Impl::value (
+ CORBA_Object *_collocated_tao_target_,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -13277,10 +8406,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -13294,56 +8419,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set ri (
+- "_set_value",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- value,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << value)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -13352,39 +8452,15 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-
+ //
+ // End Base & Remote Proxy Implemeentation.
+ ///////////////////////////////////////////////////////////////////////
+@@ -13394,32 +8470,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ConstantDef_Proxy_Broker::_TAO_ConstantDef_Proxy_Broker (void)
++_TAO_ConstantDef_Proxy_Broker::_TAO_ConstantDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_Proxy_Broker (void)
++_TAO_ConstantDef_Proxy_Broker::~_TAO_ConstantDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ConstantDef_Remote_Proxy_Broker *IR::_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ConstantDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ConstantDef_Remote_Proxy_Broker::_TAO_ConstantDef_Remote_Proxy_Broker (void)
++_TAO_ConstantDef_Remote_Proxy_Broker::_TAO_ConstantDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ConstantDef_Remote_Proxy_Broker::~_TAO_ConstantDef_Remote_Proxy_Broker (void)
++_TAO_ConstantDef_Remote_Proxy_Broker::~_TAO_ConstantDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ConstantDef_Proxy_Impl&
+-IR::_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ConstantDef *object,
++_TAO_ConstantDef_Proxy_Impl&
++_TAO_ConstantDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ConstantDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -13435,110 +8511,110 @@
+
+
+ // default constructor
+-IR::ConstantDef::ConstantDef (int collocated)
++IR_ConstantDef::IR_ConstantDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ConstantDef::~ConstantDef (void)
++IR_ConstantDef::~IR_ConstantDef (void)
+ {}
+
+ void
+-IR::ConstantDef::_tao_setup_collocation (int collocated)
++IR_ConstantDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ConstantDef_Proxy_Broker_ =
+- ::IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ConstantDef_Proxy_Broker_ =
+- ::IR::_TAO_ConstantDef_Remote_Proxy_Broker::the_TAO_ConstantDef_Remote_Proxy_Broker ();
++ ::the_TAO_ConstantDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ConstantDef::_tao_any_destructor (void *x)
++void IR_ConstantDef::_tao_any_destructor (void *x)
+ {
+- ConstantDef *tmp = ACE_static_cast (ConstantDef*,x);
++ IR_ConstantDef *tmp = ACE_static_cast (IR_ConstantDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ConstantDef_ptr IR::ConstantDef::_narrow (
++IR_ConstantDef_ptr IR_ConstantDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ConstantDef::_nil ();
++ return IR_ConstantDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConstantDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ConstantDef::_nil ());
++ ACE_CHECK_RETURN (IR_ConstantDef::_nil ());
+ if (is_a == 0)
+- return ConstantDef::_nil ();
++ return IR_ConstantDef::_nil ();
+ }
+- return ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ConstantDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ConstantDef_ptr IR::ConstantDef::_unchecked_narrow (
++IR_ConstantDef_ptr IR_ConstantDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ConstantDef::_nil ();
++ return IR_ConstantDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ConstantDef_ptr default_proxy = ConstantDef::_nil ();
++ IR_ConstantDef_ptr default_proxy = IR_ConstantDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ConstantDef (
++ ::IR_ConstantDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ConstantDef::_nil ());
++ IR_ConstantDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ConstantDef (stub, 0, obj->_servant ()), ConstantDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ConstantDef (stub, 0, obj->_servant ()), IR_ConstantDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ConstantDef_ptr,
++ IR_ConstantDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ConstantDef::_narrow
++ &IR_ConstantDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ConstantDef_ptr
+-IR::ConstantDef::_duplicate (ConstantDef_ptr obj)
++IR_ConstantDef_ptr
++IR_ConstantDef::_duplicate (IR_ConstantDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConstantDef:1.0")) ||
+@@ -13550,34 +8626,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ConstantDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ConstantDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ConstantDef)::_narrow))
++ &IR_ConstantDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -13590,48 +8666,45 @@
+ return retv;
+ }
+
+-const char* IR::ConstantDef::_interface_repository_id (void) const
++const char* IR_ConstantDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ConstantDef:1.0";
+ }
+
+-CORBA::TypeCode_ptr IR::ConstantDef::type (
++CORBA::TypeCode_ptr IR_ConstantDef::type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+-{
+-
++{
+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-IR::IDLType_ptr IR::ConstantDef::type_def (
++IR_IDLType_ptr IR_ConstantDef::type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::ConstantDef::type_def (
+- IR::IDLType_ptr type_def,
++void IR_ConstantDef::type_def (
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).type_def (
+ this,
+ type_def,
+@@ -13639,21 +8712,20 @@
+ );
+ }
+
+-CORBA::Any * IR::ConstantDef::value (
++CORBA::Any * IR_ConstantDef::value (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).value (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::ConstantDef::value (
++void IR_ConstantDef::value (
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13661,7 +8733,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ this->the_TAO_ConstantDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).value (
+ this,
+ value,
+@@ -13669,237 +8740,18 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::TAO_ClientRequestInfo_IR_ConstantDef_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- type_def_ (type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_type_def + 1);
+- this->parameter_list_[length_type_def].argument <<= this->type_def_;
+-
+- this->parameter_list_[length_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_type_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::TAO_ClientRequestInfo_IR_ConstantDef_value_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_get::result (CORBA::Any * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::TAO_ClientRequestInfo_IR_ConstantDef_value_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Any & value,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- value_ (value)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_value = this->parameter_list_.length ();
+- this->parameter_list_.length (length_value + 1);
+- this->parameter_list_[length_value].argument <<= value_;
+- this->parameter_list_[length_value].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ConstantDef::TAO_ClientRequestInfo_IR_ConstantDef_value_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ConstantDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7374), ACE_NTOHL (0x616e7444), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ConstantDef:1.0
+- 12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x74616e74), ACE_NTOHL (0x44656600), // name = ConstantDef
++ 12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x74616e74), ACE_NTOHL (0x44656600), // name = IR_ConstantDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ConstantDef (CORBA::tk_objref, sizeof (_oc_IR_ConstantDef), (char *) &_oc_IR_ConstantDef, 0, sizeof (IR::ConstantDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ConstantDef (CORBA::tk_objref, sizeof (_oc_IR_ConstantDef), (char *) &_oc_IR_ConstantDef, 0, sizeof (IR_ConstantDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDef, &_tc_TAO_tc_IR_ConstantDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ConstantDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -13949,14 +8801,15 @@
+ CORBA::tk_any,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ConstantDescription (CORBA::tk_struct, sizeof (_oc_IR_ConstantDescription), (char *) &_oc_IR_ConstantDescription, 0, sizeof (IR::ConstantDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_ConstantDescription (CORBA::tk_struct, sizeof (_oc_IR_ConstantDescription), (char *) &_oc_IR_ConstantDescription, 0, sizeof (IR_ConstantDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConstantDescription, &_tc_TAO_tc_IR_ConstantDescription)
+ TAO_NAMESPACE_END
+-void IR::ConstantDescription::_tao_any_destructor (void *x)
++
++void IR_ConstantDescription::_tao_any_destructor (void *x)
+ {
+- ConstantDescription *tmp = ACE_static_cast (ConstantDescription*,x);
++ IR_ConstantDescription *tmp = ACE_static_cast (IR_ConstantDescription*,x);
+ delete tmp;
+ }
+
+@@ -13965,10 +8818,10 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_Proxy_Impl (void)
++_TAO_TypedefDef_Proxy_Impl::_TAO_TypedefDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
++_TAO_TypedefDef_Remote_Proxy_Impl::_TAO_TypedefDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -13983,32 +8836,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
++_TAO_TypedefDef_Proxy_Broker::_TAO_TypedefDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
++_TAO_TypedefDef_Proxy_Broker::~_TAO_TypedefDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_TypedefDef_Remote_Proxy_Broker *IR::_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_TypedefDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_TypedefDef_Remote_Proxy_Broker::_TAO_TypedefDef_Remote_Proxy_Broker (void)
++_TAO_TypedefDef_Remote_Proxy_Broker::_TAO_TypedefDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_TypedefDef_Remote_Proxy_Broker::~_TAO_TypedefDef_Remote_Proxy_Broker (void)
++_TAO_TypedefDef_Remote_Proxy_Broker::~_TAO_TypedefDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_TypedefDef_Proxy_Impl&
+-IR::_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::TypedefDef *object,
++_TAO_TypedefDef_Proxy_Impl&
++_TAO_TypedefDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_TypedefDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -14024,111 +8877,111 @@
+
+
+ // default constructor
+-IR::TypedefDef::TypedefDef (int collocated)
++IR_TypedefDef::IR_TypedefDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::TypedefDef::~TypedefDef (void)
++IR_TypedefDef::~IR_TypedefDef (void)
+ {}
+
+ void
+-IR::TypedefDef::_tao_setup_collocation (int collocated)
++IR_TypedefDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_TypedefDef_Proxy_Broker_ =
+- ::IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_TypedefDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_TypedefDef_Proxy_Broker_ =
+- ::IR::_TAO_TypedefDef_Remote_Proxy_Broker::the_TAO_TypedefDef_Remote_Proxy_Broker ();
++ ::the_TAO_TypedefDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::TypedefDef::_tao_any_destructor (void *x)
++void IR_TypedefDef::_tao_any_destructor (void *x)
+ {
+- TypedefDef *tmp = ACE_static_cast (TypedefDef*,x);
++ IR_TypedefDef *tmp = ACE_static_cast (IR_TypedefDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::TypedefDef_ptr IR::TypedefDef::_narrow (
++IR_TypedefDef_ptr IR_TypedefDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return TypedefDef::_nil ();
++ return IR_TypedefDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/TypedefDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (TypedefDef::_nil ());
++ ACE_CHECK_RETURN (IR_TypedefDef::_nil ());
+ if (is_a == 0)
+- return TypedefDef::_nil ();
++ return IR_TypedefDef::_nil ();
+ }
+- return TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_TypedefDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::TypedefDef_ptr IR::TypedefDef::_unchecked_narrow (
++IR_TypedefDef_ptr IR_TypedefDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return TypedefDef::_nil ();
++ return IR_TypedefDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- TypedefDef_ptr default_proxy = TypedefDef::_nil ();
++ IR_TypedefDef_ptr default_proxy = IR_TypedefDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::TypedefDef (
++ ::IR_TypedefDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- TypedefDef::_nil ());
++ IR_TypedefDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::TypedefDef (stub, 0, obj->_servant ()), TypedefDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_TypedefDef (stub, 0, obj->_servant ()), IR_TypedefDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- TypedefDef_ptr,
++ IR_TypedefDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &TypedefDef::_narrow
++ &IR_TypedefDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::TypedefDef_ptr
+-IR::TypedefDef::_duplicate (TypedefDef_ptr obj)
++IR_TypedefDef_ptr
++IR_TypedefDef::_duplicate (IR_TypedefDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/TypedefDef:1.0")) ||
+@@ -14141,46 +8994,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::TypedefDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_TypedefDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
++ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -14193,25 +9046,23 @@
+ return retv;
+ }
+
+-const char* IR::TypedefDef::_interface_repository_id (void) const
++const char* IR_TypedefDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/TypedefDef:1.0";
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_TypedefDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f54), ACE_NTOHL (0x79706564), ACE_NTOHL (0x65664465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/TypedefDef:1.0
+- 11, ACE_NTOHL (0x54797065), ACE_NTOHL (0x64656644), ACE_NTOHL (0x65660000), // name = TypedefDef
++ 11, ACE_NTOHL (0x54797065), ACE_NTOHL (0x64656644), ACE_NTOHL (0x65660000), // name = IR_TypedefDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_TypedefDef (CORBA::tk_objref, sizeof (_oc_IR_TypedefDef), (char *) &_oc_IR_TypedefDef, 0, sizeof (IR::TypedefDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_TypedefDef (CORBA::tk_objref, sizeof (_oc_IR_TypedefDef), (char *) &_oc_IR_TypedefDef, 0, sizeof (IR_TypedefDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypedefDef, &_tc_TAO_tc_IR_TypedefDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_TypeDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -14258,31 +9109,31 @@
+ CORBA::tk_TypeCode,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_TypeDescription (CORBA::tk_struct, sizeof (_oc_IR_TypeDescription), (char *) &_oc_IR_TypeDescription, 0, sizeof (IR::TypeDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_TypeDescription (CORBA::tk_struct, sizeof (_oc_IR_TypeDescription), (char *) &_oc_IR_TypeDescription, 0, sizeof (IR_TypeDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_TypeDescription, &_tc_TAO_tc_IR_TypeDescription)
+ TAO_NAMESPACE_END
+-void IR::TypeDescription::_tao_any_destructor (void *x)
++
++void IR_TypeDescription::_tao_any_destructor (void *x)
+ {
+- TypeDescription *tmp = ACE_static_cast (TypeDescription*,x);
++ IR_TypeDescription *tmp = ACE_static_cast (IR_TypeDescription*,x);
+ delete tmp;
+ }
+
+-
+ ///////////////////////////////////////////////////////////////////////
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_StructDef_Proxy_Impl::_TAO_StructDef_Proxy_Impl (void)
++_TAO_StructDef_Proxy_Impl::_TAO_StructDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
++_TAO_StructDef_Remote_Proxy_Impl::_TAO_StructDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::StructMemberSeq * IR::_TAO_StructDef_Remote_Proxy_Impl::members (
++IR_StructMemberSeq * _TAO_StructDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -14290,17 +9141,14 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::StructMemberSeq *_tao_retval = 0;
+-
++ IR_StructMemberSeq *_tao_retval = 0;
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+- ACE_NEW_RETURN (_tao_retval, IR::StructMemberSeq, _tao_retval);
+- IR::StructMemberSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_StructMemberSeq, _tao_retval);
++ IR_StructMemberSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_members",
+@@ -14309,46 +9157,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get ri (
+- "_get_members",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -14357,7 +9180,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -14367,57 +9190,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_StructDef_Remote_Proxy_Impl::members (
++void _TAO_StructDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -14431,56 +9223,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set ri (
+- "_set_members",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- members,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << members)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -14489,36 +9255,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -14531,32 +9274,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
++_TAO_StructDef_Proxy_Broker::_TAO_StructDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
++_TAO_StructDef_Proxy_Broker::~_TAO_StructDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_StructDef_Remote_Proxy_Broker *IR::_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_StructDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_StructDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_StructDef_Remote_Proxy_Broker::_TAO_StructDef_Remote_Proxy_Broker (void)
++_TAO_StructDef_Remote_Proxy_Broker::_TAO_StructDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_StructDef_Remote_Proxy_Broker::~_TAO_StructDef_Remote_Proxy_Broker (void)
++_TAO_StructDef_Remote_Proxy_Broker::~_TAO_StructDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_StructDef_Proxy_Impl&
+-IR::_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::StructDef *object,
++_TAO_StructDef_Proxy_Impl&
++_TAO_StructDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_StructDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -14572,111 +9315,111 @@
+
+
+ // default constructor
+-IR::StructDef::StructDef (int collocated)
++IR_StructDef::IR_StructDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::StructDef::~StructDef (void)
++IR_StructDef::~IR_StructDef (void)
+ {}
+
+ void
+-IR::StructDef::_tao_setup_collocation (int collocated)
++IR_StructDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_StructDef_Proxy_Broker_ =
+- ::IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_StructDef_Proxy_Broker_ =
+- ::IR::_TAO_StructDef_Remote_Proxy_Broker::the_TAO_StructDef_Remote_Proxy_Broker ();
++ ::the_TAO_StructDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,TypedefDef)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,Container)::_tao_setup_collocation (collocated);
++ IR_TypedefDef::_tao_setup_collocation (collocated);
++ IR_Container::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::StructDef::_tao_any_destructor (void *x)
++void IR_StructDef::_tao_any_destructor (void *x)
+ {
+- StructDef *tmp = ACE_static_cast (StructDef*,x);
++ IR_StructDef *tmp = ACE_static_cast (IR_StructDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::StructDef_ptr IR::StructDef::_narrow (
++IR_StructDef_ptr IR_StructDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return StructDef::_nil ();
++ return IR_StructDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StructDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (StructDef::_nil ());
++ ACE_CHECK_RETURN (IR_StructDef::_nil ());
+ if (is_a == 0)
+- return StructDef::_nil ();
++ return IR_StructDef::_nil ();
+ }
+- return StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_StructDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::StructDef_ptr IR::StructDef::_unchecked_narrow (
++IR_StructDef_ptr IR_StructDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return StructDef::_nil ();
++ return IR_StructDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- StructDef_ptr default_proxy = StructDef::_nil ();
++ IR_StructDef_ptr default_proxy = IR_StructDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_StructDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::StructDef (
++ ::IR_StructDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- StructDef::_nil ());
++ IR_StructDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::StructDef (stub, 0, obj->_servant ()), StructDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_StructDef (stub, 0, obj->_servant ()), IR_StructDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- StructDef_ptr,
++ IR_StructDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &StructDef::_narrow
++ &IR_StructDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::StructDef_ptr
+-IR::StructDef::_duplicate (StructDef_ptr obj)
++IR_StructDef_ptr
++IR_StructDef::_duplicate (IR_StructDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StructDef:1.0")) ||
+@@ -14691,70 +9434,70 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::StructDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_StructDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, StructDef)::_narrow))
++ &IR_StructDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
++ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::TypedefDef_ptr,
++ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -14767,34 +9510,32 @@
+ return retv;
+ }
+
+-const char* IR::StructDef::_interface_repository_id (void) const
++const char* IR_StructDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/StructDef:1.0";
+ }
+
+-IR::StructMemberSeq * IR::StructDef::members (
++IR_StructMemberSeq * IR_StructDef::members (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::StructDef::members (
+- const IR::StructMemberSeq & members,
++void IR_StructDef::members (
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ this->the_TAO_StructDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
+ members,
+@@ -14802,103 +9543,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::TAO_ClientRequestInfo_IR_StructDef_members_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_get::result (IR::StructMemberSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::TAO_ClientRequestInfo_IR_StructDef_members_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::StructMemberSeq & members,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- members_ (members)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_members = this->parameter_list_.length ();
+- this->parameter_list_.length (length_members + 1);
+- this->parameter_list_[length_members].argument <<= this->members_;
+-
+- this->parameter_list_[length_members].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::StructDef::TAO_ClientRequestInfo_IR_StructDef_members_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_StructDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x74446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/StructDef:1.0
+- 10, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744465), ACE_NTOHL (0x66000000), // name = StructDef
++ 10, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744465), ACE_NTOHL (0x66000000), // name = IR_StructDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_StructDef (CORBA::tk_objref, sizeof (_oc_IR_StructDef), (char *) &_oc_IR_StructDef, 0, sizeof (IR::StructDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_StructDef (CORBA::tk_objref, sizeof (_oc_IR_StructDef), (char *) &_oc_IR_StructDef, 0, sizeof (IR_StructDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StructDef, &_tc_TAO_tc_IR_StructDef)
+@@ -14908,15 +9559,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_UnionDef_Proxy_Impl::_TAO_UnionDef_Proxy_Impl (void)
++_TAO_UnionDef_Proxy_Impl::_TAO_UnionDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_UnionDef_Remote_Proxy_Impl::_TAO_UnionDef_Remote_Proxy_Impl (void)
++_TAO_UnionDef_Remote_Proxy_Impl::_TAO_UnionDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::TypeCode_ptr IR::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
++CORBA::TypeCode_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -14924,16 +9575,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ CORBA::TypeCode_ptr _tao_retval = CORBA::TypeCode::_nil ();
+ CORBA::TypeCode_var _tao_safe_retval (_tao_retval);
+
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_discriminator_type",
+@@ -14942,46 +9590,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get ri (
+- "_get_discriminator_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -14990,7 +9613,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -15000,45 +9623,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::IDLType_ptr IR::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
++IR_IDLType_ptr _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15046,16 +9642,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
+-
+-
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
++
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_discriminator_type_def",
+@@ -15064,46 +9657,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get ri (
+- "_get_discriminator_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -15112,7 +9680,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -15122,57 +9690,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
++void _TAO_UnionDef_Remote_Proxy_Impl::discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr discriminator_type_def,
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -15186,56 +9723,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set ri (
+- "_set_discriminator_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- discriminator_type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << discriminator_type_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -15244,39 +9755,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::UnionMemberSeq * IR::_TAO_UnionDef_Remote_Proxy_Impl::members (
++IR_UnionMemberSeq * _TAO_UnionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15284,17 +9772,14 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::UnionMemberSeq *_tao_retval = 0;
+-
++ IR_UnionMemberSeq *_tao_retval = 0;
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+- ACE_NEW_RETURN (_tao_retval, IR::UnionMemberSeq, _tao_retval);
+- IR::UnionMemberSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_UnionMemberSeq, _tao_retval);
++ IR_UnionMemberSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_members",
+@@ -15303,46 +9788,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get ri (
+- "_get_members",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -15351,7 +9811,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -15361,57 +9821,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::UnionMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_UnionDef_Remote_Proxy_Impl::members (
++void _TAO_UnionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::UnionMemberSeq & members,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -15425,56 +9854,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set ri (
+- "_set_members",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- members,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << members)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -15483,36 +9886,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -15525,32 +9905,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_UnionDef_Proxy_Broker::_TAO_UnionDef_Proxy_Broker (void)
++_TAO_UnionDef_Proxy_Broker::_TAO_UnionDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_Proxy_Broker (void)
++_TAO_UnionDef_Proxy_Broker::~_TAO_UnionDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_UnionDef_Remote_Proxy_Broker *IR::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_UnionDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_UnionDef_Remote_Proxy_Broker::_TAO_UnionDef_Remote_Proxy_Broker (void)
++_TAO_UnionDef_Remote_Proxy_Broker::_TAO_UnionDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_UnionDef_Remote_Proxy_Broker::~_TAO_UnionDef_Remote_Proxy_Broker (void)
++_TAO_UnionDef_Remote_Proxy_Broker::~_TAO_UnionDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_UnionDef_Proxy_Impl&
+-IR::_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::UnionDef *object,
++_TAO_UnionDef_Proxy_Impl&
++_TAO_UnionDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_UnionDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -15566,111 +9946,110 @@
+
+
+ // default constructor
+-IR::UnionDef::UnionDef (int collocated)
++IR_UnionDef::IR_UnionDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::UnionDef::~UnionDef (void)
++IR_UnionDef::~IR_UnionDef (void)
+ {}
+
+ void
+-IR::UnionDef::_tao_setup_collocation (int collocated)
++IR_UnionDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_UnionDef_Proxy_Broker_ =
+- ::IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_UnionDef_Proxy_Broker_ =
+- ::IR::_TAO_UnionDef_Remote_Proxy_Broker::the_TAO_UnionDef_Remote_Proxy_Broker ();
+-
+- ACE_NESTED_CLASS (IR,TypedefDef)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,Container)::_tao_setup_collocation (collocated);
++ ::the_TAO_UnionDef_Remote_Proxy_Broker ();
+
++ IR_TypedefDef::_tao_setup_collocation (collocated);
++ IR_Container::_tao_setup_collocation (collocated);
+ }
+
+-void IR::UnionDef::_tao_any_destructor (void *x)
++void IR_UnionDef::_tao_any_destructor (void *x)
+ {
+- UnionDef *tmp = ACE_static_cast (UnionDef*,x);
++ IR_UnionDef *tmp = ACE_static_cast (IR_UnionDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::UnionDef_ptr IR::UnionDef::_narrow (
++IR_UnionDef_ptr IR_UnionDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return UnionDef::_nil ();
++ return IR_UnionDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UnionDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (UnionDef::_nil ());
++ ACE_CHECK_RETURN (IR_UnionDef::_nil ());
+ if (is_a == 0)
+- return UnionDef::_nil ();
++ return IR_UnionDef::_nil ();
+ }
+- return UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_UnionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::UnionDef_ptr IR::UnionDef::_unchecked_narrow (
++IR_UnionDef_ptr IR_UnionDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return UnionDef::_nil ();
++ return IR_UnionDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- UnionDef_ptr default_proxy = UnionDef::_nil ();
++ IR_UnionDef_ptr default_proxy = IR_UnionDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_UnionDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::UnionDef (
++ ::IR_UnionDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- UnionDef::_nil ());
++ IR_UnionDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::UnionDef (stub, 0, obj->_servant ()), UnionDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_UnionDef (stub, 0, obj->_servant ()), IR_UnionDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- UnionDef_ptr,
++ IR_UnionDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &UnionDef::_narrow
++ &IR_UnionDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::UnionDef_ptr
+-IR::UnionDef::_duplicate (UnionDef_ptr obj)
++IR_UnionDef_ptr
++IR_UnionDef::_duplicate (IR_UnionDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UnionDef:1.0")) ||
+@@ -15685,70 +10064,70 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::UnionDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_UnionDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, UnionDef)::_narrow))
++ &IR_UnionDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
++ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::TypedefDef_ptr,
++ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -15761,48 +10140,45 @@
+ return retv;
+ }
+
+-const char* IR::UnionDef::_interface_repository_id (void) const
++const char* IR_UnionDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/UnionDef:1.0";
+ }
+
+-CORBA::TypeCode_ptr IR::UnionDef::discriminator_type (
++CORBA::TypeCode_ptr IR_UnionDef::discriminator_type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).discriminator_type (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-IR::IDLType_ptr IR::UnionDef::discriminator_type_def (
++IR_IDLType_ptr IR_UnionDef::discriminator_type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).discriminator_type_def (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::UnionDef::discriminator_type_def (
+- IR::IDLType_ptr discriminator_type_def,
++void IR_UnionDef::discriminator_type_def (
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).discriminator_type_def (
+ this,
+ discriminator_type_def,
+@@ -15810,29 +10186,27 @@
+ );
+ }
+
+-IR::UnionMemberSeq * IR::UnionDef::members (
++IR_UnionMemberSeq * IR_UnionDef::members (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::UnionDef::members (
+- const IR::UnionMemberSeq & members,
++void IR_UnionDef::members (
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ this->the_TAO_UnionDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
+ members,
+@@ -15840,233 +10214,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr discriminator_type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- discriminator_type_def_ (discriminator_type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_discriminator_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_discriminator_type_def + 1);
+- this->parameter_list_[length_discriminator_type_def].argument <<= this->discriminator_type_def_;
+-
+- this->parameter_list_[length_discriminator_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::TAO_ClientRequestInfo_IR_UnionDef_members_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_get::result (IR::UnionMemberSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::TAO_ClientRequestInfo_IR_UnionDef_members_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::UnionMemberSeq & members,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- members_ (members)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_members = this->parameter_list_.length ();
+- this->parameter_list_.length (length_members + 1);
+- this->parameter_list_[length_members].argument <<= this->members_;
+-
+- this->parameter_list_[length_members].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::UnionDef::TAO_ClientRequestInfo_IR_UnionDef_members_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_UnionDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x6e696f6e), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/UnionDef:1.0
+- 9, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0), // name = UnionDef
++ 9, ACE_NTOHL (0x556e696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0), // name = IR_UnionDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_UnionDef (CORBA::tk_objref, sizeof (_oc_IR_UnionDef), (char *) &_oc_IR_UnionDef, 0, sizeof (IR::UnionDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_UnionDef (CORBA::tk_objref, sizeof (_oc_IR_UnionDef), (char *) &_oc_IR_UnionDef, 0, sizeof (IR_UnionDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UnionDef, &_tc_TAO_tc_IR_UnionDef)
+@@ -16076,15 +10230,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_EnumDef_Proxy_Impl::_TAO_EnumDef_Proxy_Impl (void)
++_TAO_EnumDef_Proxy_Impl::_TAO_EnumDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
++_TAO_EnumDef_Remote_Proxy_Impl::_TAO_EnumDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::EnumMemberSeq * IR::_TAO_EnumDef_Remote_Proxy_Impl::members (
++IR_EnumMemberSeq * _TAO_EnumDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -16092,17 +10246,14 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::EnumMemberSeq *_tao_retval = 0;
+-
++ IR_EnumMemberSeq *_tao_retval = 0;
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+- ACE_NEW_RETURN (_tao_retval, IR::EnumMemberSeq, _tao_retval);
+- IR::EnumMemberSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_EnumMemberSeq, _tao_retval);
++ IR_EnumMemberSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_members",
+@@ -16111,46 +10262,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get ri (
+- "_get_members",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -16159,7 +10285,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -16169,62 +10295,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::EnumMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_EnumDef_Remote_Proxy_Impl::members (
++void _TAO_EnumDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_members",
+@@ -16233,56 +10327,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set ri (
+- "_set_members",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- members,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << members)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -16291,36 +10359,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -16333,32 +10378,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
++_TAO_EnumDef_Proxy_Broker::_TAO_EnumDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_Proxy_Broker (void)
++_TAO_EnumDef_Proxy_Broker::~_TAO_EnumDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_EnumDef_Remote_Proxy_Broker *IR::_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_EnumDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_EnumDef_Remote_Proxy_Broker::_TAO_EnumDef_Remote_Proxy_Broker (void)
++_TAO_EnumDef_Remote_Proxy_Broker::_TAO_EnumDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EnumDef_Remote_Proxy_Broker::~_TAO_EnumDef_Remote_Proxy_Broker (void)
++_TAO_EnumDef_Remote_Proxy_Broker::~_TAO_EnumDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EnumDef_Proxy_Impl&
+-IR::_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::EnumDef *object,
++_TAO_EnumDef_Proxy_Impl&
++_TAO_EnumDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_EnumDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -16374,110 +10419,110 @@
+
+
+ // default constructor
+-IR::EnumDef::EnumDef (int collocated)
++IR_EnumDef::IR_EnumDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::EnumDef::~EnumDef (void)
++IR_EnumDef::~IR_EnumDef (void)
+ {}
+
+ void
+-IR::EnumDef::_tao_setup_collocation (int collocated)
++IR_EnumDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_EnumDef_Proxy_Broker_ =
+- ::IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_EnumDef_Proxy_Broker_ =
+- ::IR::_TAO_EnumDef_Remote_Proxy_Broker::the_TAO_EnumDef_Remote_Proxy_Broker ();
++ ::the_TAO_EnumDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,TypedefDef)::_tao_setup_collocation (collocated);
++ IR_TypedefDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::EnumDef::_tao_any_destructor (void *x)
++void IR_EnumDef::_tao_any_destructor (void *x)
+ {
+- EnumDef *tmp = ACE_static_cast (EnumDef*,x);
++ IR_EnumDef *tmp = ACE_static_cast (IR_EnumDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::EnumDef_ptr IR::EnumDef::_narrow (
++IR_EnumDef_ptr IR_EnumDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return EnumDef::_nil ();
++ return IR_EnumDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EnumDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (EnumDef::_nil ());
++ ACE_CHECK_RETURN (IR_EnumDef::_nil ());
+ if (is_a == 0)
+- return EnumDef::_nil ();
++ return IR_EnumDef::_nil ();
+ }
+- return EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_EnumDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::EnumDef_ptr IR::EnumDef::_unchecked_narrow (
++IR_EnumDef_ptr IR_EnumDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return EnumDef::_nil ();
++ return IR_EnumDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- EnumDef_ptr default_proxy = EnumDef::_nil ();
++ IR_EnumDef_ptr default_proxy = IR_EnumDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_EnumDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::EnumDef (
++ ::IR_EnumDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- EnumDef::_nil ());
++ IR_EnumDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::EnumDef (stub, 0, obj->_servant ()), EnumDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_EnumDef (stub, 0, obj->_servant ()), IR_EnumDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- EnumDef_ptr,
++ IR_EnumDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &EnumDef::_narrow
++ &IR_EnumDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::EnumDef_ptr
+-IR::EnumDef::_duplicate (EnumDef_ptr obj)
++IR_EnumDef_ptr
++IR_EnumDef::_duplicate (IR_EnumDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EnumDef:1.0")) ||
+@@ -16491,58 +10536,58 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::EnumDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_EnumDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, EnumDef)::_narrow))
++ &IR_EnumDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
++ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::TypedefDef_ptr,
++ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -16555,34 +10600,32 @@
+ return retv;
+ }
+
+-const char* IR::EnumDef::_interface_repository_id (void) const
++const char* IR_EnumDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/EnumDef:1.0";
+ }
+
+-IR::EnumMemberSeq * IR::EnumDef::members (
++IR_EnumMemberSeq * IR_EnumDef::members (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::EnumDef::members (
+- const IR::EnumMemberSeq & members,
++void IR_EnumDef::members (
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ this->the_TAO_EnumDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).members (
+ this,
+ members,
+@@ -16590,103 +10633,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::TAO_ClientRequestInfo_IR_EnumDef_members_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_get::result (IR::EnumMemberSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::TAO_ClientRequestInfo_IR_EnumDef_members_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::EnumMemberSeq & members,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- members_ (members)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_members = this->parameter_list_.length ();
+- this->parameter_list_.length (length_members + 1);
+- this->parameter_list_[length_members].argument <<= this->members_;
+-
+- this->parameter_list_[length_members].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::EnumDef::TAO_ClientRequestInfo_IR_EnumDef_members_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_EnumDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6e756d44), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/EnumDef:1.0
+- 8, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x44656600), // name = EnumDef
++ 8, ACE_NTOHL (0x456e756d), ACE_NTOHL (0x44656600), // name = IR_EnumDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_EnumDef (CORBA::tk_objref, sizeof (_oc_IR_EnumDef), (char *) &_oc_IR_EnumDef, 0, sizeof (IR::EnumDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_EnumDef (CORBA::tk_objref, sizeof (_oc_IR_EnumDef), (char *) &_oc_IR_EnumDef, 0, sizeof (IR_EnumDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EnumDef, &_tc_TAO_tc_IR_EnumDef)
+@@ -16696,15 +10649,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
++_TAO_AliasDef_Proxy_Impl::_TAO_AliasDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
++_TAO_AliasDef_Remote_Proxy_Impl::_TAO_AliasDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::IDLType_ptr IR::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
++IR_IDLType_ptr _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -16712,16 +10665,13 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
+-
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_original_type_def",
+@@ -16730,46 +10680,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get ri (
+- "_get_original_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -16778,7 +10703,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -16788,62 +10713,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
++void _TAO_AliasDef_Remote_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_original_type_def",
+@@ -16852,56 +10745,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set ri (
+- "_set_original_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- original_type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << original_type_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -16910,36 +10777,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -16952,32 +10796,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
++_TAO_AliasDef_Proxy_Broker::_TAO_AliasDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
++_TAO_AliasDef_Proxy_Broker::~_TAO_AliasDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_AliasDef_Remote_Proxy_Broker *IR::_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_AliasDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_AliasDef_Remote_Proxy_Broker::_TAO_AliasDef_Remote_Proxy_Broker (void)
++_TAO_AliasDef_Remote_Proxy_Broker::_TAO_AliasDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_AliasDef_Remote_Proxy_Broker::~_TAO_AliasDef_Remote_Proxy_Broker (void)
++_TAO_AliasDef_Remote_Proxy_Broker::~_TAO_AliasDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_AliasDef_Proxy_Impl&
+-IR::_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::AliasDef *object,
++_TAO_AliasDef_Proxy_Impl&
++_TAO_AliasDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_AliasDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -16993,110 +10837,110 @@
+
+
+ // default constructor
+-IR::AliasDef::AliasDef (int collocated)
++IR_AliasDef::IR_AliasDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::AliasDef::~AliasDef (void)
++IR_AliasDef::~IR_AliasDef (void)
+ {}
+
+ void
+-IR::AliasDef::_tao_setup_collocation (int collocated)
++IR_AliasDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_AliasDef_Proxy_Broker_ =
+- ::IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_AliasDef_Proxy_Broker_ =
+- ::IR::_TAO_AliasDef_Remote_Proxy_Broker::the_TAO_AliasDef_Remote_Proxy_Broker ();
++ ::the_TAO_AliasDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,TypedefDef)::_tao_setup_collocation (collocated);
++ IR_TypedefDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::AliasDef::_tao_any_destructor (void *x)
++void IR_AliasDef::_tao_any_destructor (void *x)
+ {
+- AliasDef *tmp = ACE_static_cast (AliasDef*,x);
++ IR_AliasDef *tmp = ACE_static_cast (IR_AliasDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::AliasDef_ptr IR::AliasDef::_narrow (
++IR_AliasDef_ptr IR_AliasDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return AliasDef::_nil ();
++ return IR_AliasDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AliasDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (AliasDef::_nil ());
++ ACE_CHECK_RETURN (IR_AliasDef::_nil ());
+ if (is_a == 0)
+- return AliasDef::_nil ();
++ return IR_AliasDef::_nil ();
+ }
+- return AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_AliasDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::AliasDef_ptr IR::AliasDef::_unchecked_narrow (
++IR_AliasDef_ptr IR_AliasDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return AliasDef::_nil ();
++ return IR_AliasDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- AliasDef_ptr default_proxy = AliasDef::_nil ();
++ IR_AliasDef_ptr default_proxy = IR_AliasDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_AliasDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::AliasDef (
++ ::IR_AliasDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- AliasDef::_nil ());
++ IR_AliasDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::AliasDef (stub, 0, obj->_servant ()), AliasDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_AliasDef (stub, 0, obj->_servant ()), IR_AliasDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- AliasDef_ptr,
++ IR_AliasDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &AliasDef::_narrow
++ &IR_AliasDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::AliasDef_ptr
+-IR::AliasDef::_duplicate (AliasDef_ptr obj)
++IR_AliasDef_ptr
++IR_AliasDef::_duplicate (IR_AliasDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AliasDef:1.0")) ||
+@@ -17110,58 +10954,58 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::AliasDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_AliasDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, AliasDef)::_narrow))
++ &IR_AliasDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
++ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::TypedefDef_ptr,
++ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -17174,34 +11018,32 @@
+ return retv;
+ }
+
+-const char* IR::AliasDef::_interface_repository_id (void) const
++const char* IR_AliasDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/AliasDef:1.0";
+ }
+
+-IR::IDLType_ptr IR::AliasDef::original_type_def (
++IR_IDLType_ptr IR_AliasDef::original_type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::AliasDef::original_type_def (
+- IR::IDLType_ptr original_type_def,
++void IR_AliasDef::original_type_def (
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ this->the_TAO_AliasDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).original_type_def (
+ this,
+ original_type_def,
+@@ -17209,103 +11051,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr original_type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- original_type_def_ (original_type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_original_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_original_type_def + 1);
+- this->parameter_list_[length_original_type_def].argument <<= this->original_type_def_;
+-
+- this->parameter_list_[length_original_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::AliasDef::TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_AliasDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x6c696173), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/AliasDef:1.0
+- 9, ACE_NTOHL (0x416c6961), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = AliasDef
++ 9, ACE_NTOHL (0x416c6961), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_AliasDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_AliasDef (CORBA::tk_objref, sizeof (_oc_IR_AliasDef), (char *) &_oc_IR_AliasDef, 0, sizeof (IR::AliasDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_AliasDef (CORBA::tk_objref, sizeof (_oc_IR_AliasDef), (char *) &_oc_IR_AliasDef, 0, sizeof (IR_AliasDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AliasDef, &_tc_TAO_tc_IR_AliasDef)
+@@ -17315,10 +11067,10 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
++_TAO_NativeDef_Proxy_Impl::_TAO_NativeDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
++_TAO_NativeDef_Remote_Proxy_Impl::_TAO_NativeDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -17333,32 +11085,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
++_TAO_NativeDef_Proxy_Broker::_TAO_NativeDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
++_TAO_NativeDef_Proxy_Broker::~_TAO_NativeDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_NativeDef_Remote_Proxy_Broker *IR::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_NativeDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_NativeDef_Remote_Proxy_Broker::_TAO_NativeDef_Remote_Proxy_Broker (void)
++_TAO_NativeDef_Remote_Proxy_Broker::_TAO_NativeDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_NativeDef_Remote_Proxy_Broker::~_TAO_NativeDef_Remote_Proxy_Broker (void)
++_TAO_NativeDef_Remote_Proxy_Broker::~_TAO_NativeDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_NativeDef_Proxy_Impl&
+-IR::_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::NativeDef *object,
++_TAO_NativeDef_Proxy_Impl&
++_TAO_NativeDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_NativeDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -17374,110 +11126,110 @@
+
+
+ // default constructor
+-IR::NativeDef::NativeDef (int collocated)
++IR_NativeDef::IR_NativeDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::NativeDef::~NativeDef (void)
++IR_NativeDef::~IR_NativeDef (void)
+ {}
+
+ void
+-IR::NativeDef::_tao_setup_collocation (int collocated)
++IR_NativeDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_NativeDef_Proxy_Broker_ =
+- ::IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_NativeDef_Proxy_Broker_ =
+- ::IR::_TAO_NativeDef_Remote_Proxy_Broker::the_TAO_NativeDef_Remote_Proxy_Broker ();
++ ::the_TAO_NativeDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,TypedefDef)::_tao_setup_collocation (collocated);
++ IR_TypedefDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::NativeDef::_tao_any_destructor (void *x)
++void IR_NativeDef::_tao_any_destructor (void *x)
+ {
+- NativeDef *tmp = ACE_static_cast (NativeDef*,x);
++ IR_NativeDef *tmp = ACE_static_cast (IR_NativeDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::NativeDef_ptr IR::NativeDef::_narrow (
++IR_NativeDef_ptr IR_NativeDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return NativeDef::_nil ();
++ return IR_NativeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/NativeDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (NativeDef::_nil ());
++ ACE_CHECK_RETURN (IR_NativeDef::_nil ());
+ if (is_a == 0)
+- return NativeDef::_nil ();
++ return IR_NativeDef::_nil ();
+ }
+- return NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_NativeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::NativeDef_ptr IR::NativeDef::_unchecked_narrow (
++IR_NativeDef_ptr IR_NativeDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return NativeDef::_nil ();
++ return IR_NativeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- NativeDef_ptr default_proxy = NativeDef::_nil ();
++ IR_NativeDef_ptr default_proxy = IR_NativeDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_NativeDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::NativeDef (
++ ::IR_NativeDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- NativeDef::_nil ());
++ IR_NativeDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::NativeDef (stub, 0, obj->_servant ()), NativeDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_NativeDef (stub, 0, obj->_servant ()), IR_NativeDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- NativeDef_ptr,
++ IR_NativeDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &NativeDef::_narrow
++ &IR_NativeDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::NativeDef_ptr
+-IR::NativeDef::_duplicate (NativeDef_ptr obj)
++IR_NativeDef_ptr
++IR_NativeDef::_duplicate (IR_NativeDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/NativeDef:1.0")) ||
+@@ -17491,58 +11243,58 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::NativeDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_NativeDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, NativeDef)::_narrow))
++ &IR_NativeDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
++ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::TypedefDef_ptr,
++ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -17555,21 +11307,18 @@
+ return retv;
+ }
+
+-const char* IR::NativeDef::_interface_repository_id (void) const
++const char* IR_NativeDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/NativeDef:1.0";
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_NativeDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4e), ACE_NTOHL (0x61746976), ACE_NTOHL (0x65446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/NativeDef:1.0
+- 10, ACE_NTOHL (0x4e617469), ACE_NTOHL (0x76654465), ACE_NTOHL (0x66000000), // name = NativeDef
++ 10, ACE_NTOHL (0x4e617469), ACE_NTOHL (0x76654465), ACE_NTOHL (0x66000000), // name = IR_NativeDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_NativeDef (CORBA::tk_objref, sizeof (_oc_IR_NativeDef), (char *) &_oc_IR_NativeDef, 0, sizeof (IR::NativeDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_NativeDef (CORBA::tk_objref, sizeof (_oc_IR_NativeDef), (char *) &_oc_IR_NativeDef, 0, sizeof (IR_NativeDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_NativeDef, &_tc_TAO_tc_IR_NativeDef)
+@@ -17579,15 +11328,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_Proxy_Impl (void)
++_TAO_PrimitiveDef_Proxy_Impl::_TAO_PrimitiveDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl (void)
++_TAO_PrimitiveDef_Remote_Proxy_Impl::_TAO_PrimitiveDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::PrimitiveKind IR::_TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
++IR_PrimitiveKind _TAO_PrimitiveDef_Remote_Proxy_Impl::kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17595,15 +11344,12 @@
+ CORBA::SystemException
+ ))
+ {
+-
+- IR::PrimitiveKind _tao_retval = (IR::PrimitiveKind)0;
+-
++ IR_PrimitiveKind _tao_retval = (IR_PrimitiveKind)0;
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_kind",
+@@ -17612,46 +11358,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get ri (
+- "_get_kind",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -17660,7 +11381,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -17670,40 +11391,14 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::PrimitiveKind _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+@@ -17717,32 +11412,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
++_TAO_PrimitiveDef_Proxy_Broker::_TAO_PrimitiveDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
++_TAO_PrimitiveDef_Proxy_Broker::~_TAO_PrimitiveDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_PrimitiveDef_Remote_Proxy_Broker *IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_PrimitiveDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
++_TAO_PrimitiveDef_Remote_Proxy_Broker::_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::~_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
++_TAO_PrimitiveDef_Remote_Proxy_Broker::~_TAO_PrimitiveDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PrimitiveDef_Proxy_Impl&
+-IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::PrimitiveDef *object,
++_TAO_PrimitiveDef_Proxy_Impl&
++_TAO_PrimitiveDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_PrimitiveDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -17758,110 +11453,110 @@
+
+
+ // default constructor
+-IR::PrimitiveDef::PrimitiveDef (int collocated)
++IR_PrimitiveDef::IR_PrimitiveDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::PrimitiveDef::~PrimitiveDef (void)
++IR_PrimitiveDef::~IR_PrimitiveDef (void)
+ {}
+
+ void
+-IR::PrimitiveDef::_tao_setup_collocation (int collocated)
++IR_PrimitiveDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_PrimitiveDef_Proxy_Broker_ =
+- ::IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_PrimitiveDef_Proxy_Broker_ =
+- ::IR::_TAO_PrimitiveDef_Remote_Proxy_Broker::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
++ ::the_TAO_PrimitiveDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::PrimitiveDef::_tao_any_destructor (void *x)
++void IR_PrimitiveDef::_tao_any_destructor (void *x)
+ {
+- PrimitiveDef *tmp = ACE_static_cast (PrimitiveDef*,x);
++ IR_PrimitiveDef *tmp = ACE_static_cast (IR_PrimitiveDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::PrimitiveDef_ptr IR::PrimitiveDef::_narrow (
++IR_PrimitiveDef_ptr IR_PrimitiveDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return PrimitiveDef::_nil ();
++ return IR_PrimitiveDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimitiveDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (PrimitiveDef::_nil ());
++ ACE_CHECK_RETURN (IR_PrimitiveDef::_nil ());
+ if (is_a == 0)
+- return PrimitiveDef::_nil ();
++ return IR_PrimitiveDef::_nil ();
+ }
+- return PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::PrimitiveDef_ptr IR::PrimitiveDef::_unchecked_narrow (
++IR_PrimitiveDef_ptr IR_PrimitiveDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return PrimitiveDef::_nil ();
++ return IR_PrimitiveDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- PrimitiveDef_ptr default_proxy = PrimitiveDef::_nil ();
++ IR_PrimitiveDef_ptr default_proxy = IR_PrimitiveDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::PrimitiveDef (
++ ::IR_PrimitiveDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- PrimitiveDef::_nil ());
++ IR_PrimitiveDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::PrimitiveDef (stub, 0, obj->_servant ()), PrimitiveDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_PrimitiveDef (stub, 0, obj->_servant ()), IR_PrimitiveDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- PrimitiveDef_ptr,
++ IR_PrimitiveDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &PrimitiveDef::_narrow
++ &IR_PrimitiveDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::PrimitiveDef_ptr
+-IR::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
++IR_PrimitiveDef_ptr
++IR_PrimitiveDef::_duplicate (IR_PrimitiveDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimitiveDef:1.0")) ||
+@@ -17873,34 +11568,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_PrimitiveDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, PrimitiveDef)::_narrow))
++ &IR_PrimitiveDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -17913,77 +11608,31 @@
+ return retv;
+ }
+
+-const char* IR::PrimitiveDef::_interface_repository_id (void) const
++const char* IR_PrimitiveDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/PrimitiveDef:1.0";
+ }
+
+-IR::PrimitiveKind IR::PrimitiveDef::kind (
++IR_PrimitiveKind IR_PrimitiveDef::kind (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_PrimitiveDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).kind (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::PrimitiveDef::TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get::result (IR::PrimitiveKind result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_PrimitiveDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d69), ACE_NTOHL (0x74697665), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/PrimitiveDef:1.0
+- 13, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x69746976), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = PrimitiveDef
++ 13, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x69746976), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_PrimitiveDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveDef (CORBA::tk_objref, sizeof (_oc_IR_PrimitiveDef), (char *) &_oc_IR_PrimitiveDef, 0, sizeof (IR::PrimitiveDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_PrimitiveDef (CORBA::tk_objref, sizeof (_oc_IR_PrimitiveDef), (char *) &_oc_IR_PrimitiveDef, 0, sizeof (IR_PrimitiveDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveDef, &_tc_TAO_tc_IR_PrimitiveDef)
+@@ -17993,15 +11642,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_StringDef_Proxy_Impl::_TAO_StringDef_Proxy_Impl (void)
++_TAO_StringDef_Proxy_Impl::_TAO_StringDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_StringDef_Remote_Proxy_Impl::_TAO_StringDef_Remote_Proxy_Impl (void)
++_TAO_StringDef_Remote_Proxy_Impl::_TAO_StringDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::ULong IR::_TAO_StringDef_Remote_Proxy_Impl::bound (
++CORBA::ULong _TAO_StringDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18009,63 +11658,35 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ CORBA::ULong _tao_retval = 0;
+
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_bound",
+- 10,
+- 0,
+- istub->orb_core ()
+- );
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get ri (
+- "_get_bound",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
++ 10,
++ 0,
++ istub->orb_core ()
+ );
+- ACE_CHECK_RETURN (_tao_retval);
+
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -18074,7 +11695,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -18084,44 +11705,18 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::ULong _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_StringDef_Remote_Proxy_Impl::bound (
++void _TAO_StringDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -18130,15 +11725,10 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_bound",
+@@ -18147,56 +11737,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set ri (
+- "_set_bound",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- bound,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << bound)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -18205,36 +11769,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -18247,32 +11788,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_StringDef_Proxy_Broker::_TAO_StringDef_Proxy_Broker (void)
++_TAO_StringDef_Proxy_Broker::_TAO_StringDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_StringDef_Proxy_Broker::~_TAO_StringDef_Proxy_Broker (void)
++_TAO_StringDef_Proxy_Broker::~_TAO_StringDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_StringDef_Remote_Proxy_Broker *IR::_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_StringDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_StringDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_StringDef_Remote_Proxy_Broker::_TAO_StringDef_Remote_Proxy_Broker (void)
++_TAO_StringDef_Remote_Proxy_Broker::_TAO_StringDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_StringDef_Remote_Proxy_Broker::~_TAO_StringDef_Remote_Proxy_Broker (void)
++_TAO_StringDef_Remote_Proxy_Broker::~_TAO_StringDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_StringDef_Proxy_Impl&
+-IR::_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::StringDef *object,
++_TAO_StringDef_Proxy_Impl&
++_TAO_StringDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_StringDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -18288,110 +11829,110 @@
+
+
+ // default constructor
+-IR::StringDef::StringDef (int collocated)
++IR_StringDef::IR_StringDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::StringDef::~StringDef (void)
++IR_StringDef::~IR_StringDef (void)
+ {}
+
+ void
+-IR::StringDef::_tao_setup_collocation (int collocated)
++IR_StringDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_StringDef_Proxy_Broker_ =
+- ::IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_StringDef_Proxy_Broker_ =
+- ::IR::_TAO_StringDef_Remote_Proxy_Broker::the_TAO_StringDef_Remote_Proxy_Broker ();
++ ::the_TAO_StringDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::StringDef::_tao_any_destructor (void *x)
++void IR_StringDef::_tao_any_destructor (void *x)
+ {
+- StringDef *tmp = ACE_static_cast (StringDef*,x);
++ IR_StringDef *tmp = ACE_static_cast (IR_StringDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::StringDef_ptr IR::StringDef::_narrow (
++IR_StringDef_ptr IR_StringDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return StringDef::_nil ();
++ return IR_StringDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/StringDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (StringDef::_nil ());
++ ACE_CHECK_RETURN (IR_StringDef::_nil ());
+ if (is_a == 0)
+- return StringDef::_nil ();
++ return IR_StringDef::_nil ();
+ }
+- return StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_StringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::StringDef_ptr IR::StringDef::_unchecked_narrow (
++IR_StringDef_ptr IR_StringDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return StringDef::_nil ();
++ return IR_StringDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- StringDef_ptr default_proxy = StringDef::_nil ();
++ IR_StringDef_ptr default_proxy = IR_StringDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_StringDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::StringDef (
++ ::IR_StringDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- StringDef::_nil ());
++ IR_StringDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::StringDef (stub, 0, obj->_servant ()), StringDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_StringDef (stub, 0, obj->_servant ()), IR_StringDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- StringDef_ptr,
++ IR_StringDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &StringDef::_narrow
++ &IR_StringDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::StringDef_ptr
+-IR::StringDef::_duplicate (StringDef_ptr obj)
++IR_StringDef_ptr
++IR_StringDef::_duplicate (IR_StringDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/StringDef:1.0")) ||
+@@ -18403,34 +11944,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::StringDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_StringDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, StringDef)::_narrow))
++ &IR_StringDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -18443,26 +11984,25 @@
+ return retv;
+ }
+
+-const char* IR::StringDef::_interface_repository_id (void) const
++const char* IR_StringDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/StringDef:1.0";
+ }
+
+-CORBA::ULong IR::StringDef::bound (
++CORBA::ULong IR_StringDef::bound (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+ return this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
+ this,
+ ACE_TRY_ENV
+ );
+ }
+
+-void IR::StringDef::bound (
++void IR_StringDef::bound (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18470,7 +12010,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ this->the_TAO_StringDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).bound (
+ this,
+ bound,
+@@ -18478,103 +12017,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::TAO_ClientRequestInfo_IR_StringDef_bound_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_get::result (CORBA::ULong result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::TAO_ClientRequestInfo_IR_StringDef_bound_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- bound_ (bound)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_bound = this->parameter_list_.length ();
+- this->parameter_list_.length (length_bound + 1);
+- this->parameter_list_[length_bound].argument <<= bound_;
+- this->parameter_list_[length_bound].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::StringDef::TAO_ClientRequestInfo_IR_StringDef_bound_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_StringDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x7472696e), ACE_NTOHL (0x67446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/StringDef:1.0
+- 10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e674465), ACE_NTOHL (0x66000000), // name = StringDef
++ 10, ACE_NTOHL (0x53747269), ACE_NTOHL (0x6e674465), ACE_NTOHL (0x66000000), // name = IR_StringDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_StringDef (CORBA::tk_objref, sizeof (_oc_IR_StringDef), (char *) &_oc_IR_StringDef, 0, sizeof (IR::StringDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_StringDef (CORBA::tk_objref, sizeof (_oc_IR_StringDef), (char *) &_oc_IR_StringDef, 0, sizeof (IR_StringDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_StringDef, &_tc_TAO_tc_IR_StringDef)
+@@ -18584,15 +12033,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_Proxy_Impl (void)
++_TAO_WstringDef_Proxy_Impl::_TAO_WstringDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_WstringDef_Remote_Proxy_Impl::_TAO_WstringDef_Remote_Proxy_Impl (void)
++_TAO_WstringDef_Remote_Proxy_Impl::_TAO_WstringDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::ULong IR::_TAO_WstringDef_Remote_Proxy_Impl::bound (
++CORBA::ULong _TAO_WstringDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18600,15 +12049,12 @@
+ CORBA::SystemException
+ ))
+ {
+-
+ CORBA::ULong _tao_retval = 0;
+
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW_RETURN (CORBA::INTERNAL (), _tao_retval);
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_bound",
+@@ -18617,46 +12063,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get ri (
+- "_get_bound",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -18665,7 +12086,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -18675,44 +12096,18 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::ULong _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_WstringDef_Remote_Proxy_Impl::bound (
++void _TAO_WstringDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -18721,15 +12116,10 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_bound",
+@@ -18738,56 +12128,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set ri (
+- "_set_bound",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- bound,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << bound)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -18796,36 +12160,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -18838,32 +12179,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_WstringDef_Proxy_Broker::_TAO_WstringDef_Proxy_Broker (void)
++_TAO_WstringDef_Proxy_Broker::_TAO_WstringDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
++_TAO_WstringDef_Proxy_Broker::~_TAO_WstringDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_WstringDef_Remote_Proxy_Broker *IR::_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_WstringDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_WstringDef_Remote_Proxy_Broker::_TAO_WstringDef_Remote_Proxy_Broker (void)
++_TAO_WstringDef_Remote_Proxy_Broker::_TAO_WstringDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_WstringDef_Remote_Proxy_Broker::~_TAO_WstringDef_Remote_Proxy_Broker (void)
++_TAO_WstringDef_Remote_Proxy_Broker::~_TAO_WstringDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_WstringDef_Proxy_Impl&
+-IR::_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::WstringDef *object,
++_TAO_WstringDef_Proxy_Impl&
++_TAO_WstringDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_WstringDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -18879,110 +12220,110 @@
+
+
+ // default constructor
+-IR::WstringDef::WstringDef (int collocated)
++IR_WstringDef::IR_WstringDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::WstringDef::~WstringDef (void)
++IR_WstringDef::~IR_WstringDef (void)
+ {}
+
+ void
+-IR::WstringDef::_tao_setup_collocation (int collocated)
++IR_WstringDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_WstringDef_Proxy_Broker_ =
+- ::IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_WstringDef_Proxy_Broker_ =
+- ::IR::_TAO_WstringDef_Remote_Proxy_Broker::the_TAO_WstringDef_Remote_Proxy_Broker ();
++ ::the_TAO_WstringDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::WstringDef::_tao_any_destructor (void *x)
++void IR_WstringDef::_tao_any_destructor (void *x)
+ {
+- WstringDef *tmp = ACE_static_cast (WstringDef*,x);
++ IR_WstringDef *tmp = ACE_static_cast (IR_WstringDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::WstringDef_ptr IR::WstringDef::_narrow (
++IR_WstringDef_ptr IR_WstringDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return WstringDef::_nil ();
++ return IR_WstringDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/WstringDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (WstringDef::_nil ());
++ ACE_CHECK_RETURN (IR_WstringDef::_nil ());
+ if (is_a == 0)
+- return WstringDef::_nil ();
++ return IR_WstringDef::_nil ();
+ }
+- return WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_WstringDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::WstringDef_ptr IR::WstringDef::_unchecked_narrow (
++IR_WstringDef_ptr IR_WstringDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return WstringDef::_nil ();
++ return IR_WstringDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- WstringDef_ptr default_proxy = WstringDef::_nil ();
++ IR_WstringDef_ptr default_proxy = IR_WstringDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_WstringDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::WstringDef (
++ ::IR_WstringDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- WstringDef::_nil ());
++ IR_WstringDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::WstringDef (stub, 0, obj->_servant ()), WstringDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_WstringDef (stub, 0, obj->_servant ()), IR_WstringDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- WstringDef_ptr,
++ IR_WstringDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &WstringDef::_narrow
++ &IR_WstringDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::WstringDef_ptr
+-IR::WstringDef::_duplicate (WstringDef_ptr obj)
++IR_WstringDef_ptr
++IR_WstringDef::_duplicate (IR_WstringDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/WstringDef:1.0")) ||
+@@ -18994,34 +12335,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::WstringDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_WstringDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, WstringDef)::_narrow))
++ &IR_WstringDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -19034,12 +12375,12 @@
+ return retv;
+ }
+
+-const char* IR::WstringDef::_interface_repository_id (void) const
++const char* IR_WstringDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/WstringDef:1.0";
+ }
+
+-CORBA::ULong IR::WstringDef::bound (
++CORBA::ULong IR_WstringDef::bound (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -19053,7 +12394,7 @@
+ );
+ }
+
+-void IR::WstringDef::bound (
++void IR_WstringDef::bound (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -19069,103 +12410,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::TAO_ClientRequestInfo_IR_WstringDef_bound_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_get::result (CORBA::ULong result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::TAO_ClientRequestInfo_IR_WstringDef_bound_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- bound_ (bound)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_bound = this->parameter_list_.length ();
+- this->parameter_list_.length (length_bound + 1);
+- this->parameter_list_[length_bound].argument <<= bound_;
+- this->parameter_list_[length_bound].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::WstringDef::TAO_ClientRequestInfo_IR_WstringDef_bound_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_WstringDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f57), ACE_NTOHL (0x73747269), ACE_NTOHL (0x6e674465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/WstringDef:1.0
+- 11, ACE_NTOHL (0x57737472), ACE_NTOHL (0x696e6744), ACE_NTOHL (0x65660000), // name = WstringDef
++ 11, ACE_NTOHL (0x57737472), ACE_NTOHL (0x696e6744), ACE_NTOHL (0x65660000), // name = IR_WstringDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_WstringDef (CORBA::tk_objref, sizeof (_oc_IR_WstringDef), (char *) &_oc_IR_WstringDef, 0, sizeof (IR::WstringDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_WstringDef (CORBA::tk_objref, sizeof (_oc_IR_WstringDef), (char *) &_oc_IR_WstringDef, 0, sizeof (IR_WstringDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_WstringDef, &_tc_TAO_tc_IR_WstringDef)
+@@ -19175,15 +12426,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
++_TAO_FixedDef_Proxy_Impl::_TAO_FixedDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_FixedDef_Remote_Proxy_Impl::_TAO_FixedDef_Remote_Proxy_Impl (void)
++_TAO_FixedDef_Remote_Proxy_Impl::_TAO_FixedDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::UShort IR::_TAO_FixedDef_Remote_Proxy_Impl::digits (
++CORBA::UShort _TAO_FixedDef_Remote_Proxy_Impl::digits (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -19208,46 +12459,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get ri (
+- "_get_digits",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -19256,7 +12482,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -19266,44 +12492,18 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::UShort _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_FixedDef_Remote_Proxy_Impl::digits (
++void _TAO_FixedDef_Remote_Proxy_Impl::digits (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::UShort digits,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -19312,15 +12512,10 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_digits",
+@@ -19329,56 +12524,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set ri (
+- "_set_digits",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- digits,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << digits)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -19387,39 +12556,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Short IR::_TAO_FixedDef_Remote_Proxy_Impl::scale (
++CORBA::Short _TAO_FixedDef_Remote_Proxy_Impl::scale (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -19444,46 +12590,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get ri (
+- "_get_scale",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -19492,7 +12613,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -19502,44 +12623,18 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Short _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_FixedDef_Remote_Proxy_Impl::scale (
++void _TAO_FixedDef_Remote_Proxy_Impl::scale (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -19548,15 +12643,10 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_scale",
+@@ -19565,56 +12655,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set ri (
+- "_set_scale",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- scale,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << scale)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -19623,36 +12687,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -19665,32 +12706,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_FixedDef_Proxy_Broker::_TAO_FixedDef_Proxy_Broker (void)
++_TAO_FixedDef_Proxy_Broker::_TAO_FixedDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
++_TAO_FixedDef_Proxy_Broker::~_TAO_FixedDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_FixedDef_Remote_Proxy_Broker *IR::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_FixedDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_FixedDef_Remote_Proxy_Broker::_TAO_FixedDef_Remote_Proxy_Broker (void)
++_TAO_FixedDef_Remote_Proxy_Broker::_TAO_FixedDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FixedDef_Remote_Proxy_Broker::~_TAO_FixedDef_Remote_Proxy_Broker (void)
++_TAO_FixedDef_Remote_Proxy_Broker::~_TAO_FixedDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FixedDef_Proxy_Impl&
+-IR::_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::FixedDef *object,
++_TAO_FixedDef_Proxy_Impl&
++_TAO_FixedDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_FixedDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -19706,110 +12747,110 @@
+
+
+ // default constructor
+-IR::FixedDef::FixedDef (int collocated)
++IR_FixedDef::IR_FixedDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::FixedDef::~FixedDef (void)
++IR_FixedDef::~IR_FixedDef (void)
+ {}
+
+ void
+-IR::FixedDef::_tao_setup_collocation (int collocated)
++IR_FixedDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_FixedDef_Proxy_Broker_ =
+- ::IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_FixedDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_FixedDef_Proxy_Broker_ =
+- ::IR::_TAO_FixedDef_Remote_Proxy_Broker::the_TAO_FixedDef_Remote_Proxy_Broker ();
++ ::the_TAO_FixedDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::FixedDef::_tao_any_destructor (void *x)
++void IR_FixedDef::_tao_any_destructor (void *x)
+ {
+- FixedDef *tmp = ACE_static_cast (FixedDef*,x);
++ IR_FixedDef *tmp = ACE_static_cast (IR_FixedDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::FixedDef_ptr IR::FixedDef::_narrow (
++IR_FixedDef_ptr IR_FixedDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return FixedDef::_nil ();
++ return IR_FixedDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FixedDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (FixedDef::_nil ());
++ ACE_CHECK_RETURN (IR_FixedDef::_nil ());
+ if (is_a == 0)
+- return FixedDef::_nil ();
++ return IR_FixedDef::_nil ();
+ }
+- return FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_FixedDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::FixedDef_ptr IR::FixedDef::_unchecked_narrow (
++IR_FixedDef_ptr IR_FixedDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return FixedDef::_nil ();
++ return IR_FixedDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- FixedDef_ptr default_proxy = FixedDef::_nil ();
++ IR_FixedDef_ptr default_proxy = IR_FixedDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_FixedDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::FixedDef (
++ ::IR_FixedDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- FixedDef::_nil ());
++ IR_FixedDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::FixedDef (stub, 0, obj->_servant ()), FixedDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_FixedDef (stub, 0, obj->_servant ()), IR_FixedDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- FixedDef_ptr,
++ IR_FixedDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &FixedDef::_narrow
++ &IR_FixedDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::FixedDef_ptr
+-IR::FixedDef::_duplicate (FixedDef_ptr obj)
++IR_FixedDef_ptr
++IR_FixedDef::_duplicate (IR_FixedDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FixedDef:1.0")) ||
+@@ -19821,34 +12862,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::FixedDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_FixedDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, FixedDef)::_narrow))
++ &IR_FixedDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -19861,12 +12902,12 @@
+ return retv;
+ }
+
+-const char* IR::FixedDef::_interface_repository_id (void) const
++const char* IR_FixedDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/FixedDef:1.0";
+ }
+
+-CORBA::UShort IR::FixedDef::digits (
++CORBA::UShort IR_FixedDef::digits (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -19880,7 +12921,7 @@
+ );
+ }
+
+-void IR::FixedDef::digits (
++void IR_FixedDef::digits (
+ CORBA::UShort digits,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -19896,7 +12937,7 @@
+ );
+ }
+
+-CORBA::Short IR::FixedDef::scale (
++CORBA::Short IR_FixedDef::scale (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -19910,7 +12951,7 @@
+ );
+ }
+
+-void IR::FixedDef::scale (
++void IR_FixedDef::scale (
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -19926,190 +12967,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::TAO_ClientRequestInfo_IR_FixedDef_digits_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_get::result (CORBA::UShort result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::TAO_ClientRequestInfo_IR_FixedDef_digits_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::UShort & digits,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- digits_ (digits)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_digits = this->parameter_list_.length ();
+- this->parameter_list_.length (length_digits + 1);
+- this->parameter_list_[length_digits].argument <<= digits_;
+- this->parameter_list_[length_digits].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_digits_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::TAO_ClientRequestInfo_IR_FixedDef_scale_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_get::result (CORBA::Short result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::TAO_ClientRequestInfo_IR_FixedDef_scale_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Short & scale,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- scale_ (scale)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_scale = this->parameter_list_.length ();
+- this->parameter_list_.length (length_scale + 1);
+- this->parameter_list_[length_scale].argument <<= scale_;
+- this->parameter_list_[length_scale].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::FixedDef::TAO_ClientRequestInfo_IR_FixedDef_scale_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_FixedDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x69786564), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/FixedDef:1.0
+- 9, ACE_NTOHL (0x46697865), ACE_NTOHL (0x64446566), ACE_NTOHL (0x0), // name = FixedDef
++ 9, ACE_NTOHL (0x46697865), ACE_NTOHL (0x64446566), ACE_NTOHL (0x0), // name = IR_FixedDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_FixedDef (CORBA::tk_objref, sizeof (_oc_IR_FixedDef), (char *) &_oc_IR_FixedDef, 0, sizeof (IR::FixedDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_FixedDef (CORBA::tk_objref, sizeof (_oc_IR_FixedDef), (char *) &_oc_IR_FixedDef, 0, sizeof (IR_FixedDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FixedDef, &_tc_TAO_tc_IR_FixedDef)
+@@ -20119,15 +12983,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_Proxy_Impl (void)
++_TAO_SequenceDef_Proxy_Impl::_TAO_SequenceDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_SequenceDef_Remote_Proxy_Impl::_TAO_SequenceDef_Remote_Proxy_Impl (void)
++_TAO_SequenceDef_Remote_Proxy_Impl::_TAO_SequenceDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::ULong IR::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
++CORBA::ULong _TAO_SequenceDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -20152,46 +13016,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get ri (
+- "_get_bound",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -20200,7 +13039,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -20210,44 +13049,18 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::ULong _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_SequenceDef_Remote_Proxy_Impl::bound (
++void _TAO_SequenceDef_Remote_Proxy_Impl::bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -20256,15 +13069,10 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_bound",
+@@ -20273,56 +13081,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set ri (
+- "_set_bound",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- bound,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << bound)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -20331,39 +13113,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::TypeCode_ptr IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type (
++CORBA::TypeCode_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -20389,46 +13148,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get ri (
+- "_get_element_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -20437,7 +13171,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -20447,45 +13181,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::IDLType_ptr IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
++IR_IDLType_ptr _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -20494,8 +13201,8 @@
+ ))
+ {
+
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -20511,46 +13218,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get ri (
+- "_get_element_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -20559,7 +13241,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -20569,62 +13251,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
++void _TAO_SequenceDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_element_type_def",
+@@ -20633,56 +13283,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set ri (
+- "_set_element_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- element_type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << element_type_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -20691,36 +13315,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -20733,32 +13334,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_SequenceDef_Proxy_Broker::_TAO_SequenceDef_Proxy_Broker (void)
++_TAO_SequenceDef_Proxy_Broker::_TAO_SequenceDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
++_TAO_SequenceDef_Proxy_Broker::~_TAO_SequenceDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_SequenceDef_Remote_Proxy_Broker *IR::_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_SequenceDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_SequenceDef_Remote_Proxy_Broker::_TAO_SequenceDef_Remote_Proxy_Broker (void)
++_TAO_SequenceDef_Remote_Proxy_Broker::_TAO_SequenceDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_SequenceDef_Remote_Proxy_Broker::~_TAO_SequenceDef_Remote_Proxy_Broker (void)
++_TAO_SequenceDef_Remote_Proxy_Broker::~_TAO_SequenceDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_SequenceDef_Proxy_Impl&
+-IR::_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::SequenceDef *object,
++_TAO_SequenceDef_Proxy_Impl&
++_TAO_SequenceDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_SequenceDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -20774,110 +13375,110 @@
+
+
+ // default constructor
+-IR::SequenceDef::SequenceDef (int collocated)
++IR_SequenceDef::IR_SequenceDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::SequenceDef::~SequenceDef (void)
++IR_SequenceDef::~IR_SequenceDef (void)
+ {}
+
+ void
+-IR::SequenceDef::_tao_setup_collocation (int collocated)
++IR_SequenceDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_SequenceDef_Proxy_Broker_ =
+- ::IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_SequenceDef_Proxy_Broker_ =
+- ::IR::_TAO_SequenceDef_Remote_Proxy_Broker::the_TAO_SequenceDef_Remote_Proxy_Broker ();
++ ::the_TAO_SequenceDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::SequenceDef::_tao_any_destructor (void *x)
++void IR_SequenceDef::_tao_any_destructor (void *x)
+ {
+- SequenceDef *tmp = ACE_static_cast (SequenceDef*,x);
++ IR_SequenceDef *tmp = ACE_static_cast (IR_SequenceDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::SequenceDef_ptr IR::SequenceDef::_narrow (
++IR_SequenceDef_ptr IR_SequenceDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return SequenceDef::_nil ();
++ return IR_SequenceDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/SequenceDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (SequenceDef::_nil ());
++ ACE_CHECK_RETURN (IR_SequenceDef::_nil ());
+ if (is_a == 0)
+- return SequenceDef::_nil ();
++ return IR_SequenceDef::_nil ();
+ }
+- return SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_SequenceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::SequenceDef_ptr IR::SequenceDef::_unchecked_narrow (
++IR_SequenceDef_ptr IR_SequenceDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return SequenceDef::_nil ();
++ return IR_SequenceDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- SequenceDef_ptr default_proxy = SequenceDef::_nil ();
++ IR_SequenceDef_ptr default_proxy = IR_SequenceDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::SequenceDef (
++ ::IR_SequenceDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- SequenceDef::_nil ());
++ IR_SequenceDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::SequenceDef (stub, 0, obj->_servant ()), SequenceDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_SequenceDef (stub, 0, obj->_servant ()), IR_SequenceDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- SequenceDef_ptr,
++ IR_SequenceDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &SequenceDef::_narrow
++ &IR_SequenceDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::SequenceDef_ptr
+-IR::SequenceDef::_duplicate (SequenceDef_ptr obj)
++IR_SequenceDef_ptr
++IR_SequenceDef::_duplicate (IR_SequenceDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_SequenceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/SequenceDef:1.0")) ||
+@@ -20889,34 +13490,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::SequenceDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_SequenceDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, SequenceDef)::_narrow))
++ &IR_SequenceDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -20929,12 +13530,12 @@
+ return retv;
+ }
+
+-const char* IR::SequenceDef::_interface_repository_id (void) const
++const char* IR_SequenceDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/SequenceDef:1.0";
+ }
+
+-CORBA::ULong IR::SequenceDef::bound (
++CORBA::ULong IR_SequenceDef::bound (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -20948,7 +13549,7 @@
+ );
+ }
+
+-void IR::SequenceDef::bound (
++void IR_SequenceDef::bound (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -20964,7 +13565,7 @@
+ );
+ }
+
+-CORBA::TypeCode_ptr IR::SequenceDef::element_type (
++CORBA::TypeCode_ptr IR_SequenceDef::element_type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -20978,7 +13579,7 @@
+ );
+ }
+
+-IR::IDLType_ptr IR::SequenceDef::element_type_def (
++IR_IDLType_ptr IR_SequenceDef::element_type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -20992,8 +13593,8 @@
+ );
+ }
+
+-void IR::SequenceDef::element_type_def (
+- IR::IDLType_ptr element_type_def,
++void IR_SequenceDef::element_type_def (
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -21008,233 +13609,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::TAO_ClientRequestInfo_IR_SequenceDef_bound_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_get::result (CORBA::ULong result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::TAO_ClientRequestInfo_IR_SequenceDef_bound_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- bound_ (bound)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_bound = this->parameter_list_.length ();
+- this->parameter_list_.length (length_bound + 1);
+- this->parameter_list_[length_bound].argument <<= bound_;
+- this->parameter_list_[length_bound].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_bound_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr element_type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- element_type_def_ (element_type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_element_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_element_type_def + 1);
+- this->parameter_list_[length_element_type_def].argument <<= this->element_type_def_;
+-
+- this->parameter_list_[length_element_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::SequenceDef::TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_SequenceDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x65717565), ACE_NTOHL (0x6e636544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/SequenceDef:1.0
+- 12, ACE_NTOHL (0x53657175), ACE_NTOHL (0x656e6365), ACE_NTOHL (0x44656600), // name = SequenceDef
++ 12, ACE_NTOHL (0x53657175), ACE_NTOHL (0x656e6365), ACE_NTOHL (0x44656600), // name = IR_SequenceDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_SequenceDef (CORBA::tk_objref, sizeof (_oc_IR_SequenceDef), (char *) &_oc_IR_SequenceDef, 0, sizeof (IR::SequenceDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_SequenceDef (CORBA::tk_objref, sizeof (_oc_IR_SequenceDef), (char *) &_oc_IR_SequenceDef, 0, sizeof (IR_SequenceDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_SequenceDef, &_tc_TAO_tc_IR_SequenceDef)
+@@ -21244,15 +13625,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
++_TAO_ArrayDef_Proxy_Impl::_TAO_ArrayDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
++_TAO_ArrayDef_Remote_Proxy_Impl::_TAO_ArrayDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::ULong IR::_TAO_ArrayDef_Remote_Proxy_Impl::length (
++CORBA::ULong _TAO_ArrayDef_Remote_Proxy_Impl::length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21274,49 +13655,24 @@
+ "_get_length",
+ 11,
+ 0,
+- istub->orb_core ()
+- );
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get ri (
+- "_get_length",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
++ istub->orb_core ()
+ );
+- ACE_CHECK_RETURN (_tao_retval);
+
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -21325,7 +13681,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -21335,44 +13691,18 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::ULong _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_ArrayDef_Remote_Proxy_Impl::length (
++void _TAO_ArrayDef_Remote_Proxy_Impl::length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong length,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -21381,15 +13711,10 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_length",
+@@ -21398,56 +13723,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set ri (
+- "_set_length",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- length,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << length)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -21456,39 +13755,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::TypeCode_ptr IR::_TAO_ArrayDef_Remote_Proxy_Impl::element_type (
++CORBA::TypeCode_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21514,46 +13790,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get ri (
+- "_get_element_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -21562,7 +13813,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -21572,45 +13823,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::IDLType_ptr IR::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
++IR_IDLType_ptr _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21619,8 +13843,8 @@
+ ))
+ {
+
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -21636,46 +13860,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get ri (
+- "_get_element_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -21684,7 +13883,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -21694,62 +13893,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
++void _TAO_ArrayDef_Remote_Proxy_Impl::element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_element_type_def",
+@@ -21758,56 +13925,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set ri (
+- "_set_element_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- element_type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << element_type_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -21816,36 +13957,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -21858,32 +13976,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
++_TAO_ArrayDef_Proxy_Broker::_TAO_ArrayDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_Proxy_Broker (void)
++_TAO_ArrayDef_Proxy_Broker::~_TAO_ArrayDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ArrayDef_Remote_Proxy_Broker *IR::_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ArrayDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ArrayDef_Remote_Proxy_Broker::_TAO_ArrayDef_Remote_Proxy_Broker (void)
++_TAO_ArrayDef_Remote_Proxy_Broker::_TAO_ArrayDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ArrayDef_Remote_Proxy_Broker::~_TAO_ArrayDef_Remote_Proxy_Broker (void)
++_TAO_ArrayDef_Remote_Proxy_Broker::~_TAO_ArrayDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ArrayDef_Proxy_Impl&
+-IR::_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ArrayDef *object,
++_TAO_ArrayDef_Proxy_Impl&
++_TAO_ArrayDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ArrayDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -21899,110 +14017,110 @@
+
+
+ // default constructor
+-IR::ArrayDef::ArrayDef (int collocated)
++IR_ArrayDef::IR_ArrayDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ArrayDef::~ArrayDef (void)
++IR_ArrayDef::~IR_ArrayDef (void)
+ {}
+
+ void
+-IR::ArrayDef::_tao_setup_collocation (int collocated)
++IR_ArrayDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ArrayDef_Proxy_Broker_ =
+- ::IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ArrayDef_Proxy_Broker_ =
+- ::IR::_TAO_ArrayDef_Remote_Proxy_Broker::the_TAO_ArrayDef_Remote_Proxy_Broker ();
++ ::the_TAO_ArrayDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ArrayDef::_tao_any_destructor (void *x)
++void IR_ArrayDef::_tao_any_destructor (void *x)
+ {
+- ArrayDef *tmp = ACE_static_cast (ArrayDef*,x);
++ IR_ArrayDef *tmp = ACE_static_cast (IR_ArrayDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ArrayDef_ptr IR::ArrayDef::_narrow (
++IR_ArrayDef_ptr IR_ArrayDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ArrayDef::_nil ();
++ return IR_ArrayDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ArrayDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ArrayDef::_nil ());
++ ACE_CHECK_RETURN (IR_ArrayDef::_nil ());
+ if (is_a == 0)
+- return ArrayDef::_nil ();
++ return IR_ArrayDef::_nil ();
+ }
+- return ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ArrayDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ArrayDef_ptr IR::ArrayDef::_unchecked_narrow (
++IR_ArrayDef_ptr IR_ArrayDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ArrayDef::_nil ();
++ return IR_ArrayDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ArrayDef_ptr default_proxy = ArrayDef::_nil ();
++ IR_ArrayDef_ptr default_proxy = IR_ArrayDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ArrayDef (
++ ::IR_ArrayDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ArrayDef::_nil ());
++ IR_ArrayDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ArrayDef (stub, 0, obj->_servant ()), ArrayDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ArrayDef (stub, 0, obj->_servant ()), IR_ArrayDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ArrayDef_ptr,
++ IR_ArrayDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ArrayDef::_narrow
++ &IR_ArrayDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ArrayDef_ptr
+-IR::ArrayDef::_duplicate (ArrayDef_ptr obj)
++IR_ArrayDef_ptr
++IR_ArrayDef::_duplicate (IR_ArrayDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ArrayDef:1.0")) ||
+@@ -22014,34 +14132,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ArrayDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ArrayDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ArrayDef)::_narrow))
++ &IR_ArrayDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -22054,12 +14172,12 @@
+ return retv;
+ }
+
+-const char* IR::ArrayDef::_interface_repository_id (void) const
++const char* IR_ArrayDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ArrayDef:1.0";
+ }
+
+-CORBA::ULong IR::ArrayDef::length (
++CORBA::ULong IR_ArrayDef::length (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22073,7 +14191,7 @@
+ );
+ }
+
+-void IR::ArrayDef::length (
++void IR_ArrayDef::length (
+ CORBA::ULong length,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22089,7 +14207,7 @@
+ );
+ }
+
+-CORBA::TypeCode_ptr IR::ArrayDef::element_type (
++CORBA::TypeCode_ptr IR_ArrayDef::element_type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22103,7 +14221,7 @@
+ );
+ }
+
+-IR::IDLType_ptr IR::ArrayDef::element_type_def (
++IR_IDLType_ptr IR_ArrayDef::element_type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22117,8 +14235,8 @@
+ );
+ }
+
+-void IR::ArrayDef::element_type_def (
+- IR::IDLType_ptr element_type_def,
++void IR_ArrayDef::element_type_def (
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22133,233 +14251,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::TAO_ClientRequestInfo_IR_ArrayDef_length_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_get::result (CORBA::ULong result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::TAO_ClientRequestInfo_IR_ArrayDef_length_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & length,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- length_ (length)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_length = this->parameter_list_.length ();
+- this->parameter_list_.length (length_length + 1);
+- this->parameter_list_[length_length].argument <<= length_;
+- this->parameter_list_[length_length].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_length_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr element_type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- element_type_def_ (element_type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_element_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_element_type_def + 1);
+- this->parameter_list_[length_element_type_def].argument <<= this->element_type_def_;
+-
+- this->parameter_list_[length_element_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ArrayDef::TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ArrayDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x72726179), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ArrayDef:1.0
+- 9, ACE_NTOHL (0x41727261), ACE_NTOHL (0x79446566), ACE_NTOHL (0x0), // name = ArrayDef
++ 9, ACE_NTOHL (0x41727261), ACE_NTOHL (0x79446566), ACE_NTOHL (0x0), // name = IR_ArrayDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ArrayDef (CORBA::tk_objref, sizeof (_oc_IR_ArrayDef), (char *) &_oc_IR_ArrayDef, 0, sizeof (IR::ArrayDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ArrayDef (CORBA::tk_objref, sizeof (_oc_IR_ArrayDef), (char *) &_oc_IR_ArrayDef, 0, sizeof (IR_ArrayDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ArrayDef, &_tc_TAO_tc_IR_ArrayDef)
+@@ -22369,15 +14267,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ExceptionDef_Proxy_Impl::_TAO_ExceptionDef_Proxy_Impl (void)
++_TAO_ExceptionDef_Proxy_Impl::_TAO_ExceptionDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ExceptionDef_Remote_Proxy_Impl::_TAO_ExceptionDef_Remote_Proxy_Impl (void)
++_TAO_ExceptionDef_Remote_Proxy_Impl::_TAO_ExceptionDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::TypeCode_ptr IR::_TAO_ExceptionDef_Remote_Proxy_Impl::type (
++CORBA::TypeCode_ptr _TAO_ExceptionDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22403,46 +14301,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get ri (
+- "_get_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -22451,7 +14324,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -22461,45 +14334,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::StructMemberSeq * IR::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
++IR_StructMemberSeq * _TAO_ExceptionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22508,7 +14354,7 @@
+ ))
+ {
+
+- IR::StructMemberSeq *_tao_retval = 0;
++ IR_StructMemberSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -22516,8 +14362,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::StructMemberSeq, _tao_retval);
+- IR::StructMemberSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_StructMemberSeq, _tao_retval);
++ IR_StructMemberSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_members",
+@@ -22526,46 +14372,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get ri (
+- "_get_members",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -22574,7 +14395,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -22584,62 +14405,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::StructMemberSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ExceptionDef_Remote_Proxy_Impl::members (
++void _TAO_ExceptionDef_Remote_Proxy_Impl::members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_members",
+@@ -22648,56 +14437,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set ri (
+- "_set_members",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- members,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << members)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -22706,36 +14469,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -22748,32 +14488,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
++_TAO_ExceptionDef_Proxy_Broker::_TAO_ExceptionDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_Proxy_Broker (void)
++_TAO_ExceptionDef_Proxy_Broker::~_TAO_ExceptionDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ExceptionDef_Remote_Proxy_Broker *IR::_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ExceptionDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ExceptionDef_Remote_Proxy_Broker::_TAO_ExceptionDef_Remote_Proxy_Broker (void)
++_TAO_ExceptionDef_Remote_Proxy_Broker::_TAO_ExceptionDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ExceptionDef_Remote_Proxy_Broker::~_TAO_ExceptionDef_Remote_Proxy_Broker (void)
++_TAO_ExceptionDef_Remote_Proxy_Broker::~_TAO_ExceptionDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ExceptionDef_Proxy_Impl&
+-IR::_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ExceptionDef *object,
++_TAO_ExceptionDef_Proxy_Impl&
++_TAO_ExceptionDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ExceptionDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -22789,111 +14529,111 @@
+
+
+ // default constructor
+-IR::ExceptionDef::ExceptionDef (int collocated)
++IR_ExceptionDef::IR_ExceptionDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ExceptionDef::~ExceptionDef (void)
++IR_ExceptionDef::~IR_ExceptionDef (void)
+ {}
+
+ void
+-IR::ExceptionDef::_tao_setup_collocation (int collocated)
++IR_ExceptionDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ExceptionDef_Proxy_Broker_ =
+- ::IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ExceptionDef_Proxy_Broker_ =
+- ::IR::_TAO_ExceptionDef_Remote_Proxy_Broker::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
++ ::the_TAO_ExceptionDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,Container)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
++ IR_Container::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ExceptionDef::_tao_any_destructor (void *x)
++void IR_ExceptionDef::_tao_any_destructor (void *x)
+ {
+- ExceptionDef *tmp = ACE_static_cast (ExceptionDef*,x);
++ IR_ExceptionDef *tmp = ACE_static_cast (IR_ExceptionDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ExceptionDef_ptr IR::ExceptionDef::_narrow (
++IR_ExceptionDef_ptr IR_ExceptionDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ExceptionDef::_nil ();
++ return IR_ExceptionDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ExceptionDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ExceptionDef::_nil ());
++ ACE_CHECK_RETURN (IR_ExceptionDef::_nil ());
+ if (is_a == 0)
+- return ExceptionDef::_nil ();
++ return IR_ExceptionDef::_nil ();
+ }
+- return ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ExceptionDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ExceptionDef_ptr IR::ExceptionDef::_unchecked_narrow (
++IR_ExceptionDef_ptr IR_ExceptionDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ExceptionDef::_nil ();
++ return IR_ExceptionDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ExceptionDef_ptr default_proxy = ExceptionDef::_nil ();
++ IR_ExceptionDef_ptr default_proxy = IR_ExceptionDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ExceptionDef (
++ ::IR_ExceptionDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ExceptionDef::_nil ());
++ IR_ExceptionDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ExceptionDef (stub, 0, obj->_servant ()), ExceptionDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ExceptionDef (stub, 0, obj->_servant ()), IR_ExceptionDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ExceptionDef_ptr,
++ IR_ExceptionDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ExceptionDef::_narrow
++ &IR_ExceptionDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ExceptionDef_ptr
+-IR::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
++IR_ExceptionDef_ptr
++IR_ExceptionDef::_duplicate (IR_ExceptionDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ExceptionDef:1.0")) ||
+@@ -22906,46 +14646,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ExceptionDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ExceptionDef)::_narrow))
++ &IR_ExceptionDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -22958,12 +14698,12 @@
+ return retv;
+ }
+
+-const char* IR::ExceptionDef::_interface_repository_id (void) const
++const char* IR_ExceptionDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ExceptionDef:1.0";
+ }
+
+-CORBA::TypeCode_ptr IR::ExceptionDef::type (
++CORBA::TypeCode_ptr IR_ExceptionDef::type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22977,7 +14717,7 @@
+ );
+ }
+
+-IR::StructMemberSeq * IR::ExceptionDef::members (
++IR_StructMemberSeq * IR_ExceptionDef::members (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22991,8 +14731,8 @@
+ );
+ }
+
+-void IR::ExceptionDef::members (
+- const IR::StructMemberSeq & members,
++void IR_ExceptionDef::members (
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -23007,150 +14747,18 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::TAO_ClientRequestInfo_IR_ExceptionDef_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_type_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::TAO_ClientRequestInfo_IR_ExceptionDef_members_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_get::result (IR::StructMemberSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::StructMemberSeq & members,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- members_ (members)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_members = this->parameter_list_.length ();
+- this->parameter_list_.length (length_members + 1);
+- this->parameter_list_[length_members].argument <<= this->members_;
+-
+- this->parameter_list_[length_members].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ExceptionDef::TAO_ClientRequestInfo_IR_ExceptionDef_members_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ExceptionDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDef:1.0
+- 13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0), // name = ExceptionDef
++ 13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0), // name = IR_ExceptionDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDef (CORBA::tk_objref, sizeof (_oc_IR_ExceptionDef), (char *) &_oc_IR_ExceptionDef, 0, sizeof (IR::ExceptionDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDef (CORBA::tk_objref, sizeof (_oc_IR_ExceptionDef), (char *) &_oc_IR_ExceptionDef, 0, sizeof (IR_ExceptionDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDef, &_tc_TAO_tc_IR_ExceptionDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ExceptionDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -23197,36 +14805,33 @@
+ CORBA::tk_TypeCode,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDescription (CORBA::tk_struct, sizeof (_oc_IR_ExceptionDescription), (char *) &_oc_IR_ExceptionDescription, 0, sizeof (IR::ExceptionDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDescription (CORBA::tk_struct, sizeof (_oc_IR_ExceptionDescription), (char *) &_oc_IR_ExceptionDescription, 0, sizeof (IR_ExceptionDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDescription, &_tc_TAO_tc_IR_ExceptionDescription)
+ TAO_NAMESPACE_END
+-void IR::ExceptionDescription::_tao_any_destructor (void *x)
++
++void IR_ExceptionDescription::_tao_any_destructor (void *x)
+ {
+- ExceptionDescription *tmp = ACE_static_cast (ExceptionDescription*,x);
++ IR_ExceptionDescription *tmp = ACE_static_cast (IR_ExceptionDescription*,x);
+ delete tmp;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CS_
+-
+ // The Base_Sequence functions, please see tao/Sequence.h
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ExceptionDef **tmp = 0;
++ IR_ExceptionDef **tmp = 0;
+ tmp = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ExceptionDef **old = ACE_reinterpret_cast (IR::ExceptionDef**, this->buffer_);
++ IR_ExceptionDef **old = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ if (!this->release_)
+- tmp[i] = IR::ExceptionDef::_duplicate (old[i]);
++ tmp[i] = IR_ExceptionDef::_duplicate (old[i]);
+ else
+ tmp[i] = old[i];
+
+@@ -23238,106 +14843,97 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+- IR::ExceptionDef **tmp = ACE_reinterpret_cast (IR::ExceptionDef**, this->buffer_);
++ IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ExceptionDef::_nil ();
++ tmp[i] = IR_ExceptionDef::_nil ();
+ }
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
++ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::~_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
+ {
+ this->_deallocate_buffer ();
+ }
+
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
++ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)
+ {
+- IR::ExceptionDef **tmp = ACE_reinterpret_cast (IR::ExceptionDef**, this->buffer_);
++ IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
+
+ for (CORBA::ULong i = nl; i < ol; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ExceptionDef::_nil ();
++ tmp[i] = IR_ExceptionDef::_nil ();
+ }
+ }
+ void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_downcast (
++ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_downcast (
+ void* target,
+ CORBA_Object *src,
+ CORBA_Environment &ACE_TRY_ENV
+ )
+ {
+- IR::ExceptionDef **tmp = ACE_static_cast (IR::ExceptionDef**, target);
+- *tmp = IR::ExceptionDef::_narrow (src, ACE_TRY_ENV);
++ IR_ExceptionDef **tmp = ACE_static_cast (IR_ExceptionDef**, target);
++ *tmp = IR_ExceptionDef::_narrow (src, ACE_TRY_ENV);
+ }
+
+ CORBA_Object*
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_upcast (void *src) const
++ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_upcast (void *src) const
+ {
+- IR::ExceptionDef **tmp = ACE_static_cast (IR::ExceptionDef**, src);
++ IR_ExceptionDef **tmp = ACE_static_cast (IR_ExceptionDef**, src);
+ return *tmp;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EXCEPTIONDEFSEQ_CS_)
+-#define _TAO_IR_EXCEPTIONDEFSEQ_CS_
+-
+ // *************************************************************
+-// IR::ExceptionDefSeq
++// IR_ExceptionDefSeq
+ // *************************************************************
+
+-IR::ExceptionDefSeq::ExceptionDefSeq (void)
++IR_ExceptionDefSeq::IR_ExceptionDefSeq (void)
+ {}
+-IR::ExceptionDefSeq::ExceptionDefSeq (CORBA::ULong max) // uses max size
++IR_ExceptionDefSeq::IR_ExceptionDefSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ExceptionDefSeq::ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, IR::ExceptionDef_ptr *buffer, CORBA::Boolean release)
++IR_ExceptionDefSeq::IR_ExceptionDefSeq (CORBA::ULong max, CORBA::ULong length, IR_ExceptionDef_ptr *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ExceptionDefSeq::ExceptionDefSeq (const ExceptionDefSeq &seq) // copy ctor
++IR_ExceptionDefSeq::IR_ExceptionDefSeq (const IR_ExceptionDefSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<IR::ExceptionDef,IR::ExceptionDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ExceptionDefSeq::~ExceptionDefSeq (void) // dtor
++IR_ExceptionDefSeq::~IR_ExceptionDefSeq (void) // dtor
+ {}
+-void IR::ExceptionDefSeq::_tao_any_destructor (void *x)
++void IR_ExceptionDefSeq::_tao_any_destructor (void *x)
+ {
+- ExceptionDefSeq *tmp = ACE_static_cast (ExceptionDefSeq*,x);
++ IR_ExceptionDefSeq *tmp = ACE_static_cast (IR_ExceptionDefSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ExceptionDefSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -23350,12 +14946,12 @@
+ 60, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x78636570), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ExceptionDef:1.0
+- 13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0), // name = ExceptionDef
++ 13, ACE_NTOHL (0x45786365), ACE_NTOHL (0x7074696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0), // name = IR_ExceptionDef
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ExceptionDefSeq), (char *) &_oc_IR_ExceptionDefSeq, 0, sizeof (IR::ExceptionDefSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ExceptionDefSeq (CORBA::tk_alias, sizeof (_oc_IR_ExceptionDefSeq), (char *) &_oc_IR_ExceptionDefSeq, 0, sizeof (IR_ExceptionDefSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExceptionDefSeq, &_tc_TAO_tc_IR_ExceptionDefSeq)
+@@ -23363,18 +14959,15 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ExceptionDescription* tmp = 0;
++ IR_ExceptionDescription* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ExceptionDescription *old = ACE_reinterpret_cast (IR::ExceptionDescription *,this->buffer_);
++ IR_ExceptionDescription *old = ACE_reinterpret_cast (IR_ExceptionDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -23387,75 +14980,65 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::ExceptionDescription *tmp = ACE_reinterpret_cast (IR::ExceptionDescription *,this->buffer_);
++ IR_ExceptionDescription *tmp = ACE_reinterpret_cast (IR_ExceptionDescription *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EXCDESCRIPTIONSEQ_CS_)
+-#define _TAO_IR_EXCDESCRIPTIONSEQ_CS_
+-
+ // *************************************************************
+-// IR::ExcDescriptionSeq
++// IR_ExcDescriptionSeq
+ // *************************************************************
+
+-IR::ExcDescriptionSeq::ExcDescriptionSeq (void)
++IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (void)
+ {}
+-IR::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max) // uses max size
++IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ExceptionDescription>
++ TAO_Unbounded_Sequence<IR_ExceptionDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ExcDescriptionSeq::ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::ExceptionDescription *buffer, CORBA::Boolean release)
++IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_ExceptionDescription *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ExceptionDescription>
++ TAO_Unbounded_Sequence<IR_ExceptionDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ExcDescriptionSeq::ExcDescriptionSeq (const ExcDescriptionSeq &seq) // copy ctor
++IR_ExcDescriptionSeq::IR_ExcDescriptionSeq (const IR_ExcDescriptionSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ExceptionDescription>
++ TAO_Unbounded_Sequence<IR_ExceptionDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ExcDescriptionSeq::~ExcDescriptionSeq (void) // dtor
++IR_ExcDescriptionSeq::~IR_ExcDescriptionSeq (void) // dtor
+ {}
+-void IR::ExcDescriptionSeq::_tao_any_destructor (void *x)
++void IR_ExcDescriptionSeq::_tao_any_destructor (void *x)
+ {
+- ExcDescriptionSeq *tmp = ACE_static_cast (ExcDescriptionSeq*,x);
++ IR_ExcDescriptionSeq *tmp = ACE_static_cast (IR_ExcDescriptionSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ExcDescriptionSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -23513,11 +15096,12 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ExcDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_ExcDescriptionSeq), (char *) &_oc_IR_ExcDescriptionSeq, 0, sizeof (IR::ExcDescriptionSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ExcDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_ExcDescriptionSeq), (char *) &_oc_IR_ExcDescriptionSeq, 0, sizeof (IR_ExcDescriptionSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ExcDescriptionSeq, &_tc_TAO_tc_IR_ExcDescriptionSeq)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_AttributeMode[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -23527,7 +15111,7 @@
+ 12, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f4e4f52), ACE_NTOHL (0x4d414c00), // name = ATTR_NORMAL
+ 14, ACE_NTOHL (0x41545452), ACE_NTOHL (0x5f524541), ACE_NTOHL (0x444f4e4c), ACE_NTOHL (0x59000000), // name = ATTR_READONLY
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_AttributeMode (CORBA::tk_enum, sizeof (_oc_IR_AttributeMode), (char *) &_oc_IR_AttributeMode, 0, sizeof (IR::AttributeMode));
++static CORBA::TypeCode _tc_TAO_tc_IR_AttributeMode (CORBA::tk_enum, sizeof (_oc_IR_AttributeMode), (char *) &_oc_IR_AttributeMode, 0, sizeof (IR_AttributeMode));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeMode, &_tc_TAO_tc_IR_AttributeMode)
+@@ -23537,15 +15121,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_AttributeDef_Proxy_Impl::_TAO_AttributeDef_Proxy_Impl (void)
++_TAO_AttributeDef_Proxy_Impl::_TAO_AttributeDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_Remote_Proxy_Impl (void)
++_TAO_AttributeDef_Remote_Proxy_Impl::_TAO_AttributeDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::TypeCode_ptr IR::_TAO_AttributeDef_Remote_Proxy_Impl::type (
++CORBA::TypeCode_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23571,46 +15155,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get ri (
+- "_get_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -23619,7 +15178,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -23629,45 +15188,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::IDLType_ptr IR::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
++IR_IDLType_ptr _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23676,8 +15208,8 @@
+ ))
+ {
+
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -23693,46 +15225,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get ri (
+- "_get_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -23741,7 +15248,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -23751,62 +15258,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_AttributeDef_Remote_Proxy_Impl::type_def (
++void _TAO_AttributeDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_type_def",
+@@ -23815,56 +15290,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set ri (
+- "_set_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << type_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -23873,39 +15322,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::AttributeMode IR::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
++IR_AttributeMode _TAO_AttributeDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23914,7 +15340,7 @@
+ ))
+ {
+
+- IR::AttributeMode _tao_retval = (IR::AttributeMode)0;
++ IR_AttributeMode _tao_retval = (IR_AttributeMode)0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -23930,46 +15356,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get ri (
+- "_get_mode",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -23978,7 +15379,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -23988,61 +15389,30 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::AttributeMode _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_AttributeDef_Remote_Proxy_Impl::mode (
++void _TAO_AttributeDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+- IR::AttributeMode mode,
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_mode",
+@@ -24051,56 +15421,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set ri (
+- "_set_mode",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- mode,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << mode)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -24109,36 +15453,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -24151,32 +15472,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
++_TAO_AttributeDef_Proxy_Broker::_TAO_AttributeDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
++_TAO_AttributeDef_Proxy_Broker::~_TAO_AttributeDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_AttributeDef_Remote_Proxy_Broker *IR::_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_AttributeDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_AttributeDef_Remote_Proxy_Broker::_TAO_AttributeDef_Remote_Proxy_Broker (void)
++_TAO_AttributeDef_Remote_Proxy_Broker::_TAO_AttributeDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_AttributeDef_Remote_Proxy_Broker::~_TAO_AttributeDef_Remote_Proxy_Broker (void)
++_TAO_AttributeDef_Remote_Proxy_Broker::~_TAO_AttributeDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_AttributeDef_Proxy_Impl&
+-IR::_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::AttributeDef *object,
++_TAO_AttributeDef_Proxy_Impl&
++_TAO_AttributeDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_AttributeDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -24192,110 +15513,110 @@
+
+
+ // default constructor
+-IR::AttributeDef::AttributeDef (int collocated)
++IR_AttributeDef::IR_AttributeDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::AttributeDef::~AttributeDef (void)
++IR_AttributeDef::~IR_AttributeDef (void)
+ {}
+
+ void
+-IR::AttributeDef::_tao_setup_collocation (int collocated)
++IR_AttributeDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_AttributeDef_Proxy_Broker_ =
+- ::IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_AttributeDef_Proxy_Broker_ =
+- ::IR::_TAO_AttributeDef_Remote_Proxy_Broker::the_TAO_AttributeDef_Remote_Proxy_Broker ();
++ ::the_TAO_AttributeDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::AttributeDef::_tao_any_destructor (void *x)
++void IR_AttributeDef::_tao_any_destructor (void *x)
+ {
+- AttributeDef *tmp = ACE_static_cast (AttributeDef*,x);
++ IR_AttributeDef *tmp = ACE_static_cast (IR_AttributeDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::AttributeDef_ptr IR::AttributeDef::_narrow (
++IR_AttributeDef_ptr IR_AttributeDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return AttributeDef::_nil ();
++ return IR_AttributeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/AttributeDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (AttributeDef::_nil ());
++ ACE_CHECK_RETURN (IR_AttributeDef::_nil ());
+ if (is_a == 0)
+- return AttributeDef::_nil ();
++ return IR_AttributeDef::_nil ();
+ }
+- return AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_AttributeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::AttributeDef_ptr IR::AttributeDef::_unchecked_narrow (
++IR_AttributeDef_ptr IR_AttributeDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return AttributeDef::_nil ();
++ return IR_AttributeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- AttributeDef_ptr default_proxy = AttributeDef::_nil ();
++ IR_AttributeDef_ptr default_proxy = IR_AttributeDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::AttributeDef (
++ ::IR_AttributeDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- AttributeDef::_nil ());
++ IR_AttributeDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::AttributeDef (stub, 0, obj->_servant ()), AttributeDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_AttributeDef (stub, 0, obj->_servant ()), IR_AttributeDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- AttributeDef_ptr,
++ IR_AttributeDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &AttributeDef::_narrow
++ &IR_AttributeDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::AttributeDef_ptr
+-IR::AttributeDef::_duplicate (AttributeDef_ptr obj)
++IR_AttributeDef_ptr
++IR_AttributeDef::_duplicate (IR_AttributeDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/AttributeDef:1.0")) ||
+@@ -24307,34 +15628,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::AttributeDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_AttributeDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, AttributeDef)::_narrow))
++ &IR_AttributeDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -24347,12 +15668,12 @@
+ return retv;
+ }
+
+-const char* IR::AttributeDef::_interface_repository_id (void) const
++const char* IR_AttributeDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/AttributeDef:1.0";
+ }
+
+-CORBA::TypeCode_ptr IR::AttributeDef::type (
++CORBA::TypeCode_ptr IR_AttributeDef::type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -24366,7 +15687,7 @@
+ );
+ }
+
+-IR::IDLType_ptr IR::AttributeDef::type_def (
++IR_IDLType_ptr IR_AttributeDef::type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -24380,8 +15701,8 @@
+ );
+ }
+
+-void IR::AttributeDef::type_def (
+- IR::IDLType_ptr type_def,
++void IR_AttributeDef::type_def (
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -24396,7 +15717,7 @@
+ );
+ }
+
+-IR::AttributeMode IR::AttributeDef::mode (
++IR_AttributeMode IR_AttributeDef::mode (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -24410,8 +15731,8 @@
+ );
+ }
+
+-void IR::AttributeDef::mode (
+- IR::AttributeMode mode,
++void IR_AttributeDef::mode (
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -24423,240 +15744,21 @@
+ this,
+ mode,
+ ACE_TRY_ENV
+- );
+-}
+-
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::TAO_ClientRequestInfo_IR_AttributeDef_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- type_def_ (type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_type_def + 1);
+- this->parameter_list_[length_type_def].argument <<= this->type_def_;
+-
+- this->parameter_list_[length_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_type_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::TAO_ClientRequestInfo_IR_AttributeDef_mode_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_get::result (IR::AttributeMode result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::AttributeMode & mode,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- mode_ (mode)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_mode = this->parameter_list_.length ();
+- this->parameter_list_.length (length_mode + 1);
+- this->parameter_list_[length_mode].argument <<= this->mode_;
+-
+- this->parameter_list_[length_mode].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::AttributeDef::TAO_ClientRequestInfo_IR_AttributeDef_mode_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
++ );
+ }
+
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_AttributeDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f41), ACE_NTOHL (0x74747269), ACE_NTOHL (0x62757465), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/AttributeDef:1.0
+- 13, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = AttributeDef
++ 13, ACE_NTOHL (0x41747472), ACE_NTOHL (0x69627574), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_AttributeDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_AttributeDef (CORBA::tk_objref, sizeof (_oc_IR_AttributeDef), (char *) &_oc_IR_AttributeDef, 0, sizeof (IR::AttributeDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_AttributeDef (CORBA::tk_objref, sizeof (_oc_IR_AttributeDef), (char *) &_oc_IR_AttributeDef, 0, sizeof (IR_AttributeDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDef, &_tc_TAO_tc_IR_AttributeDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_AttributeDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -24829,14 +15931,15 @@
+
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_AttributeDescription (CORBA::tk_struct, sizeof (_oc_IR_AttributeDescription), (char *) &_oc_IR_AttributeDescription, 0, sizeof (IR::AttributeDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_AttributeDescription (CORBA::tk_struct, sizeof (_oc_IR_AttributeDescription), (char *) &_oc_IR_AttributeDescription, 0, sizeof (IR_AttributeDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeDescription, &_tc_TAO_tc_IR_AttributeDescription)
+ TAO_NAMESPACE_END
+-void IR::AttributeDescription::_tao_any_destructor (void *x)
++
++void IR_AttributeDescription::_tao_any_destructor (void *x)
+ {
+- AttributeDescription *tmp = ACE_static_cast (AttributeDescription*,x);
++ IR_AttributeDescription *tmp = ACE_static_cast (IR_AttributeDescription*,x);
+ delete tmp;
+ }
+
+@@ -24849,11 +15952,12 @@
+ 10, ACE_NTOHL (0x4f505f4e), ACE_NTOHL (0x4f524d41), ACE_NTOHL (0x4c000000), // name = OP_NORMAL
+ 10, ACE_NTOHL (0x4f505f4f), ACE_NTOHL (0x4e455741), ACE_NTOHL (0x59000000), // name = OP_ONEWAY
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_OperationMode (CORBA::tk_enum, sizeof (_oc_IR_OperationMode), (char *) &_oc_IR_OperationMode, 0, sizeof (IR::OperationMode));
++static CORBA::TypeCode _tc_TAO_tc_IR_OperationMode (CORBA::tk_enum, sizeof (_oc_IR_OperationMode), (char *) &_oc_IR_OperationMode, 0, sizeof (IR_OperationMode));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationMode, &_tc_TAO_tc_IR_OperationMode)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ParameterMode[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -24864,11 +15968,12 @@
+ 10, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f4f55), ACE_NTOHL (0x54000000), // name = PARAM_OUT
+ 12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400), // name = PARAM_INOUT
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ParameterMode (CORBA::tk_enum, sizeof (_oc_IR_ParameterMode), (char *) &_oc_IR_ParameterMode, 0, sizeof (IR::ParameterMode));
++static CORBA::TypeCode _tc_TAO_tc_IR_ParameterMode (CORBA::tk_enum, sizeof (_oc_IR_ParameterMode), (char *) &_oc_IR_ParameterMode, 0, sizeof (IR_ParameterMode));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterMode, &_tc_TAO_tc_IR_ParameterMode)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ParameterDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -24892,7 +15997,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -24906,32 +16011,30 @@
+ 12, ACE_NTOHL (0x50415241), ACE_NTOHL (0x4d5f494e), ACE_NTOHL (0x4f555400), // name = PARAM_INOUT
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ParameterDescription (CORBA::tk_struct, sizeof (_oc_IR_ParameterDescription), (char *) &_oc_IR_ParameterDescription, 0, sizeof (IR::ParameterDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_ParameterDescription (CORBA::tk_struct, sizeof (_oc_IR_ParameterDescription), (char *) &_oc_IR_ParameterDescription, 0, sizeof (IR_ParameterDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterDescription, &_tc_TAO_tc_IR_ParameterDescription)
+ TAO_NAMESPACE_END
+-void IR::ParameterDescription::_tao_any_destructor (void *x)
++
++void IR_ParameterDescription::_tao_any_destructor (void *x)
+ {
+- ParameterDescription *tmp = ACE_static_cast (ParameterDescription*,x);
++ IR_ParameterDescription *tmp = ACE_static_cast (IR_ParameterDescription*,x);
+ delete tmp;
+ }
+
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ParameterDescription* tmp = 0;
++ IR_ParameterDescription* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ParameterDescription *old = ACE_reinterpret_cast (IR::ParameterDescription *,this->buffer_);
++ IR_ParameterDescription *old = ACE_reinterpret_cast (IR_ParameterDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -24944,75 +16047,65 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::ParameterDescription *tmp = ACE_reinterpret_cast (IR::ParameterDescription *,this->buffer_);
++ IR_ParameterDescription *tmp = ACE_reinterpret_cast (IR_ParameterDescription *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PARDESCRIPTIONSEQ_CS_)
+-#define _TAO_IR_PARDESCRIPTIONSEQ_CS_
+-
+ // *************************************************************
+-// IR::ParDescriptionSeq
++// IR_ParDescriptionSeq
+ // *************************************************************
+
+-IR::ParDescriptionSeq::ParDescriptionSeq (void)
++IR_ParDescriptionSeq::IR_ParDescriptionSeq (void)
+ {}
+-IR::ParDescriptionSeq::ParDescriptionSeq (CORBA::ULong max) // uses max size
++IR_ParDescriptionSeq::IR_ParDescriptionSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ParameterDescription>
++ TAO_Unbounded_Sequence<IR_ParameterDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ParDescriptionSeq::ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::ParameterDescription *buffer, CORBA::Boolean release)
++IR_ParDescriptionSeq::IR_ParDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_ParameterDescription *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ParameterDescription>
++ TAO_Unbounded_Sequence<IR_ParameterDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ParDescriptionSeq::ParDescriptionSeq (const ParDescriptionSeq &seq) // copy ctor
++IR_ParDescriptionSeq::IR_ParDescriptionSeq (const IR_ParDescriptionSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ParameterDescription>
++ TAO_Unbounded_Sequence<IR_ParameterDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ParDescriptionSeq::~ParDescriptionSeq (void) // dtor
++IR_ParDescriptionSeq::~IR_ParDescriptionSeq (void) // dtor
+ {}
+-void IR::ParDescriptionSeq::_tao_any_destructor (void *x)
++void IR_ParDescriptionSeq::_tao_any_destructor (void *x)
+ {
+- ParDescriptionSeq *tmp = ACE_static_cast (ParDescriptionSeq*,x);
++ IR_ParDescriptionSeq *tmp = ACE_static_cast (IR_ParDescriptionSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ParDescriptionSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -25044,7 +16137,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -25061,11 +16154,12 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ParDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_ParDescriptionSeq), (char *) &_oc_IR_ParDescriptionSeq, 0, sizeof (IR::ParDescriptionSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ParDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_ParDescriptionSeq), (char *) &_oc_IR_ParDescriptionSeq, 0, sizeof (IR_ParDescriptionSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParDescriptionSeq, &_tc_TAO_tc_IR_ParDescriptionSeq)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ContextIdentifier[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -25086,16 +16180,13 @@
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdentifier, &_tc_TAO_tc_IR_ContextIdentifier)
+ TAO_NAMESPACE_END
+
+-#if !defined (_TAO_IR_CONTEXTIDSEQ_CS_)
+-#define _TAO_IR_CONTEXTIDSEQ_CS_
+-
+ // *************************************************************
+-// IR::ContextIdSeq
++// IR_ContextIdSeq
+ // *************************************************************
+
+-IR::ContextIdSeq::ContextIdSeq (void)
++IR_ContextIdSeq::IR_ContextIdSeq (void)
+ {}
+-IR::ContextIdSeq::ContextIdSeq (CORBA::ULong max) // uses max size
++IR_ContextIdSeq::IR_ContextIdSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -25104,7 +16195,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ContextIdSeq::ContextIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
++IR_ContextIdSeq::IR_ContextIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -25113,7 +16204,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ContextIdSeq::ContextIdSeq (const ContextIdSeq &seq) // copy ctor
++IR_ContextIdSeq::IR_ContextIdSeq (const IR_ContextIdSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -25122,17 +16213,14 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ContextIdSeq::~ContextIdSeq (void) // dtor
++IR_ContextIdSeq::~IR_ContextIdSeq (void) // dtor
+ {}
+-void IR::ContextIdSeq::_tao_any_destructor (void *x)
++void IR_ContextIdSeq::_tao_any_destructor (void *x)
+ {
+- ContextIdSeq *tmp = ACE_static_cast (ContextIdSeq*,x);
++ IR_ContextIdSeq *tmp = ACE_static_cast (IR_ContextIdSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ContextIdSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -25158,7 +16246,7 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ContextIdSeq (CORBA::tk_alias, sizeof (_oc_IR_ContextIdSeq), (char *) &_oc_IR_ContextIdSeq, 0, sizeof (IR::ContextIdSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ContextIdSeq (CORBA::tk_alias, sizeof (_oc_IR_ContextIdSeq), (char *) &_oc_IR_ContextIdSeq, 0, sizeof (IR_ContextIdSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ContextIdSeq, &_tc_TAO_tc_IR_ContextIdSeq)
+@@ -25168,15 +16256,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_OperationDef_Proxy_Impl::_TAO_OperationDef_Proxy_Impl (void)
++_TAO_OperationDef_Proxy_Impl::_TAO_OperationDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_OperationDef_Remote_Proxy_Impl::_TAO_OperationDef_Remote_Proxy_Impl (void)
++_TAO_OperationDef_Remote_Proxy_Impl::_TAO_OperationDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::TypeCode_ptr IR::_TAO_OperationDef_Remote_Proxy_Impl::result (
++CORBA::TypeCode_ptr _TAO_OperationDef_Remote_Proxy_Impl::result (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25202,46 +16290,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get ri (
+- "_get_result",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -25250,7 +16313,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -25260,45 +16323,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::IDLType_ptr IR::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
++IR_IDLType_ptr _TAO_OperationDef_Remote_Proxy_Impl::result_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25307,8 +16343,8 @@
+ ))
+ {
+
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -25324,46 +16360,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get ri (
+- "_get_result_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -25372,7 +16383,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -25382,62 +16393,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_OperationDef_Remote_Proxy_Impl::result_def (
++void _TAO_OperationDef_Remote_Proxy_Impl::result_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr result_def,
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_result_def",
+@@ -25446,56 +16425,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set ri (
+- "_set_result_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- result_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << result_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -25504,39 +16457,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::ParDescriptionSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::params (
++IR_ParDescriptionSeq * _TAO_OperationDef_Remote_Proxy_Impl::params (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25545,7 +16475,7 @@
+ ))
+ {
+
+- IR::ParDescriptionSeq *_tao_retval = 0;
++ IR_ParDescriptionSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -25553,8 +16483,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::ParDescriptionSeq, _tao_retval);
+- IR::ParDescriptionSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_ParDescriptionSeq, _tao_retval);
++ IR_ParDescriptionSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_params",
+@@ -25563,46 +16493,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get ri (
+- "_get_params",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -25611,7 +16516,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -25621,62 +16526,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ParDescriptionSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_OperationDef_Remote_Proxy_Impl::params (
++void _TAO_OperationDef_Remote_Proxy_Impl::params (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ParDescriptionSeq & params,
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_params",
+@@ -25685,56 +16558,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set ri (
+- "_set_params",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- params,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << params)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -25743,39 +16590,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::OperationMode IR::_TAO_OperationDef_Remote_Proxy_Impl::mode (
++IR_OperationMode _TAO_OperationDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -25784,7 +16608,7 @@
+ ))
+ {
+
+- IR::OperationMode _tao_retval = (IR::OperationMode)0;
++ IR_OperationMode _tao_retval = (IR_OperationMode)0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -25800,46 +16624,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get ri (
+- "_get_mode",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -25848,7 +16647,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -25858,61 +16657,30 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::OperationMode _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_OperationDef_Remote_Proxy_Impl::mode (
++void _TAO_OperationDef_Remote_Proxy_Impl::mode (
+ CORBA_Object *_collocated_tao_target_,
+- IR::OperationMode mode,
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_mode",
+@@ -25921,56 +16689,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set ri (
+- "_set_mode",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- mode,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << mode)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -25979,39 +16721,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::ContextIdSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
++IR_ContextIdSeq * _TAO_OperationDef_Remote_Proxy_Impl::contexts (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26020,7 +16739,7 @@
+ ))
+ {
+
+- IR::ContextIdSeq *_tao_retval = 0;
++ IR_ContextIdSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -26028,8 +16747,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::ContextIdSeq, _tao_retval);
+- IR::ContextIdSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_ContextIdSeq, _tao_retval);
++ IR_ContextIdSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_contexts",
+@@ -26038,46 +16757,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get ri (
+- "_get_contexts",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -26086,7 +16780,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -26096,62 +16790,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ContextIdSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_OperationDef_Remote_Proxy_Impl::contexts (
++void _TAO_OperationDef_Remote_Proxy_Impl::contexts (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ContextIdSeq & contexts,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_contexts",
+@@ -26160,56 +16822,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set ri (
+- "_set_contexts",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- contexts,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << contexts)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -26218,39 +16854,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::ExceptionDefSeq * IR::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
++IR_ExceptionDefSeq * _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26259,7 +16872,7 @@
+ ))
+ {
+
+- IR::ExceptionDefSeq *_tao_retval = 0;
++ IR_ExceptionDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -26267,8 +16880,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::ExceptionDefSeq, _tao_retval);
+- IR::ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_ExceptionDefSeq, _tao_retval);
++ IR_ExceptionDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_exceptions",
+@@ -26277,46 +16890,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get ri (
+- "_get_exceptions",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -26325,7 +16913,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -26335,62 +16923,30 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ExceptionDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_OperationDef_Remote_Proxy_Impl::exceptions (
++void _TAO_OperationDef_Remote_Proxy_Impl::exceptions (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+
+-
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_set_exceptions",
+@@ -26399,56 +16955,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set ri (
+- "_set_exceptions",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- exceptions,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << exceptions)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -26457,36 +16987,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -26499,32 +17006,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_OperationDef_Proxy_Broker::_TAO_OperationDef_Proxy_Broker (void)
++_TAO_OperationDef_Proxy_Broker::_TAO_OperationDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_Proxy_Broker (void)
++_TAO_OperationDef_Proxy_Broker::~_TAO_OperationDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_OperationDef_Remote_Proxy_Broker *IR::_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_OperationDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_OperationDef_Remote_Proxy_Broker::_TAO_OperationDef_Remote_Proxy_Broker (void)
++_TAO_OperationDef_Remote_Proxy_Broker::_TAO_OperationDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_OperationDef_Remote_Proxy_Broker::~_TAO_OperationDef_Remote_Proxy_Broker (void)
++_TAO_OperationDef_Remote_Proxy_Broker::~_TAO_OperationDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_OperationDef_Proxy_Impl&
+-IR::_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::OperationDef *object,
++_TAO_OperationDef_Proxy_Impl&
++_TAO_OperationDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_OperationDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -26540,110 +17047,110 @@
+
+
+ // default constructor
+-IR::OperationDef::OperationDef (int collocated)
++IR_OperationDef::IR_OperationDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::OperationDef::~OperationDef (void)
++IR_OperationDef::~IR_OperationDef (void)
+ {}
+
+ void
+-IR::OperationDef::_tao_setup_collocation (int collocated)
++IR_OperationDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_OperationDef_Proxy_Broker_ =
+- ::IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_OperationDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_OperationDef_Proxy_Broker_ =
+- ::IR::_TAO_OperationDef_Remote_Proxy_Broker::the_TAO_OperationDef_Remote_Proxy_Broker ();
++ ::the_TAO_OperationDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::OperationDef::_tao_any_destructor (void *x)
++void IR_OperationDef::_tao_any_destructor (void *x)
+ {
+- OperationDef *tmp = ACE_static_cast (OperationDef*,x);
++ IR_OperationDef *tmp = ACE_static_cast (IR_OperationDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::OperationDef_ptr IR::OperationDef::_narrow (
++IR_OperationDef_ptr IR_OperationDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return OperationDef::_nil ();
++ return IR_OperationDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/OperationDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (OperationDef::_nil ());
++ ACE_CHECK_RETURN (IR_OperationDef::_nil ());
+ if (is_a == 0)
+- return OperationDef::_nil ();
++ return IR_OperationDef::_nil ();
+ }
+- return OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_OperationDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::OperationDef_ptr IR::OperationDef::_unchecked_narrow (
++IR_OperationDef_ptr IR_OperationDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return OperationDef::_nil ();
++ return IR_OperationDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- OperationDef_ptr default_proxy = OperationDef::_nil ();
++ IR_OperationDef_ptr default_proxy = IR_OperationDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_OperationDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::OperationDef (
++ ::IR_OperationDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- OperationDef::_nil ());
++ IR_OperationDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::OperationDef (stub, 0, obj->_servant ()), OperationDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_OperationDef (stub, 0, obj->_servant ()), IR_OperationDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- OperationDef_ptr,
++ IR_OperationDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &OperationDef::_narrow
++ &IR_OperationDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::OperationDef_ptr
+-IR::OperationDef::_duplicate (OperationDef_ptr obj)
++IR_OperationDef_ptr
++IR_OperationDef::_duplicate (IR_OperationDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/OperationDef:1.0")) ||
+@@ -26655,34 +17162,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::OperationDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_OperationDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, OperationDef)::_narrow))
++ &IR_OperationDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -26695,12 +17202,12 @@
+ return retv;
+ }
+
+-const char* IR::OperationDef::_interface_repository_id (void) const
++const char* IR_OperationDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/OperationDef:1.0";
+ }
+
+-CORBA::TypeCode_ptr IR::OperationDef::result (
++CORBA::TypeCode_ptr IR_OperationDef::result (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -26714,7 +17221,7 @@
+ );
+ }
+
+-IR::IDLType_ptr IR::OperationDef::result_def (
++IR_IDLType_ptr IR_OperationDef::result_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -26728,8 +17235,8 @@
+ );
+ }
+
+-void IR::OperationDef::result_def (
+- IR::IDLType_ptr result_def,
++void IR_OperationDef::result_def (
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -26738,624 +17245,144 @@
+ {
+
+ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).result_def (
+- this,
+- result_def,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::ParDescriptionSeq * IR::OperationDef::params (
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).params (
+- this,
+- ACE_TRY_ENV
+- );
+-}
+-
+-void IR::OperationDef::params (
+- const IR::ParDescriptionSeq & params,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).params (
+- this,
+- params,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::OperationMode IR::OperationDef::mode (
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
+- this,
+- ACE_TRY_ENV
+- );
+-}
+-
+-void IR::OperationDef::mode (
+- IR::OperationMode mode,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
+- this,
+- mode,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::ContextIdSeq * IR::OperationDef::contexts (
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contexts (
+- this,
+- ACE_TRY_ENV
+- );
+-}
+-
+-void IR::OperationDef::contexts (
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contexts (
+- this,
+- contexts,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::ExceptionDefSeq * IR::OperationDef::exceptions (
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).exceptions (
+- this,
+- ACE_TRY_ENV
+- );
+-}
+-
+-void IR::OperationDef::exceptions (
+- const IR::ExceptionDefSeq & exceptions,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).exceptions (
+- this,
+- exceptions,
+- ACE_TRY_ENV
+- );
+-}
+-
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::TAO_ClientRequestInfo_IR_OperationDef_result_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::TAO_ClientRequestInfo_IR_OperationDef_result_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr result_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- result_def_ (result_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_result_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_result_def + 1);
+- this->parameter_list_[length_result_def].argument <<= this->result_def_;
+-
+- this->parameter_list_[length_result_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_result_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::TAO_ClientRequestInfo_IR_OperationDef_params_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_get::result (IR::ParDescriptionSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::TAO_ClientRequestInfo_IR_OperationDef_params_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::ParDescriptionSeq & params,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- params_ (params)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_params = this->parameter_list_.length ();
+- this->parameter_list_.length (length_params + 1);
+- this->parameter_list_[length_params].argument <<= this->params_;
+-
+- this->parameter_list_[length_params].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_params_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::TAO_ClientRequestInfo_IR_OperationDef_mode_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_get::result (IR::OperationMode result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::TAO_ClientRequestInfo_IR_OperationDef_mode_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::OperationMode & mode,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- mode_ (mode)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_mode = this->parameter_list_.length ();
+- this->parameter_list_.length (length_mode + 1);
+- this->parameter_list_[length_mode].argument <<= this->mode_;
+-
+- this->parameter_list_[length_mode].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_mode_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::TAO_ClientRequestInfo_IR_OperationDef_contexts_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_get::result (IR::ContextIdSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- contexts_ (contexts)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_contexts = this->parameter_list_.length ();
+- this->parameter_list_.length (length_contexts + 1);
+- this->parameter_list_[length_contexts].argument <<= this->contexts_;
+-
+- this->parameter_list_[length_contexts].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
++ this,
++ result_def,
++ ACE_TRY_ENV
++ );
+ }
+
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_contexts_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_ParDescriptionSeq * IR_OperationDef::params (
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+
+- return &this->result_val_;
++ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).params (
++ this,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
++void IR_OperationDef::params (
++ const IR_ParDescriptionSeq & params,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- return 0;
++
++ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).params (
++ this,
++ params,
++ ACE_TRY_ENV
++ );
+ }
+
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_OperationMode IR_OperationDef::mode (
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the exception list on demand
+- return 0;
++
++ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
++ this,
++ ACE_TRY_ENV
++ );
+ }
+
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++void IR_OperationDef::mode (
++ IR_OperationMode mode,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
++
++ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).mode (
++ this,
++ mode,
++ ACE_TRY_ENV
++ );
+ }
+
+-void
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_get::result (IR::ExceptionDefSeq * result)
++IR_ContextIdSeq * IR_OperationDef::contexts (
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // update the result
+- this->result_ = result;
++
++ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contexts (
++ this,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::ExceptionDefSeq & exceptions,
+- CORBA::Environment &
++void IR_OperationDef::contexts (
++ const IR_ContextIdSeq & contexts,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- exceptions_ (exceptions)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_exceptions + 1);
+- this->parameter_list_[length_exceptions].argument <<= this->exceptions_;
+
+- this->parameter_list_[length_exceptions].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
++ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).contexts (
++ this,
++ contexts,
++ ACE_TRY_ENV
++ );
+ }
+
+-Dynamic::ExceptionList *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++IR_ExceptionDefSeq * IR_OperationDef::exceptions (
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the exception list on demand
+- return 0;
++
++ return this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).exceptions (
++ this,
++ ACE_TRY_ENV
++ );
+ }
+
+-
+-CORBA::Any *
+-IR::OperationDef::TAO_ClientRequestInfo_IR_OperationDef_exceptions_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++void IR_OperationDef::exceptions (
++ const IR_ExceptionDefSeq & exceptions,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+
+- return &this->result_val_;
++ this->the_TAO_OperationDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).exceptions (
++ this,
++ exceptions,
++ ACE_TRY_ENV
++ );
+ }
+
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_OperationDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f4f), ACE_NTOHL (0x70657261), ACE_NTOHL (0x74696f6e), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/OperationDef:1.0
+- 13, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0), // name = OperationDef
++ 13, ACE_NTOHL (0x4f706572), ACE_NTOHL (0x6174696f), ACE_NTOHL (0x6e446566), ACE_NTOHL (0x0), // name = IR_OperationDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_OperationDef (CORBA::tk_objref, sizeof (_oc_IR_OperationDef), (char *) &_oc_IR_OperationDef, 0, sizeof (IR::OperationDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_OperationDef (CORBA::tk_objref, sizeof (_oc_IR_OperationDef), (char *) &_oc_IR_OperationDef, 0, sizeof (IR_OperationDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDef, &_tc_TAO_tc_IR_OperationDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_OperationDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -27469,7 +17496,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -27545,28 +17572,25 @@
+
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_OperationDescription (CORBA::tk_struct, sizeof (_oc_IR_OperationDescription), (char *) &_oc_IR_OperationDescription, 0, sizeof (IR::OperationDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_OperationDescription (CORBA::tk_struct, sizeof (_oc_IR_OperationDescription), (char *) &_oc_IR_OperationDescription, 0, sizeof (IR_OperationDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationDescription, &_tc_TAO_tc_IR_OperationDescription)
+ TAO_NAMESPACE_END
+-void IR::OperationDescription::_tao_any_destructor (void *x)
++
++void IR_OperationDescription::_tao_any_destructor (void *x)
+ {
+- OperationDescription *tmp = ACE_static_cast (OperationDescription*,x);
++ IR_OperationDescription *tmp = ACE_static_cast (IR_OperationDescription*,x);
+ delete tmp;
+ }
+
+-
+-#if !defined (_TAO_IR_REPOSITORYIDSEQ_CS_)
+-#define _TAO_IR_REPOSITORYIDSEQ_CS_
+-
+ // *************************************************************
+-// IR::RepositoryIdSeq
++// IR_RepositoryIdSeq
+ // *************************************************************
+
+-IR::RepositoryIdSeq::RepositoryIdSeq (void)
++IR_RepositoryIdSeq::IR_RepositoryIdSeq (void)
+ {}
+-IR::RepositoryIdSeq::RepositoryIdSeq (CORBA::ULong max) // uses max size
++IR_RepositoryIdSeq::IR_RepositoryIdSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -27575,7 +17599,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::RepositoryIdSeq::RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
++IR_RepositoryIdSeq::IR_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -27584,7 +17608,7 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::RepositoryIdSeq::RepositoryIdSeq (const RepositoryIdSeq &seq) // copy ctor
++IR_RepositoryIdSeq::IR_RepositoryIdSeq (const IR_RepositoryIdSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+@@ -27593,17 +17617,14 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::RepositoryIdSeq::~RepositoryIdSeq (void) // dtor
++IR_RepositoryIdSeq::~IR_RepositoryIdSeq (void) // dtor
+ {}
+-void IR::RepositoryIdSeq::_tao_any_destructor (void *x)
++void IR_RepositoryIdSeq::_tao_any_destructor (void *x)
+ {
+- RepositoryIdSeq *tmp = ACE_static_cast (RepositoryIdSeq*,x);
++ IR_RepositoryIdSeq *tmp = ACE_static_cast (IR_RepositoryIdSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_RepositoryIdSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -27623,7 +17644,7 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryIdSeq (CORBA::tk_alias, sizeof (_oc_IR_RepositoryIdSeq), (char *) &_oc_IR_RepositoryIdSeq, 0, sizeof (IR::RepositoryIdSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_RepositoryIdSeq (CORBA::tk_alias, sizeof (_oc_IR_RepositoryIdSeq), (char *) &_oc_IR_RepositoryIdSeq, 0, sizeof (IR_RepositoryIdSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_RepositoryIdSeq, &_tc_TAO_tc_IR_RepositoryIdSeq)
+@@ -27631,18 +17652,15 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::OperationDescription* tmp = 0;
++ IR_OperationDescription* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::OperationDescription *old = ACE_reinterpret_cast (IR::OperationDescription *,this->buffer_);
++ IR_OperationDescription *old = ACE_reinterpret_cast (IR_OperationDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -27655,75 +17673,65 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::OperationDescription *tmp = ACE_reinterpret_cast (IR::OperationDescription *,this->buffer_);
++ IR_OperationDescription *tmp = ACE_reinterpret_cast (IR_OperationDescription *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_OPDESCRIPTIONSEQ_CS_)
+-#define _TAO_IR_OPDESCRIPTIONSEQ_CS_
+-
+ // *************************************************************
+-// IR::OpDescriptionSeq
++// IR_OpDescriptionSeq
+ // *************************************************************
+
+-IR::OpDescriptionSeq::OpDescriptionSeq (void)
++IR_OpDescriptionSeq::IR_OpDescriptionSeq (void)
+ {}
+-IR::OpDescriptionSeq::OpDescriptionSeq (CORBA::ULong max) // uses max size
++IR_OpDescriptionSeq::IR_OpDescriptionSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::OperationDescription>
++ TAO_Unbounded_Sequence<IR_OperationDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::OpDescriptionSeq::OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::OperationDescription *buffer, CORBA::Boolean release)
++IR_OpDescriptionSeq::IR_OpDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_OperationDescription *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::OperationDescription>
++ TAO_Unbounded_Sequence<IR_OperationDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::OpDescriptionSeq::OpDescriptionSeq (const OpDescriptionSeq &seq) // copy ctor
++IR_OpDescriptionSeq::IR_OpDescriptionSeq (const IR_OpDescriptionSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::OperationDescription>
++ TAO_Unbounded_Sequence<IR_OperationDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::OpDescriptionSeq::~OpDescriptionSeq (void) // dtor
++IR_OpDescriptionSeq::~IR_OpDescriptionSeq (void) // dtor
+ {}
+-void IR::OpDescriptionSeq::_tao_any_destructor (void *x)
++void IR_OpDescriptionSeq::_tao_any_destructor (void *x)
+ {
+- OpDescriptionSeq *tmp = ACE_static_cast (OpDescriptionSeq*,x);
++ IR_OpDescriptionSeq *tmp = ACE_static_cast (IR_OpDescriptionSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_OpDescriptionSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -27845,7 +17853,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -27924,7 +17932,7 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_OpDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_OpDescriptionSeq), (char *) &_oc_IR_OpDescriptionSeq, 0, sizeof (IR::OpDescriptionSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_OpDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_OpDescriptionSeq), (char *) &_oc_IR_OpDescriptionSeq, 0, sizeof (IR_OpDescriptionSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OpDescriptionSeq, &_tc_TAO_tc_IR_OpDescriptionSeq)
+@@ -27932,18 +17940,15 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::AttributeDescription* tmp = 0;
++ IR_AttributeDescription* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::AttributeDescription *old = ACE_reinterpret_cast (IR::AttributeDescription *,this->buffer_);
++ IR_AttributeDescription *old = ACE_reinterpret_cast (IR_AttributeDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -27956,75 +17961,65 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::AttributeDescription *tmp = ACE_reinterpret_cast (IR::AttributeDescription *,this->buffer_);
++ IR_AttributeDescription *tmp = ACE_reinterpret_cast (IR_AttributeDescription *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_ATTRDESCRIPTIONSEQ_CS_)
+-#define _TAO_IR_ATTRDESCRIPTIONSEQ_CS_
+-
+ // *************************************************************
+-// IR::AttrDescriptionSeq
++// IR_AttrDescriptionSeq
+ // *************************************************************
+
+-IR::AttrDescriptionSeq::AttrDescriptionSeq (void)
++IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (void)
+ {}
+-IR::AttrDescriptionSeq::AttrDescriptionSeq (CORBA::ULong max) // uses max size
++IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::AttributeDescription>
++ TAO_Unbounded_Sequence<IR_AttributeDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::AttrDescriptionSeq::AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR::AttributeDescription *buffer, CORBA::Boolean release)
++IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, IR_AttributeDescription *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::AttributeDescription>
++ TAO_Unbounded_Sequence<IR_AttributeDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::AttrDescriptionSeq::AttrDescriptionSeq (const AttrDescriptionSeq &seq) // copy ctor
++IR_AttrDescriptionSeq::IR_AttrDescriptionSeq (const IR_AttrDescriptionSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::AttributeDescription>
++ TAO_Unbounded_Sequence<IR_AttributeDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::AttrDescriptionSeq::~AttrDescriptionSeq (void) // dtor
++IR_AttrDescriptionSeq::~IR_AttrDescriptionSeq (void) // dtor
+ {}
+-void IR::AttrDescriptionSeq::_tao_any_destructor (void *x)
++void IR_AttrDescriptionSeq::_tao_any_destructor (void *x)
+ {
+- AttrDescriptionSeq *tmp = ACE_static_cast (AttrDescriptionSeq*,x);
++ IR_AttrDescriptionSeq *tmp = ACE_static_cast (IR_AttrDescriptionSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_AttrDescriptionSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -28208,7 +18203,7 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_AttrDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_AttrDescriptionSeq), (char *) &_oc_IR_AttrDescriptionSeq, 0, sizeof (IR::AttrDescriptionSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_AttrDescriptionSeq (CORBA::tk_alias, sizeof (_oc_IR_AttrDescriptionSeq), (char *) &_oc_IR_AttrDescriptionSeq, 0, sizeof (IR_AttrDescriptionSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttrDescriptionSeq, &_tc_TAO_tc_IR_AttrDescriptionSeq)
+@@ -28218,15 +18213,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
++_TAO_InterfaceDef_Proxy_Impl::_TAO_InterfaceDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl (void)
++_TAO_InterfaceDef_Remote_Proxy_Impl::_TAO_InterfaceDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::InterfaceDefSeq * IR::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
++IR_InterfaceDefSeq * _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28235,7 +18230,7 @@
+ ))
+ {
+
+- IR::InterfaceDefSeq *_tao_retval = 0;
++ IR_InterfaceDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -28243,8 +18238,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::InterfaceDefSeq, _tao_retval);
+- IR::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
++ IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_base_interfaces",
+@@ -28253,46 +18248,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get ri (
+- "_get_base_interfaces",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -28301,7 +18271,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -28311,57 +18281,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
++void _TAO_InterfaceDef_Remote_Proxy_Impl::base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -28375,56 +18314,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set ri (
+- "_set_base_interfaces",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- base_interfaces,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << base_interfaces)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -28433,39 +18346,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Boolean IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
++CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28490,46 +18380,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get ri (
+- "_get_is_abstract",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -28538,7 +18403,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -28548,44 +18413,18 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
++void _TAO_InterfaceDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -28594,10 +18433,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -28611,56 +18446,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set ri (
+- "_set_is_abstract",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- is_abstract,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << CORBA::Any::from_boolean (is_abstract))
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -28669,39 +18478,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Boolean IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
++CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28726,46 +18512,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get ri (
+- "_get_is_local",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -28774,7 +18535,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -28784,44 +18545,18 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
++void _TAO_InterfaceDef_Remote_Proxy_Impl::is_local (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -28830,10 +18565,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -28847,56 +18578,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set ri (
+- "_set_is_local",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- is_local,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << CORBA::Any::from_boolean (is_local))
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -28905,39 +18610,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Boolean IR::_TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
++CORBA::Boolean _TAO_InterfaceDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * interface_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -28963,57 +18645,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a ri (
+- "is_a",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- interface_id,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << interface_id)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ _tao_retval
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -29022,7 +18678,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -29032,52 +18688,26 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-IR::AttributeDef_ptr IR::_TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
++IR_AttributeDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_attribute (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -29085,8 +18715,8 @@
+ ))
+ {
+
+- IR::AttributeDef_ptr _tao_retval = IR::AttributeDef::_nil ();
+- IR::AttributeDef_var _tao_safe_retval (_tao_retval);
++ IR_AttributeDef_ptr _tao_retval = IR_AttributeDef::_nil ();
++ IR_AttributeDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -29102,50 +18732,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute ri (
+- "create_attribute",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- type,
+- mode,
+- get_exceptions,
+- put_exceptions,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -29157,14 +18755,14 @@
+ (_tao_out << get_exceptions) &&
+ (_tao_out << put_exceptions)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -29173,7 +18771,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -29183,54 +18781,27 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::OperationDef_ptr IR::_TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
++IR_OperationDef_ptr _TAO_InterfaceDef_Remote_Proxy_Impl::create_operation (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -29238,8 +18809,8 @@
+ ))
+ {
+
+- IR::OperationDef_ptr _tao_retval = IR::OperationDef::_nil ();
+- IR::OperationDef_var _tao_safe_retval (_tao_retval);
++ IR_OperationDef_ptr _tao_retval = IR_OperationDef::_nil ();
++ IR_OperationDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -29255,51 +18826,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation ri (
+- "create_operation",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- result,
+- mode,
+- params,
+- exceptions,
+- contexts,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -29312,14 +18850,14 @@
+ (_tao_out << exceptions) &&
+ (_tao_out << contexts)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -29328,7 +18866,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -29338,41 +18876,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -29386,32 +18897,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_InterfaceDef_Proxy_Broker::_TAO_InterfaceDef_Proxy_Broker (void)
++_TAO_InterfaceDef_Proxy_Broker::_TAO_InterfaceDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
++_TAO_InterfaceDef_Proxy_Broker::~_TAO_InterfaceDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_InterfaceDef_Remote_Proxy_Broker *IR::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_InterfaceDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_InterfaceDef_Remote_Proxy_Broker::_TAO_InterfaceDef_Remote_Proxy_Broker (void)
++_TAO_InterfaceDef_Remote_Proxy_Broker::_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_InterfaceDef_Remote_Proxy_Broker::~_TAO_InterfaceDef_Remote_Proxy_Broker (void)
++_TAO_InterfaceDef_Remote_Proxy_Broker::~_TAO_InterfaceDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_InterfaceDef_Proxy_Impl&
+-IR::_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::InterfaceDef *object,
++_TAO_InterfaceDef_Proxy_Impl&
++_TAO_InterfaceDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_InterfaceDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -29427,112 +18938,112 @@
+
+
+ // default constructor
+-IR::InterfaceDef::InterfaceDef (int collocated)
++IR_InterfaceDef::IR_InterfaceDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::InterfaceDef::~InterfaceDef (void)
++IR_InterfaceDef::~IR_InterfaceDef (void)
+ {}
+
+ void
+-IR::InterfaceDef::_tao_setup_collocation (int collocated)
++IR_InterfaceDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_InterfaceDef_Proxy_Broker_ =
+- ::IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_InterfaceDef_Proxy_Broker_ =
+- ::IR::_TAO_InterfaceDef_Remote_Proxy_Broker::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
++ ::the_TAO_InterfaceDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Container)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_Container::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::InterfaceDef::_tao_any_destructor (void *x)
++void IR_InterfaceDef::_tao_any_destructor (void *x)
+ {
+- InterfaceDef *tmp = ACE_static_cast (InterfaceDef*,x);
++ IR_InterfaceDef *tmp = ACE_static_cast (IR_InterfaceDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::InterfaceDef_ptr IR::InterfaceDef::_narrow (
++IR_InterfaceDef_ptr IR_InterfaceDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return InterfaceDef::_nil ();
++ return IR_InterfaceDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/InterfaceDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (InterfaceDef::_nil ());
++ ACE_CHECK_RETURN (IR_InterfaceDef::_nil ());
+ if (is_a == 0)
+- return InterfaceDef::_nil ();
++ return IR_InterfaceDef::_nil ();
+ }
+- return InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_InterfaceDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::InterfaceDef_ptr IR::InterfaceDef::_unchecked_narrow (
++IR_InterfaceDef_ptr IR_InterfaceDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return InterfaceDef::_nil ();
++ return IR_InterfaceDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- InterfaceDef_ptr default_proxy = InterfaceDef::_nil ();
++ IR_InterfaceDef_ptr default_proxy = IR_InterfaceDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::InterfaceDef (
++ ::IR_InterfaceDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- InterfaceDef::_nil ());
++ IR_InterfaceDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::InterfaceDef (stub, 0, obj->_servant ()), InterfaceDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_InterfaceDef (stub, 0, obj->_servant ()), IR_InterfaceDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- InterfaceDef_ptr,
++ IR_InterfaceDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &InterfaceDef::_narrow
++ &IR_InterfaceDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::InterfaceDef_ptr
+-IR::InterfaceDef::_duplicate (InterfaceDef_ptr obj)
++IR_InterfaceDef_ptr
++IR_InterfaceDef::_duplicate (IR_InterfaceDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/InterfaceDef:1.0")) ||
+@@ -29546,58 +19057,58 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_InterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, InterfaceDef)::_narrow))
++ &IR_InterfaceDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -29610,12 +19121,12 @@
+ return retv;
+ }
+
+-const char* IR::InterfaceDef::_interface_repository_id (void) const
++const char* IR_InterfaceDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/InterfaceDef:1.0";
+ }
+
+-IR::InterfaceDefSeq * IR::InterfaceDef::base_interfaces (
++IR_InterfaceDefSeq * IR_InterfaceDef::base_interfaces (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -29629,8 +19140,8 @@
+ );
+ }
+
+-void IR::InterfaceDef::base_interfaces (
+- const IR::InterfaceDefSeq & base_interfaces,
++void IR_InterfaceDef::base_interfaces (
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -29645,7 +19156,7 @@
+ );
+ }
+
+-CORBA::Boolean IR::InterfaceDef::is_abstract (
++CORBA::Boolean IR_InterfaceDef::is_abstract (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -29659,7 +19170,7 @@
+ );
+ }
+
+-void IR::InterfaceDef::is_abstract (
++void IR_InterfaceDef::is_abstract (
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -29675,7 +19186,7 @@
+ );
+ }
+
+-CORBA::Boolean IR::InterfaceDef::is_local (
++CORBA::Boolean IR_InterfaceDef::is_local (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -29689,7 +19200,7 @@
+ );
+ }
+
+-void IR::InterfaceDef::is_local (
++void IR_InterfaceDef::is_local (
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -29705,590 +19216,92 @@
+ );
+ }
+
+-CORBA::Boolean IR::InterfaceDef::is_a (
++CORBA::Boolean IR_InterfaceDef::is_a (
+ const char * interface_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
+- this,
+- interface_id,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::AttributeDef_ptr IR::InterfaceDef::create_attribute (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_attribute (
+- this,
+- id,
+- name,
+- version,
+- type,
+- mode,
+- get_exceptions,
+- put_exceptions,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::OperationDef_ptr IR::InterfaceDef::create_operation (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_operation (
+- this,
+- id,
+- name,
+- version,
+- result,
+- mode,
+- params,
+- exceptions,
+- contexts,
+- ACE_TRY_ENV
+- );
+-}
+-
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get::result (IR::InterfaceDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::InterfaceDefSeq & base_interfaces,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- base_interfaces_ (base_interfaces)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_base_interfaces = this->parameter_list_.length ();
+- this->parameter_list_.length (length_base_interfaces + 1);
+- this->parameter_list_[length_base_interfaces].argument <<= this->base_interfaces_;
+-
+- this->parameter_list_[length_base_interfaces].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_abstract,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- is_abstract_ (is_abstract)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_is_abstract = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_abstract + 1);
+- this->parameter_list_[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+- this->parameter_list_[length_is_abstract].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_local,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- is_local_ (is_local)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_is_local = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_local + 1);
+- this->parameter_list_[length_is_local].argument <<= CORBA::Any::from_boolean (this->is_local_);
+- this->parameter_list_[length_is_local].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::TAO_ClientRequestInfo_IR_InterfaceDef_is_a (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * interface_id,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- interface_id_ (interface_id)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_interface_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_interface_id + 1);
+- this->parameter_list_[length_interface_id].argument <<= interface_id_;
+- this->parameter_list_[length_interface_id].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_is_a::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode & mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- type_ (type),
+- mode_ (mode),
+- get_exceptions_ (get_exceptions),
+- put_exceptions_ (put_exceptions)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_type + 1);
+- this->parameter_list_[length_type].argument <<= this->type_;
+-
+- this->parameter_list_[length_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_mode = this->parameter_list_.length ();
+- this->parameter_list_.length (length_mode + 1);
+- this->parameter_list_[length_mode].argument <<= this->mode_;
+-
+- this->parameter_list_[length_mode].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_get_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_get_exceptions + 1);
+- this->parameter_list_[length_get_exceptions].argument <<= this->get_exceptions_;
+-
+- this->parameter_list_[length_get_exceptions].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_put_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_put_exceptions + 1);
+- this->parameter_list_[length_put_exceptions].argument <<= this->put_exceptions_;
+-
+- this->parameter_list_[length_put_exceptions].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute::result (IR::AttributeDef_ptr result)
++ ))
+ {
+- // update the result
+- this->result_ = result;
++
++ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
++ this,
++ interface_id,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
++IR_AttributeDef_ptr IR_InterfaceDef::create_attribute (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode & mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- result_ (result),
+- mode_ (mode),
+- params_ (params),
+- exceptions_ (exceptions),
+- contexts_ (contexts)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_result = this->parameter_list_.length ();
+- this->parameter_list_.length (length_result + 1);
+- this->parameter_list_[length_result].argument <<= this->result_;
+-
+- this->parameter_list_[length_result].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_mode = this->parameter_list_.length ();
+- this->parameter_list_.length (length_mode + 1);
+- this->parameter_list_[length_mode].argument <<= this->mode_;
+-
+- this->parameter_list_[length_mode].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_params = this->parameter_list_.length ();
+- this->parameter_list_.length (length_params + 1);
+- this->parameter_list_[length_params].argument <<= this->params_;
+-
+- this->parameter_list_[length_params].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_exceptions + 1);
+- this->parameter_list_[length_exceptions].argument <<= this->exceptions_;
+
+- this->parameter_list_[length_exceptions].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_contexts = this->parameter_list_.length ();
+- this->parameter_list_.length (length_contexts + 1);
+- this->parameter_list_[length_contexts].argument <<= this->contexts_;
+-
+- this->parameter_list_[length_contexts].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
++ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_attribute (
++ this,
++ id,
++ name,
++ version,
++ type,
++ mode,
++ get_exceptions,
++ put_exceptions,
++ ACE_TRY_ENV
++ );
+ }
+
+-void
+-IR::InterfaceDef::TAO_ClientRequestInfo_IR_InterfaceDef_create_operation::result (IR::OperationDef_ptr result)
++IR_OperationDef_ptr IR_InterfaceDef::create_operation (
++ const char * id,
++ const char * name,
++ const char * version,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // update the result
+- this->result_ = result;
++
++ return this->the_TAO_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_operation (
++ this,
++ id,
++ name,
++ version,
++ result,
++ mode,
++ params,
++ exceptions,
++ contexts,
++ ACE_TRY_ENV
++ );
+ }
+
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_InterfaceDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
+- 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = InterfaceDef
++ 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_InterfaceDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDef (CORBA::tk_objref, sizeof (_oc_IR_InterfaceDef), (char *) &_oc_IR_InterfaceDef, 0, sizeof (IR::InterfaceDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDef (CORBA::tk_objref, sizeof (_oc_IR_InterfaceDef), (char *) &_oc_IR_InterfaceDef, 0, sizeof (IR_InterfaceDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDef, &_tc_TAO_tc_IR_InterfaceDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_InterfaceDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -30453,7 +19466,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -30746,14 +19759,15 @@
+ CORBA::tk_boolean,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDescription (CORBA::tk_struct, sizeof (_oc_IR_InterfaceDescription), (char *) &_oc_IR_InterfaceDescription, 0, sizeof (IR::InterfaceDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_InterfaceDescription (CORBA::tk_struct, sizeof (_oc_IR_InterfaceDescription), (char *) &_oc_IR_InterfaceDescription, 0, sizeof (IR_InterfaceDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_InterfaceDescription, &_tc_TAO_tc_IR_InterfaceDescription)
+ TAO_NAMESPACE_END
+-void IR::InterfaceDescription::_tao_any_destructor (void *x)
++
++void IR_InterfaceDescription::_tao_any_destructor (void *x)
+ {
+- InterfaceDescription *tmp = ACE_static_cast (InterfaceDescription*,x);
++ IR_InterfaceDescription *tmp = ACE_static_cast (IR_InterfaceDescription*,x);
+ delete tmp;
+ }
+
+@@ -30807,7 +19821,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -30819,32 +19833,30 @@
+
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ValueMember (CORBA::tk_struct, sizeof (_oc_IR_ValueMember), (char *) &_oc_IR_ValueMember, 0, sizeof (IR::ValueMember));
++static CORBA::TypeCode _tc_TAO_tc_IR_ValueMember (CORBA::tk_struct, sizeof (_oc_IR_ValueMember), (char *) &_oc_IR_ValueMember, 0, sizeof (IR_ValueMember));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMember, &_tc_TAO_tc_IR_ValueMember)
+ TAO_NAMESPACE_END
+-void IR::ValueMember::_tao_any_destructor (void *x)
++
++void IR_ValueMember::_tao_any_destructor (void *x)
+ {
+- ValueMember *tmp = ACE_static_cast (ValueMember*,x);
++ IR_ValueMember *tmp = ACE_static_cast (IR_ValueMember*,x);
+ delete tmp;
+ }
+
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ValueMember* tmp = 0;
++ IR_ValueMember* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ValueMember *old = ACE_reinterpret_cast (IR::ValueMember *,this->buffer_);
++ IR_ValueMember *old = ACE_reinterpret_cast (IR_ValueMember *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -30857,75 +19869,65 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_ValueMemberSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::ValueMember *tmp = ACE_reinterpret_cast (IR::ValueMember *,this->buffer_);
++ IR_ValueMember *tmp = ACE_reinterpret_cast (IR_ValueMember *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::~_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_ValueMemberSeq::~_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_VALUEMEMBERSEQ_CS_)
+-#define _TAO_IR_VALUEMEMBERSEQ_CS_
+-
+ // *************************************************************
+-// IR::ValueMemberSeq
++// IR_ValueMemberSeq
+ // *************************************************************
+
+-IR::ValueMemberSeq::ValueMemberSeq (void)
++IR_ValueMemberSeq::IR_ValueMemberSeq (void)
+ {}
+-IR::ValueMemberSeq::ValueMemberSeq (CORBA::ULong max) // uses max size
++IR_ValueMemberSeq::IR_ValueMemberSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ValueMember>
++ TAO_Unbounded_Sequence<IR_ValueMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ValueMemberSeq::ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, IR::ValueMember *buffer, CORBA::Boolean release)
++IR_ValueMemberSeq::IR_ValueMemberSeq (CORBA::ULong max, CORBA::ULong length, IR_ValueMember *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ValueMember>
++ TAO_Unbounded_Sequence<IR_ValueMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ValueMemberSeq::ValueMemberSeq (const ValueMemberSeq &seq) // copy ctor
++IR_ValueMemberSeq::IR_ValueMemberSeq (const IR_ValueMemberSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ValueMember>
++ TAO_Unbounded_Sequence<IR_ValueMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ValueMemberSeq::~ValueMemberSeq (void) // dtor
++IR_ValueMemberSeq::~IR_ValueMemberSeq (void) // dtor
+ {}
+-void IR::ValueMemberSeq::_tao_any_destructor (void *x)
++void IR_ValueMemberSeq::_tao_any_destructor (void *x)
+ {
+- ValueMemberSeq *tmp = ACE_static_cast (ValueMemberSeq*,x);
++ IR_ValueMemberSeq *tmp = ACE_static_cast (IR_ValueMemberSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ValueMemberSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -30984,7 +19986,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -30999,7 +20001,7 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ValueMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_ValueMemberSeq), (char *) &_oc_IR_ValueMemberSeq, 0, sizeof (IR::ValueMemberSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ValueMemberSeq (CORBA::tk_alias, sizeof (_oc_IR_ValueMemberSeq), (char *) &_oc_IR_ValueMemberSeq, 0, sizeof (IR_ValueMemberSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberSeq, &_tc_TAO_tc_IR_ValueMemberSeq)
+@@ -31009,15 +20011,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
++_TAO_ValueMemberDef_Proxy_Impl::_TAO_ValueMemberDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::_TAO_ValueMemberDef_Remote_Proxy_Impl (void)
++_TAO_ValueMemberDef_Remote_Proxy_Impl::_TAO_ValueMemberDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::TypeCode_ptr IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::type (
++CORBA::TypeCode_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -31043,46 +20045,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get ri (
+- "_get_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -31091,7 +20068,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -31101,45 +20078,17 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::TypeCode_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::IDLType_ptr IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
++IR_IDLType_ptr _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -31148,8 +20097,8 @@
+ ))
+ {
+
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -31165,46 +20114,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get ri (
+- "_get_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -31213,7 +20137,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -31223,57 +20147,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
++void _TAO_ValueMemberDef_Remote_Proxy_Impl::type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -31287,56 +20180,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set ri (
+- "_set_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << type_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -31345,39 +20212,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Visibility IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
++CORBA::Visibility _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -31402,46 +20246,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get ri (
+- "_get_access",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -31450,7 +20269,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -31460,44 +20279,18 @@
+ (_tao_in >> _tao_retval)
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Visibility _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_ValueMemberDef_Remote_Proxy_Impl::access (
++void _TAO_ValueMemberDef_Remote_Proxy_Impl::access (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -31506,10 +20299,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -31523,56 +20312,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set ri (
+- "_set_access",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- access,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << access)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -31581,36 +20344,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -31623,32 +20363,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ValueMemberDef_Proxy_Broker::_TAO_ValueMemberDef_Proxy_Broker (void)
++_TAO_ValueMemberDef_Proxy_Broker::_TAO_ValueMemberDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
++_TAO_ValueMemberDef_Proxy_Broker::~_TAO_ValueMemberDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ValueMemberDef_Remote_Proxy_Broker *IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ValueMemberDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
++_TAO_ValueMemberDef_Remote_Proxy_Broker::_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::~_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
++_TAO_ValueMemberDef_Remote_Proxy_Broker::~_TAO_ValueMemberDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueMemberDef_Proxy_Impl&
+-IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ValueMemberDef *object,
++_TAO_ValueMemberDef_Proxy_Impl&
++_TAO_ValueMemberDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ValueMemberDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -31664,110 +20404,110 @@
+
+
+ // default constructor
+-IR::ValueMemberDef::ValueMemberDef (int collocated)
++IR_ValueMemberDef::IR_ValueMemberDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ValueMemberDef::~ValueMemberDef (void)
++IR_ValueMemberDef::~IR_ValueMemberDef (void)
+ {}
+
+ void
+-IR::ValueMemberDef::_tao_setup_collocation (int collocated)
++IR_ValueMemberDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ValueMemberDef_Proxy_Broker_ =
+- ::IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ValueMemberDef_Proxy_Broker_ =
+- ::IR::_TAO_ValueMemberDef_Remote_Proxy_Broker::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
++ ::the_TAO_ValueMemberDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ValueMemberDef::_tao_any_destructor (void *x)
++void IR_ValueMemberDef::_tao_any_destructor (void *x)
+ {
+- ValueMemberDef *tmp = ACE_static_cast (ValueMemberDef*,x);
++ IR_ValueMemberDef *tmp = ACE_static_cast (IR_ValueMemberDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ValueMemberDef_ptr IR::ValueMemberDef::_narrow (
++IR_ValueMemberDef_ptr IR_ValueMemberDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ValueMemberDef::_nil ();
++ return IR_ValueMemberDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueMemberDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ValueMemberDef::_nil ());
++ ACE_CHECK_RETURN (IR_ValueMemberDef::_nil ());
+ if (is_a == 0)
+- return ValueMemberDef::_nil ();
++ return IR_ValueMemberDef::_nil ();
+ }
+- return ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ValueMemberDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ValueMemberDef_ptr IR::ValueMemberDef::_unchecked_narrow (
++IR_ValueMemberDef_ptr IR_ValueMemberDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ValueMemberDef::_nil ();
++ return IR_ValueMemberDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ValueMemberDef_ptr default_proxy = ValueMemberDef::_nil ();
++ IR_ValueMemberDef_ptr default_proxy = IR_ValueMemberDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ValueMemberDef (
++ ::IR_ValueMemberDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ValueMemberDef::_nil ());
++ IR_ValueMemberDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ValueMemberDef (stub, 0, obj->_servant ()), ValueMemberDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ValueMemberDef (stub, 0, obj->_servant ()), IR_ValueMemberDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ValueMemberDef_ptr,
++ IR_ValueMemberDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ValueMemberDef::_narrow
++ &IR_ValueMemberDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ValueMemberDef_ptr
+-IR::ValueMemberDef::_duplicate (ValueMemberDef_ptr obj)
++IR_ValueMemberDef_ptr
++IR_ValueMemberDef::_duplicate (IR_ValueMemberDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueMemberDef:1.0")) ||
+@@ -31779,34 +20519,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ValueMemberDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ValueMemberDef)::_narrow))
++ &IR_ValueMemberDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -31819,12 +20559,12 @@
+ return retv;
+ }
+
+-const char* IR::ValueMemberDef::_interface_repository_id (void) const
++const char* IR_ValueMemberDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ValueMemberDef:1.0";
+ }
+
+-CORBA::TypeCode_ptr IR::ValueMemberDef::type (
++CORBA::TypeCode_ptr IR_ValueMemberDef::type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31838,7 +20578,7 @@
+ );
+ }
+
+-IR::IDLType_ptr IR::ValueMemberDef::type_def (
++IR_IDLType_ptr IR_ValueMemberDef::type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31852,8 +20592,8 @@
+ );
+ }
+
+-void IR::ValueMemberDef::type_def (
+- IR::IDLType_ptr type_def,
++void IR_ValueMemberDef::type_def (
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31868,7 +20608,7 @@
+ );
+ }
+
+-CORBA::Visibility IR::ValueMemberDef::access (
++CORBA::Visibility IR_ValueMemberDef::access (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -31882,7 +20622,7 @@
+ );
+ }
+
+-void IR::ValueMemberDef::access (
++void IR_ValueMemberDef::access (
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -31898,233 +20638,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_get::result (CORBA::TypeCode_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- type_def_ (type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_type_def + 1);
+- this->parameter_list_[length_type_def].argument <<= this->type_def_;
+-
+- this->parameter_list_[length_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_get::result (CORBA::Visibility result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Visibility & access,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- access_ (access)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_access = this->parameter_list_.length ();
+- this->parameter_list_.length (length_access + 1);
+- this->parameter_list_[length_access].argument <<= access_;
+- this->parameter_list_[length_access].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueMemberDef::TAO_ClientRequestInfo_IR_ValueMemberDef_access_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ValueMemberDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4d656d62), ACE_NTOHL (0x65724465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ValueMemberDef:1.0
+- 15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657244), ACE_NTOHL (0x65660000), // name = ValueMemberDef
++ 15, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x654d656d), ACE_NTOHL (0x62657244), ACE_NTOHL (0x65660000), // name = IR_ValueMemberDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ValueMemberDef (CORBA::tk_objref, sizeof (_oc_IR_ValueMemberDef), (char *) &_oc_IR_ValueMemberDef, 0, sizeof (IR::ValueMemberDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ValueMemberDef (CORBA::tk_objref, sizeof (_oc_IR_ValueMemberDef), (char *) &_oc_IR_ValueMemberDef, 0, sizeof (IR_ValueMemberDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueMemberDef, &_tc_TAO_tc_IR_ValueMemberDef)
+@@ -32134,15 +20654,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
++_TAO_ValueDef_Proxy_Impl::_TAO_ValueDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
++_TAO_ValueDef_Remote_Proxy_Impl::_TAO_ValueDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::InterfaceDefSeq * IR::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
++IR_InterfaceDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -32151,7 +20671,7 @@
+ ))
+ {
+
+- IR::InterfaceDefSeq *_tao_retval = 0;
++ IR_InterfaceDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -32159,8 +20679,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::InterfaceDefSeq, _tao_retval);
+- IR::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
++ IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_supported_interfaces",
+@@ -32169,46 +20689,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get ri (
+- "_get_supported_interfaces",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -32217,7 +20712,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -32227,57 +20722,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
++void _TAO_ValueDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & supported_interfaces,
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -32291,56 +20755,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set ri (
+- "_set_supported_interfaces",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- supported_interfaces,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << supported_interfaces)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -32349,39 +20787,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::InitializerSeq * IR::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
++IR_InitializerSeq * _TAO_ValueDef_Remote_Proxy_Impl::initializers (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -32390,7 +20805,7 @@
+ ))
+ {
+
+- IR::InitializerSeq *_tao_retval = 0;
++ IR_InitializerSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -32398,8 +20813,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::InitializerSeq, _tao_retval);
+- IR::InitializerSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_InitializerSeq, _tao_retval);
++ IR_InitializerSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_initializers",
+@@ -32408,46 +20823,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get ri (
+- "_get_initializers",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -32456,7 +20846,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -32466,57 +20856,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::InitializerSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ValueDef_Remote_Proxy_Impl::initializers (
++void _TAO_ValueDef_Remote_Proxy_Impl::initializers (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InitializerSeq & initializers,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -32530,56 +20889,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set ri (
+- "_set_initializers",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- initializers,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << initializers)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -32588,39 +20921,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::ValueDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
++IR_ValueDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::base_value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -32629,8 +20939,8 @@
+ ))
+ {
+
+- IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
+- IR::ValueDef_var _tao_safe_retval (_tao_retval);
++ IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
++ IR_ValueDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -32646,46 +20956,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get ri (
+- "_get_base_value",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -32694,7 +20979,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -32704,57 +20989,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ValueDef_Remote_Proxy_Impl::base_value (
++void _TAO_ValueDef_Remote_Proxy_Impl::base_value (
+ CORBA_Object *_collocated_tao_target_,
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -32768,56 +21022,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set ri (
+- "_set_base_value",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- base_value,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << base_value)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -32826,39 +21054,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::ValueDefSeq * IR::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
++IR_ValueDefSeq * _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -32867,7 +21072,7 @@
+ ))
+ {
+
+- IR::ValueDefSeq *_tao_retval = 0;
++ IR_ValueDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -32875,8 +21080,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::ValueDefSeq, _tao_retval);
+- IR::ValueDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_ValueDefSeq, _tao_retval);
++ IR_ValueDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_abstract_base_values",
+@@ -32885,46 +21090,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get ri (
+- "_get_abstract_base_values",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -32933,7 +21113,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -32943,57 +21123,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ValueDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
++void _TAO_ValueDef_Remote_Proxy_Impl::abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ValueDefSeq & abstract_base_values,
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -33007,56 +21156,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set ri (
+- "_set_abstract_base_values",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- abstract_base_values,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << abstract_base_values)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -33065,39 +21188,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
++CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -33122,46 +21222,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get ri (
+- "_get_is_abstract",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -33170,7 +21245,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -33180,44 +21255,18 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
++void _TAO_ValueDef_Remote_Proxy_Impl::is_abstract (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -33226,10 +21275,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -33243,56 +21288,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set ri (
+- "_set_is_abstract",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- is_abstract,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << CORBA::Any::from_boolean (is_abstract))
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -33301,39 +21320,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
++CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -33358,46 +21354,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get ri (
+- "_get_is_custom",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -33406,7 +21377,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -33416,44 +21387,18 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_custom (
++void _TAO_ValueDef_Remote_Proxy_Impl::is_custom (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_custom,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -33462,10 +21407,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -33479,56 +21420,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set ri (
+- "_set_is_custom",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- is_custom,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << CORBA::Any::from_boolean (is_custom))
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -33537,39 +21452,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
++CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -33591,49 +21483,24 @@
+ "_get_is_truncatable",
+ 19,
+ 0,
+- istub->orb_core ()
+- );
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get ri (
+- "_get_is_truncatable",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
++ istub->orb_core ()
+ );
+- ACE_CHECK_RETURN (_tao_retval);
+
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -33642,7 +21509,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -33652,44 +21519,18 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-void IR::_TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
++void _TAO_ValueDef_Remote_Proxy_Impl::is_truncatable (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Boolean is_truncatable,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -33698,10 +21539,6 @@
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -33715,56 +21552,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set ri (
+- "_set_is_truncatable",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- is_truncatable,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << CORBA::Any::from_boolean (is_truncatable))
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -33773,39 +21584,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-CORBA::Boolean IR::_TAO_ValueDef_Remote_Proxy_Impl::is_a (
++CORBA::Boolean _TAO_ValueDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -33831,57 +21619,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a ri (
+- "is_a",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << id)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ _tao_retval
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -33890,7 +21652,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -33900,49 +21662,23 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-IR::ValueMemberDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
++IR_ValueMemberDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_value_member (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -33951,8 +21687,8 @@
+ ))
+ {
+
+- IR::ValueMemberDef_ptr _tao_retval = IR::ValueMemberDef::_nil ();
+- IR::ValueMemberDef_var _tao_safe_retval (_tao_retval);
++ IR_ValueMemberDef_ptr _tao_retval = IR_ValueMemberDef::_nil ();
++ IR_ValueMemberDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -33968,48 +21704,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member ri (
+- "create_value_member",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- type,
+- access,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -34019,14 +21725,14 @@
+ (_tao_out << type) &&
+ (_tao_out << access)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -34035,7 +21741,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -34045,53 +21751,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ValueMemberDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::AttributeDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
++IR_AttributeDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_attribute (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34099,8 +21778,8 @@
+ ))
+ {
+
+- IR::AttributeDef_ptr _tao_retval = IR::AttributeDef::_nil ();
+- IR::AttributeDef_var _tao_safe_retval (_tao_retval);
++ IR_AttributeDef_ptr _tao_retval = IR_AttributeDef::_nil ();
++ IR_AttributeDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -34116,50 +21795,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute ri (
+- "create_attribute",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- type,
+- mode,
+- get_exceptions,
+- put_exceptions,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -34171,14 +21818,14 @@
+ (_tao_out << get_exceptions) &&
+ (_tao_out << put_exceptions)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -34187,7 +21834,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -34197,54 +21844,27 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::AttributeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::OperationDef_ptr IR::_TAO_ValueDef_Remote_Proxy_Impl::create_operation (
++IR_OperationDef_ptr _TAO_ValueDef_Remote_Proxy_Impl::create_operation (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34252,8 +21872,8 @@
+ ))
+ {
+
+- IR::OperationDef_ptr _tao_retval = IR::OperationDef::_nil ();
+- IR::OperationDef_var _tao_safe_retval (_tao_retval);
++ IR_OperationDef_ptr _tao_retval = IR_OperationDef::_nil ();
++ IR_OperationDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -34269,51 +21889,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation ri (
+- "create_operation",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- result,
+- mode,
+- params,
+- exceptions,
+- contexts,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -34326,14 +21913,14 @@
+ (_tao_out << exceptions) &&
+ (_tao_out << contexts)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -34342,7 +21929,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -34352,41 +21939,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::OperationDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -34400,32 +21960,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
++_TAO_ValueDef_Proxy_Broker::_TAO_ValueDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_Proxy_Broker (void)
++_TAO_ValueDef_Proxy_Broker::~_TAO_ValueDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ValueDef_Remote_Proxy_Broker *IR::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ValueDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ValueDef_Remote_Proxy_Broker::_TAO_ValueDef_Remote_Proxy_Broker (void)
++_TAO_ValueDef_Remote_Proxy_Broker::_TAO_ValueDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueDef_Remote_Proxy_Broker::~_TAO_ValueDef_Remote_Proxy_Broker (void)
++_TAO_ValueDef_Remote_Proxy_Broker::~_TAO_ValueDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueDef_Proxy_Impl&
+-IR::_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ValueDef *object,
++_TAO_ValueDef_Proxy_Impl&
++_TAO_ValueDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ValueDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -34441,112 +22001,112 @@
+
+
+ // default constructor
+-IR::ValueDef::ValueDef (int collocated)
++IR_ValueDef::IR_ValueDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ValueDef::~ValueDef (void)
++IR_ValueDef::~IR_ValueDef (void)
+ {}
+
+ void
+-IR::ValueDef::_tao_setup_collocation (int collocated)
++IR_ValueDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ValueDef_Proxy_Broker_ =
+- ::IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ValueDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ValueDef_Proxy_Broker_ =
+- ::IR::_TAO_ValueDef_Remote_Proxy_Broker::the_TAO_ValueDef_Remote_Proxy_Broker ();
++ ::the_TAO_ValueDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Container)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
+- ACE_NESTED_CLASS (IR,IDLType)::_tao_setup_collocation (collocated);
++ IR_Container::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
++ IR_IDLType::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ValueDef::_tao_any_destructor (void *x)
++void IR_ValueDef::_tao_any_destructor (void *x)
+ {
+- ValueDef *tmp = ACE_static_cast (ValueDef*,x);
++ IR_ValueDef *tmp = ACE_static_cast (IR_ValueDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ValueDef_ptr IR::ValueDef::_narrow (
++IR_ValueDef_ptr IR_ValueDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ValueDef::_nil ();
++ return IR_ValueDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ValueDef::_nil ());
++ ACE_CHECK_RETURN (IR_ValueDef::_nil ());
+ if (is_a == 0)
+- return ValueDef::_nil ();
++ return IR_ValueDef::_nil ();
+ }
+- return ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ValueDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ValueDef_ptr IR::ValueDef::_unchecked_narrow (
++IR_ValueDef_ptr IR_ValueDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ValueDef::_nil ();
++ return IR_ValueDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ValueDef_ptr default_proxy = ValueDef::_nil ();
++ IR_ValueDef_ptr default_proxy = IR_ValueDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ValueDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ValueDef (
++ ::IR_ValueDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ValueDef::_nil ());
++ IR_ValueDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ValueDef (stub, 0, obj->_servant ()), ValueDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ValueDef (stub, 0, obj->_servant ()), IR_ValueDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ValueDef_ptr,
++ IR_ValueDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ValueDef::_narrow
++ &IR_ValueDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ValueDef_ptr
+-IR::ValueDef::_duplicate (ValueDef_ptr obj)
++IR_ValueDef_ptr
++IR_ValueDef::_duplicate (IR_ValueDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueDef:1.0")) ||
+@@ -34560,58 +22120,58 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ValueDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ValueDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ValueDef)::_narrow))
++ &IR_ValueDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -34624,12 +22184,12 @@
+ return retv;
+ }
+
+-const char* IR::ValueDef::_interface_repository_id (void) const
++const char* IR_ValueDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ValueDef:1.0";
+ }
+
+-IR::InterfaceDefSeq * IR::ValueDef::supported_interfaces (
++IR_InterfaceDefSeq * IR_ValueDef::supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34643,8 +22203,8 @@
+ );
+ }
+
+-void IR::ValueDef::supported_interfaces (
+- const IR::InterfaceDefSeq & supported_interfaces,
++void IR_ValueDef::supported_interfaces (
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34659,7 +22219,7 @@
+ );
+ }
+
+-IR::InitializerSeq * IR::ValueDef::initializers (
++IR_InitializerSeq * IR_ValueDef::initializers (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34673,8 +22233,8 @@
+ );
+ }
+
+-void IR::ValueDef::initializers (
+- const IR::InitializerSeq & initializers,
++void IR_ValueDef::initializers (
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34689,7 +22249,7 @@
+ );
+ }
+
+-IR::ValueDef_ptr IR::ValueDef::base_value (
++IR_ValueDef_ptr IR_ValueDef::base_value (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34703,8 +22263,8 @@
+ );
+ }
+
+-void IR::ValueDef::base_value (
+- IR::ValueDef_ptr base_value,
++void IR_ValueDef::base_value (
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34719,7 +22279,7 @@
+ );
+ }
+
+-IR::ValueDefSeq * IR::ValueDef::abstract_base_values (
++IR_ValueDefSeq * IR_ValueDef::abstract_base_values (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34733,8 +22293,8 @@
+ );
+ }
+
+-void IR::ValueDef::abstract_base_values (
+- const IR::ValueDefSeq & abstract_base_values,
++void IR_ValueDef::abstract_base_values (
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34749,7 +22309,7 @@
+ );
+ }
+
+-CORBA::Boolean IR::ValueDef::is_abstract (
++CORBA::Boolean IR_ValueDef::is_abstract (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -34763,7 +22323,7 @@
+ );
+ }
+
+-void IR::ValueDef::is_abstract (
++void IR_ValueDef::is_abstract (
+ CORBA::Boolean is_abstract,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -34775,1100 +22335,180 @@
+ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_abstract (
+ this,
+ is_abstract,
+- ACE_TRY_ENV
+- );
+-}
+-
+-CORBA::Boolean IR::ValueDef::is_custom (
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_custom (
+- this,
+- ACE_TRY_ENV
+- );
+-}
+-
+-void IR::ValueDef::is_custom (
+- CORBA::Boolean is_custom,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_custom (
+- this,
+- is_custom,
+- ACE_TRY_ENV
+- );
+-}
+-
+-CORBA::Boolean IR::ValueDef::is_truncatable (
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
+- this,
+- ACE_TRY_ENV
+- );
+-}
+-
+-void IR::ValueDef::is_truncatable (
+- CORBA::Boolean is_truncatable,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
+- this,
+- is_truncatable,
+- ACE_TRY_ENV
+- );
+-}
+-
+-CORBA::Boolean IR::ValueDef::is_a (
+- const char * id,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
+- this,
+- id,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::ValueMemberDef_ptr IR::ValueDef::create_value_member (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- CORBA::Visibility access,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_value_member (
+- this,
+- id,
+- name,
+- version,
+- type,
+- access,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::AttributeDef_ptr IR::ValueDef::create_attribute (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_attribute (
+- this,
+- id,
+- name,
+- version,
+- type,
+- mode,
+- get_exceptions,
+- put_exceptions,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::OperationDef_ptr IR::ValueDef::create_operation (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_operation (
+- this,
+- id,
+- name,
+- version,
+- result,
+- mode,
+- params,
+- exceptions,
+- contexts,
+- ACE_TRY_ENV
+- );
+-}
+-
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- supported_interfaces_ (supported_interfaces)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_supported_interfaces = this->parameter_list_.length ();
+- this->parameter_list_.length (length_supported_interfaces + 1);
+- this->parameter_list_[length_supported_interfaces].argument <<= this->supported_interfaces_;
+-
+- this->parameter_list_[length_supported_interfaces].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::TAO_ClientRequestInfo_IR_ValueDef_initializers_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_get::result (IR::InitializerSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::InitializerSeq & initializers,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- initializers_ (initializers)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_initializers = this->parameter_list_.length ();
+- this->parameter_list_.length (length_initializers + 1);
+- this->parameter_list_[length_initializers].argument <<= this->initializers_;
+-
+- this->parameter_list_[length_initializers].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_initializers_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_get::result (IR::ValueDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::ValueDef_ptr base_value,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- base_value_ (base_value)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_base_value = this->parameter_list_.length ();
+- this->parameter_list_.length (length_base_value + 1);
+- this->parameter_list_[length_base_value].argument <<= this->base_value_;
+-
+- this->parameter_list_[length_base_value].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_base_value_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get::result (IR::ValueDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::ValueDefSeq & abstract_base_values,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- abstract_base_values_ (abstract_base_values)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_abstract_base_values = this->parameter_list_.length ();
+- this->parameter_list_.length (length_abstract_base_values + 1);
+- this->parameter_list_[length_abstract_base_values].argument <<= this->abstract_base_values_;
+-
+- this->parameter_list_[length_abstract_base_values].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_abstract,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- is_abstract_ (is_abstract)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_is_abstract = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_abstract + 1);
+- this->parameter_list_[length_is_abstract].argument <<= CORBA::Any::from_boolean (this->is_abstract_);
+- this->parameter_list_[length_is_abstract].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_get::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_custom,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- is_custom_ (is_custom)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_is_custom = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_custom + 1);
+- this->parameter_list_[length_is_custom].argument <<= CORBA::Any::from_boolean (this->is_custom_);
+- this->parameter_list_[length_is_custom].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_custom_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_truncatable,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- is_truncatable_ (is_truncatable)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_is_truncatable = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_truncatable + 1);
+- this->parameter_list_[length_is_truncatable].argument <<= CORBA::Any::from_boolean (this->is_truncatable_);
+- this->parameter_list_[length_is_truncatable].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
++ ACE_TRY_ENV
++ );
+ }
+
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++CORBA::Boolean IR_ValueDef::is_custom (
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+
+- return &this->result_val_;
++ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_custom (
++ this,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::TAO_ClientRequestInfo_IR_ValueDef_is_a (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- CORBA::Environment &
++void IR_ValueDef::is_custom (
++ CORBA::Boolean is_custom,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+
+- return &this->parameter_list_;
++ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_custom (
++ this,
++ is_custom,
++ ACE_TRY_ENV
++ );
+ }
+
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++CORBA::Boolean IR_ValueDef::is_truncatable (
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the exception list on demand
+- return 0;
++
++ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
++ this,
++ ACE_TRY_ENV
++ );
+ }
+
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++void IR_ValueDef::is_truncatable (
++ CORBA::Boolean is_truncatable,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+
+- return &this->result_val_;
++ this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_truncatable (
++ this,
++ is_truncatable,
++ ACE_TRY_ENV
++ );
+ }
+
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_is_a::result (CORBA::Boolean result)
++CORBA::Boolean IR_ValueDef::is_a (
++ const char * id,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // update the result
+- this->result_ = result;
++
++ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).is_a (
++ this,
++ id,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::TAO_ClientRequestInfo_IR_ValueDef_create_value_member (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
++IR_ValueMemberDef_ptr IR_ValueDef::create_value_member (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- const CORBA::Visibility & access,
+- CORBA::Environment &
++ IR_IDLType_ptr type,
++ CORBA::Visibility access,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- type_ (type),
+- access_ (access)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_type + 1);
+- this->parameter_list_[length_type].argument <<= this->type_;
+-
+- this->parameter_list_[length_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_access = this->parameter_list_.length ();
+- this->parameter_list_.length (length_access + 1);
+- this->parameter_list_[length_access].argument <<= access_;
+- this->parameter_list_[length_access].mode = Dynamic::PARAM_IN;
+
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_value_member::result (IR::ValueMemberDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
++ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_value_member (
++ this,
++ id,
++ name,
++ version,
++ type,
++ access,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::TAO_ClientRequestInfo_IR_ValueDef_create_attribute (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
++IR_AttributeDef_ptr IR_ValueDef::create_attribute (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode & mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
+- CORBA::Environment &
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- type_ (type),
+- mode_ (mode),
+- get_exceptions_ (get_exceptions),
+- put_exceptions_ (put_exceptions)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_type + 1);
+- this->parameter_list_[length_type].argument <<= this->type_;
+-
+- this->parameter_list_[length_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_mode = this->parameter_list_.length ();
+- this->parameter_list_.length (length_mode + 1);
+- this->parameter_list_[length_mode].argument <<= this->mode_;
+-
+- this->parameter_list_[length_mode].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_get_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_get_exceptions + 1);
+- this->parameter_list_[length_get_exceptions].argument <<= this->get_exceptions_;
+
+- this->parameter_list_[length_get_exceptions].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_put_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_put_exceptions + 1);
+- this->parameter_list_[length_put_exceptions].argument <<= this->put_exceptions_;
+-
+- this->parameter_list_[length_put_exceptions].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_attribute::result (IR::AttributeDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
++ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_attribute (
++ this,
++ id,
++ name,
++ version,
++ type,
++ mode,
++ get_exceptions,
++ put_exceptions,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::TAO_ClientRequestInfo_IR_ValueDef_create_operation (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
++IR_OperationDef_ptr IR_ValueDef::create_operation (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode & mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- result_ (result),
+- mode_ (mode),
+- params_ (params),
+- exceptions_ (exceptions),
+- contexts_ (contexts)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_result = this->parameter_list_.length ();
+- this->parameter_list_.length (length_result + 1);
+- this->parameter_list_[length_result].argument <<= this->result_;
+-
+- this->parameter_list_[length_result].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_mode = this->parameter_list_.length ();
+- this->parameter_list_.length (length_mode + 1);
+- this->parameter_list_[length_mode].argument <<= this->mode_;
+-
+- this->parameter_list_[length_mode].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_params = this->parameter_list_.length ();
+- this->parameter_list_.length (length_params + 1);
+- this->parameter_list_[length_params].argument <<= this->params_;
+
+- this->parameter_list_[length_params].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_exceptions + 1);
+- this->parameter_list_[length_exceptions].argument <<= this->exceptions_;
+-
+- this->parameter_list_[length_exceptions].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_contexts = this->parameter_list_.length ();
+- this->parameter_list_.length (length_contexts + 1);
+- this->parameter_list_[length_contexts].argument <<= this->contexts_;
+-
+- this->parameter_list_[length_contexts].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueDef::TAO_ClientRequestInfo_IR_ValueDef_create_operation::result (IR::OperationDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
++ return this->the_TAO_ValueDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_operation (
++ this,
++ id,
++ name,
++ version,
++ result,
++ mode,
++ params,
++ exceptions,
++ contexts,
++ ACE_TRY_ENV
++ );
+ }
+
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ValueDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ValueDef:1.0
+- 9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = ValueDef
++ 9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_ValueDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ValueDef (CORBA::tk_objref, sizeof (_oc_IR_ValueDef), (char *) &_oc_IR_ValueDef, 0, sizeof (IR::ValueDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ValueDef (CORBA::tk_objref, sizeof (_oc_IR_ValueDef), (char *) &_oc_IR_ValueDef, 0, sizeof (IR_ValueDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDef, &_tc_TAO_tc_IR_ValueDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ValueDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -36039,7 +22679,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -36361,7 +23001,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 7, ACE_NTOHL (0x61636365), ACE_NTOHL (0x73730000), // name = access
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -36381,7 +23021,7 @@
+ 576, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65725365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/InitializerSeq:1.0
+- 15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000), // name = InitializerSeq
++ 15, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657253), ACE_NTOHL (0x65710000), // name = IR_InitializerSeq
+ CORBA::tk_sequence, // typecode kind
+ 504, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -36389,14 +23029,14 @@
+ 488, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e697469), ACE_NTOHL (0x616c697a), ACE_NTOHL (0x65723a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/Initializer:1.0
+- 12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200), // name = Initializer
++ 12, ACE_NTOHL (0x496e6974), ACE_NTOHL (0x69616c69), ACE_NTOHL (0x7a657200), // name = IR_Initializer
+ 2, // member count
+ 8, ACE_NTOHL (0x6d656d62), ACE_NTOHL (0x65727300), // name = members
+ CORBA::tk_alias, // typecode kind for typedefs
+ 324, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x62657253), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/StructMemberSeq:1.0
+- 16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = StructMemberSeq
++ 16, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x53657100), // name = IR_StructMemberSeq
+ CORBA::tk_sequence, // typecode kind
+ 252, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -36404,7 +23044,7 @@
+ 236, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f53), ACE_NTOHL (0x74727563), ACE_NTOHL (0x744d656d), ACE_NTOHL (0x6265723a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/StructMember:1.0
+- 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = StructMember
++ 13, ACE_NTOHL (0x53747275), ACE_NTOHL (0x63744d65), ACE_NTOHL (0x6d626572), ACE_NTOHL (0x0), // name = IR_StructMember
+ 3, // member count
+ 5, ACE_NTOHL (0x6e616d65), ACE_NTOHL (0x0), // name = name
+ CORBA::tk_alias, // typecode kind for typedefs
+@@ -36423,7 +23063,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+
+ 0U,
+@@ -36498,14 +23138,15 @@
+ CORBA::tk_TypeCode,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ValueDescription (CORBA::tk_struct, sizeof (_oc_IR_ValueDescription), (char *) &_oc_IR_ValueDescription, 0, sizeof (IR::ValueDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_ValueDescription (CORBA::tk_struct, sizeof (_oc_IR_ValueDescription), (char *) &_oc_IR_ValueDescription, 0, sizeof (IR_ValueDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueDescription, &_tc_TAO_tc_IR_ValueDescription)
+ TAO_NAMESPACE_END
+-void IR::ValueDescription::_tao_any_destructor (void *x)
++
++void IR_ValueDescription::_tao_any_destructor (void *x)
+ {
+- ValueDescription *tmp = ACE_static_cast (ValueDescription*,x);
++ IR_ValueDescription *tmp = ACE_static_cast (IR_ValueDescription*,x);
+ delete tmp;
+ }
+
+@@ -36514,15 +23155,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
++_TAO_ValueBoxDef_Proxy_Impl::_TAO_ValueBoxDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (void)
++_TAO_ValueBoxDef_Remote_Proxy_Impl::_TAO_ValueBoxDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::IDLType_ptr IR::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
++IR_IDLType_ptr _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -36531,8 +23172,8 @@
+ ))
+ {
+
+- IR::IDLType_ptr _tao_retval = IR::IDLType::_nil ();
+- IR::IDLType_var _tao_safe_retval (_tao_retval);
++ IR_IDLType_ptr _tao_retval = IR_IDLType::_nil ();
++ IR_IDLType_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -36548,46 +23189,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get ri (
+- "_get_original_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -36596,7 +23212,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -36606,57 +23222,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::IDLType_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
++void _TAO_ValueBoxDef_Remote_Proxy_Impl::original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -36670,56 +23255,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set ri (
+- "_set_original_type_def",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- original_type_def,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << original_type_def)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -36728,36 +23287,13 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+
+@@ -36770,32 +23306,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ValueBoxDef_Proxy_Broker::_TAO_ValueBoxDef_Proxy_Broker (void)
++_TAO_ValueBoxDef_Proxy_Broker::_TAO_ValueBoxDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
++_TAO_ValueBoxDef_Proxy_Broker::~_TAO_ValueBoxDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ValueBoxDef_Remote_Proxy_Broker *IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ValueBoxDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
++_TAO_ValueBoxDef_Remote_Proxy_Broker::_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::~_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
++_TAO_ValueBoxDef_Remote_Proxy_Broker::~_TAO_ValueBoxDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ValueBoxDef_Proxy_Impl&
+-IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ValueBoxDef *object,
++_TAO_ValueBoxDef_Proxy_Impl&
++_TAO_ValueBoxDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ValueBoxDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -36811,110 +23347,110 @@
+
+
+ // default constructor
+-IR::ValueBoxDef::ValueBoxDef (int collocated)
++IR_ValueBoxDef::IR_ValueBoxDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ValueBoxDef::~ValueBoxDef (void)
++IR_ValueBoxDef::~IR_ValueBoxDef (void)
+ {}
+
+ void
+-IR::ValueBoxDef::_tao_setup_collocation (int collocated)
++IR_ValueBoxDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ValueBoxDef_Proxy_Broker_ =
+- ::IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ValueBoxDef_Proxy_Broker_ =
+- ::IR::_TAO_ValueBoxDef_Remote_Proxy_Broker::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
++ ::the_TAO_ValueBoxDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,TypedefDef)::_tao_setup_collocation (collocated);
++ IR_TypedefDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ValueBoxDef::_tao_any_destructor (void *x)
++void IR_ValueBoxDef::_tao_any_destructor (void *x)
+ {
+- ValueBoxDef *tmp = ACE_static_cast (ValueBoxDef*,x);
++ IR_ValueBoxDef *tmp = ACE_static_cast (IR_ValueBoxDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ValueBoxDef_ptr IR::ValueBoxDef::_narrow (
++IR_ValueBoxDef_ptr IR_ValueBoxDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ValueBoxDef::_nil ();
++ return IR_ValueBoxDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ValueBoxDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ValueBoxDef::_nil ());
++ ACE_CHECK_RETURN (IR_ValueBoxDef::_nil ());
+ if (is_a == 0)
+- return ValueBoxDef::_nil ();
++ return IR_ValueBoxDef::_nil ();
+ }
+- return ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ValueBoxDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ValueBoxDef_ptr IR::ValueBoxDef::_unchecked_narrow (
++IR_ValueBoxDef_ptr IR_ValueBoxDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ValueBoxDef::_nil ();
++ return IR_ValueBoxDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ValueBoxDef_ptr default_proxy = ValueBoxDef::_nil ();
++ IR_ValueBoxDef_ptr default_proxy = IR_ValueBoxDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ValueBoxDef (
++ ::IR_ValueBoxDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ValueBoxDef::_nil ());
++ IR_ValueBoxDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ValueBoxDef (stub, 0, obj->_servant ()), ValueBoxDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ValueBoxDef (stub, 0, obj->_servant ()), IR_ValueBoxDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ValueBoxDef_ptr,
++ IR_ValueBoxDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ValueBoxDef::_narrow
++ &IR_ValueBoxDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ValueBoxDef_ptr
+-IR::ValueBoxDef::_duplicate (ValueBoxDef_ptr obj)
++IR_ValueBoxDef_ptr
++IR_ValueBoxDef::_duplicate (IR_ValueBoxDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ValueBoxDef:1.0")) ||
+@@ -36928,58 +23464,58 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ValueBoxDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ValueBoxDef)::_narrow))
++ &IR_ValueBoxDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, TypedefDef)::_narrow))
++ &IR_TypedefDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::TypedefDef_ptr,
++ IR_TypedefDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -36992,12 +23528,12 @@
+ return retv;
+ }
+
+-const char* IR::ValueBoxDef::_interface_repository_id (void) const
++const char* IR_ValueBoxDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ValueBoxDef:1.0";
+ }
+
+-IR::IDLType_ptr IR::ValueBoxDef::original_type_def (
++IR_IDLType_ptr IR_ValueBoxDef::original_type_def (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -37011,8 +23547,8 @@
+ );
+ }
+
+-void IR::ValueBoxDef::original_type_def (
+- IR::IDLType_ptr original_type_def,
++void IR_ValueBoxDef::original_type_def (
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -37027,103 +23563,13 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get::result (IR::IDLType_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr original_type_def,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- original_type_def_ (original_type_def)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_original_type_def = this->parameter_list_.length ();
+- this->parameter_list_.length (length_original_type_def + 1);
+- this->parameter_list_[length_original_type_def].argument <<= this->original_type_def_;
+-
+- this->parameter_list_[length_original_type_def].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ValueBoxDef::TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ValueBoxDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x426f7844), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ValueBoxDef:1.0
+- 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65426f78), ACE_NTOHL (0x44656600), // name = ValueBoxDef
++ 12, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65426f78), ACE_NTOHL (0x44656600), // name = IR_ValueBoxDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ValueBoxDef (CORBA::tk_objref, sizeof (_oc_IR_ValueBoxDef), (char *) &_oc_IR_ValueBoxDef, 0, sizeof (IR::ValueBoxDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ValueBoxDef (CORBA::tk_objref, sizeof (_oc_IR_ValueBoxDef), (char *) &_oc_IR_ValueBoxDef, 0, sizeof (IR_ValueBoxDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ValueBoxDef, &_tc_TAO_tc_IR_ValueBoxDef)
+@@ -37133,25 +23579,25 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
++_TAO_ProvidesDef_Proxy_Impl::_TAO_ProvidesDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
++_TAO_ProvidesDef_Remote_Proxy_Impl::_TAO_ProvidesDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::InterfaceDef_ptr IR::_TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
++IR_InterfaceDef_ptr _TAO_ProvidesDef_Remote_Proxy_Impl::interface_type (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+
+- IR::InterfaceDef_ptr _tao_retval = IR::InterfaceDef::_nil ();
+- IR::InterfaceDef_var _tao_safe_retval (_tao_retval);
++ IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
++ IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -37167,46 +23613,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get ri (
+- "_get_interface_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -37215,7 +23636,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -37225,41 +23646,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -37273,32 +23667,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
++_TAO_ProvidesDef_Proxy_Broker::_TAO_ProvidesDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
++_TAO_ProvidesDef_Proxy_Broker::~_TAO_ProvidesDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ProvidesDef_Remote_Proxy_Broker *IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ProvidesDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ProvidesDef_Remote_Proxy_Broker::_TAO_ProvidesDef_Remote_Proxy_Broker (void)
++_TAO_ProvidesDef_Remote_Proxy_Broker::_TAO_ProvidesDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker (void)
++_TAO_ProvidesDef_Remote_Proxy_Broker::~_TAO_ProvidesDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ProvidesDef_Proxy_Impl&
+-IR::_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ProvidesDef *object,
++_TAO_ProvidesDef_Proxy_Impl&
++_TAO_ProvidesDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ProvidesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -37314,110 +23708,110 @@
+
+
+ // default constructor
+-IR::ProvidesDef::ProvidesDef (int collocated)
++IR_ProvidesDef::IR_ProvidesDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ProvidesDef::~ProvidesDef (void)
++IR_ProvidesDef::~IR_ProvidesDef (void)
+ {}
+
+ void
+-IR::ProvidesDef::_tao_setup_collocation (int collocated)
++IR_ProvidesDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ProvidesDef_Proxy_Broker_ =
+- ::IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ProvidesDef_Proxy_Broker_ =
+- ::IR::_TAO_ProvidesDef_Remote_Proxy_Broker::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
++ ::the_TAO_ProvidesDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ProvidesDef::_tao_any_destructor (void *x)
++void IR_ProvidesDef::_tao_any_destructor (void *x)
+ {
+- ProvidesDef *tmp = ACE_static_cast (ProvidesDef*,x);
++ IR_ProvidesDef *tmp = ACE_static_cast (IR_ProvidesDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ProvidesDef_ptr IR::ProvidesDef::_narrow (
++IR_ProvidesDef_ptr IR_ProvidesDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ProvidesDef::_nil ();
++ return IR_ProvidesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ProvidesDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ProvidesDef::_nil ());
++ ACE_CHECK_RETURN (IR_ProvidesDef::_nil ());
+ if (is_a == 0)
+- return ProvidesDef::_nil ();
++ return IR_ProvidesDef::_nil ();
+ }
+- return ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ProvidesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ProvidesDef_ptr IR::ProvidesDef::_unchecked_narrow (
++IR_ProvidesDef_ptr IR_ProvidesDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ProvidesDef::_nil ();
++ return IR_ProvidesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ProvidesDef_ptr default_proxy = ProvidesDef::_nil ();
++ IR_ProvidesDef_ptr default_proxy = IR_ProvidesDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ProvidesDef (
++ ::IR_ProvidesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ProvidesDef::_nil ());
++ IR_ProvidesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ProvidesDef (stub, 0, obj->_servant ()), ProvidesDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ProvidesDef (stub, 0, obj->_servant ()), IR_ProvidesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ProvidesDef_ptr,
++ IR_ProvidesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ProvidesDef::_narrow
++ &IR_ProvidesDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ProvidesDef_ptr
+-IR::ProvidesDef::_duplicate (ProvidesDef_ptr obj)
++IR_ProvidesDef_ptr
++IR_ProvidesDef::_duplicate (IR_ProvidesDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ProvidesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ProvidesDef:1.0")) ||
+@@ -37429,34 +23823,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ProvidesDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ProvidesDef)::_narrow))
++ &IR_ProvidesDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -37469,12 +23863,12 @@
+ return retv;
+ }
+
+-const char* IR::ProvidesDef::_interface_repository_id (void) const
++const char* IR_ProvidesDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ProvidesDef:1.0";
+ }
+
+-IR::InterfaceDef_ptr IR::ProvidesDef::interface_type (
++IR_InterfaceDef_ptr IR_ProvidesDef::interface_type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -37488,62 +23882,18 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ProvidesDef::TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ProvidesDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
+- 12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600), // name = ProvidesDef
++ 12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600), // name = IR_ProvidesDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDef (CORBA::tk_objref, sizeof (_oc_IR_ProvidesDef), (char *) &_oc_IR_ProvidesDef, 0, sizeof (IR::ProvidesDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDef (CORBA::tk_objref, sizeof (_oc_IR_ProvidesDef), (char *) &_oc_IR_ProvidesDef, 0, sizeof (IR_ProvidesDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDef, &_tc_TAO_tc_IR_ProvidesDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ProvidesDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -37591,17 +23941,18 @@
+ 60, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
+- 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = InterfaceDef
++ 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_InterfaceDef
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescription (CORBA::tk_struct, sizeof (_oc_IR_ProvidesDescription), (char *) &_oc_IR_ProvidesDescription, 0, sizeof (IR::ProvidesDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescription (CORBA::tk_struct, sizeof (_oc_IR_ProvidesDescription), (char *) &_oc_IR_ProvidesDescription, 0, sizeof (IR_ProvidesDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescription, &_tc_TAO_tc_IR_ProvidesDescription)
+ TAO_NAMESPACE_END
+-void IR::ProvidesDescription::_tao_any_destructor (void *x)
++
++void IR_ProvidesDescription::_tao_any_destructor (void *x)
+ {
+- ProvidesDescription *tmp = ACE_static_cast (ProvidesDescription*,x);
++ IR_ProvidesDescription *tmp = ACE_static_cast (IR_ProvidesDescription*,x);
+ delete tmp;
+ }
+
+@@ -37610,15 +23961,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
++_TAO_UsesDef_Proxy_Impl::_TAO_UsesDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
++_TAO_UsesDef_Remote_Proxy_Impl::_TAO_UsesDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::InterfaceDef_ptr IR::_TAO_UsesDef_Remote_Proxy_Impl::interface_type (
++IR_InterfaceDef_ptr _TAO_UsesDef_Remote_Proxy_Impl::interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -37627,8 +23978,8 @@
+ ))
+ {
+
+- IR::InterfaceDef_ptr _tao_retval = IR::InterfaceDef::_nil ();
+- IR::InterfaceDef_var _tao_safe_retval (_tao_retval);
++ IR_InterfaceDef_ptr _tao_retval = IR_InterfaceDef::_nil ();
++ IR_InterfaceDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -37644,46 +23995,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get ri (
+- "_get_interface_type",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -37692,7 +24018,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -37702,45 +24028,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::InterfaceDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-CORBA::Boolean IR::_TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
++CORBA::Boolean _TAO_UsesDef_Remote_Proxy_Impl::is_multiple (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -37765,46 +24064,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get ri (
+- "_get_is_multiple",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -37813,7 +24087,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -37823,40 +24097,14 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+@@ -37870,32 +24118,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
++_TAO_UsesDef_Proxy_Broker::_TAO_UsesDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
++_TAO_UsesDef_Proxy_Broker::~_TAO_UsesDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_UsesDef_Remote_Proxy_Broker *IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_UsesDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_Remote_Proxy_Broker (void)
++_TAO_UsesDef_Remote_Proxy_Broker::_TAO_UsesDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
++_TAO_UsesDef_Remote_Proxy_Broker::~_TAO_UsesDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_UsesDef_Proxy_Impl&
+-IR::_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::UsesDef *object,
++_TAO_UsesDef_Proxy_Impl&
++_TAO_UsesDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_UsesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -37911,110 +24159,110 @@
+
+
+ // default constructor
+-IR::UsesDef::UsesDef (int collocated)
++IR_UsesDef::IR_UsesDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::UsesDef::~UsesDef (void)
++IR_UsesDef::~IR_UsesDef (void)
+ {}
+
+ void
+-IR::UsesDef::_tao_setup_collocation (int collocated)
++IR_UsesDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_UsesDef_Proxy_Broker_ =
+- ::IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_UsesDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_UsesDef_Proxy_Broker_ =
+- ::IR::_TAO_UsesDef_Remote_Proxy_Broker::the_TAO_UsesDef_Remote_Proxy_Broker ();
++ ::the_TAO_UsesDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::UsesDef::_tao_any_destructor (void *x)
++void IR_UsesDef::_tao_any_destructor (void *x)
+ {
+- UsesDef *tmp = ACE_static_cast (UsesDef*,x);
++ IR_UsesDef *tmp = ACE_static_cast (IR_UsesDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::UsesDef_ptr IR::UsesDef::_narrow (
++IR_UsesDef_ptr IR_UsesDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return UsesDef::_nil ();
++ return IR_UsesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/UsesDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (UsesDef::_nil ());
++ ACE_CHECK_RETURN (IR_UsesDef::_nil ());
+ if (is_a == 0)
+- return UsesDef::_nil ();
++ return IR_UsesDef::_nil ();
+ }
+- return UsesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_UsesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::UsesDef_ptr IR::UsesDef::_unchecked_narrow (
++IR_UsesDef_ptr IR_UsesDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return UsesDef::_nil ();
++ return IR_UsesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- UsesDef_ptr default_proxy = UsesDef::_nil ();
++ IR_UsesDef_ptr default_proxy = IR_UsesDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_UsesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::UsesDef (
++ ::IR_UsesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- UsesDef::_nil ());
++ IR_UsesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::UsesDef (stub, 0, obj->_servant ()), UsesDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_UsesDef (stub, 0, obj->_servant ()), IR_UsesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- UsesDef_ptr,
++ IR_UsesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &UsesDef::_narrow
++ &IR_UsesDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::UsesDef_ptr
+-IR::UsesDef::_duplicate (UsesDef_ptr obj)
++IR_UsesDef_ptr
++IR_UsesDef::_duplicate (IR_UsesDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_UsesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/UsesDef:1.0")) ||
+@@ -38026,34 +24274,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::UsesDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_UsesDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, UsesDef)::_narrow))
++ &IR_UsesDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -38066,12 +24314,12 @@
+ return retv;
+ }
+
+-const char* IR::UsesDef::_interface_repository_id (void) const
++const char* IR_UsesDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/UsesDef:1.0";
+ }
+
+-IR::InterfaceDef_ptr IR::UsesDef::interface_type (
++IR_InterfaceDef_ptr IR_UsesDef::interface_type (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -38085,7 +24333,7 @@
+ );
+ }
+
+-CORBA::Boolean IR::UsesDef::is_multiple (
++CORBA::Boolean IR_UsesDef::is_multiple (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -38099,105 +24347,18 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_interface_type_get::result (IR::InterfaceDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::UsesDef::TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_UsesDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UsesDef:1.0
+- 8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600), // name = UsesDef
++ 8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600), // name = IR_UsesDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_UsesDef (CORBA::tk_objref, sizeof (_oc_IR_UsesDef), (char *) &_oc_IR_UsesDef, 0, sizeof (IR::UsesDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_UsesDef (CORBA::tk_objref, sizeof (_oc_IR_UsesDef), (char *) &_oc_IR_UsesDef, 0, sizeof (IR_UsesDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDef, &_tc_TAO_tc_IR_UsesDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_UsesDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -38245,38 +24406,35 @@
+ 60, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
+- 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = InterfaceDef
++ 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_InterfaceDef
+
+ 12, ACE_NTOHL (0x69735f6d), ACE_NTOHL (0x756c7469), ACE_NTOHL (0x706c6500), // name = is_multiple
+ CORBA::tk_boolean,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescription (CORBA::tk_struct, sizeof (_oc_IR_UsesDescription), (char *) &_oc_IR_UsesDescription, 0, sizeof (IR::UsesDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescription (CORBA::tk_struct, sizeof (_oc_IR_UsesDescription), (char *) &_oc_IR_UsesDescription, 0, sizeof (IR_UsesDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescription, &_tc_TAO_tc_IR_UsesDescription)
+ TAO_NAMESPACE_END
+-void IR::UsesDescription::_tao_any_destructor (void *x)
++
++void IR_UsesDescription::_tao_any_destructor (void *x)
+ {
+- UsesDescription *tmp = ACE_static_cast (UsesDescription*,x);
++ IR_UsesDescription *tmp = ACE_static_cast (IR_UsesDescription*,x);
+ delete tmp;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::ProvidesDescription* tmp = 0;
++ IR_ProvidesDescription* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::ProvidesDescription *old = ACE_reinterpret_cast (IR::ProvidesDescription *,this->buffer_);
++ IR_ProvidesDescription *old = ACE_reinterpret_cast (IR_ProvidesDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -38289,75 +24447,65 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::ProvidesDescription *tmp = ACE_reinterpret_cast (IR::ProvidesDescription *,this->buffer_);
++ IR_ProvidesDescription *tmp = ACE_reinterpret_cast (IR_ProvidesDescription *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PROVIDESDESCSEQ_CS_)
+-#define _TAO_IR_PROVIDESDESCSEQ_CS_
+-
+ // *************************************************************
+-// IR::ProvidesDescSeq
++// IR_ProvidesDescSeq
+ // *************************************************************
+
+-IR::ProvidesDescSeq::ProvidesDescSeq (void)
++IR_ProvidesDescSeq::IR_ProvidesDescSeq (void)
+ {}
+-IR::ProvidesDescSeq::ProvidesDescSeq (CORBA::ULong max) // uses max size
++IR_ProvidesDescSeq::IR_ProvidesDescSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ProvidesDescription>
++ TAO_Unbounded_Sequence<IR_ProvidesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::ProvidesDescSeq::ProvidesDescSeq (CORBA::ULong max, CORBA::ULong length, IR::ProvidesDescription *buffer, CORBA::Boolean release)
++IR_ProvidesDescSeq::IR_ProvidesDescSeq (CORBA::ULong max, CORBA::ULong length, IR_ProvidesDescription *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ProvidesDescription>
++ TAO_Unbounded_Sequence<IR_ProvidesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::ProvidesDescSeq::ProvidesDescSeq (const ProvidesDescSeq &seq) // copy ctor
++IR_ProvidesDescSeq::IR_ProvidesDescSeq (const IR_ProvidesDescSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::ProvidesDescription>
++ TAO_Unbounded_Sequence<IR_ProvidesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::ProvidesDescSeq::~ProvidesDescSeq (void) // dtor
++IR_ProvidesDescSeq::~IR_ProvidesDescSeq (void) // dtor
+ {}
+-void IR::ProvidesDescSeq::_tao_any_destructor (void *x)
++void IR_ProvidesDescSeq::_tao_any_destructor (void *x)
+ {
+- ProvidesDescSeq *tmp = ACE_static_cast (ProvidesDescSeq*,x);
++ IR_ProvidesDescSeq *tmp = ACE_static_cast (IR_ProvidesDescSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_ProvidesDescSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -38413,13 +24561,13 @@
+ 60, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
+- 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = InterfaceDef
++ 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_InterfaceDef
+
+
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_ProvidesDescSeq), (char *) &_oc_IR_ProvidesDescSeq, 0, sizeof (IR::ProvidesDescSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_ProvidesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_ProvidesDescSeq), (char *) &_oc_IR_ProvidesDescSeq, 0, sizeof (IR_ProvidesDescSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ProvidesDescSeq, &_tc_TAO_tc_IR_ProvidesDescSeq)
+@@ -38427,18 +24575,15 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CS_
+-
+ void
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_allocate_buffer (CORBA::ULong length)
++ _TAO_Unbounded_Sequence_IR_UsesDescSeq::_allocate_buffer (CORBA::ULong length)
+ {
+- IR::UsesDescription* tmp = 0;
++ IR_UsesDescription* tmp = 0;
+ tmp = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (length);
+
+ if (this->buffer_ != 0)
+ {
+- IR::UsesDescription *old = ACE_reinterpret_cast (IR::UsesDescription *,this->buffer_);
++ IR_UsesDescription *old = ACE_reinterpret_cast (IR_UsesDescription *,this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp[i] = old[i];
+@@ -38451,75 +24596,65 @@
+ }
+
+ void
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
++ _TAO_Unbounded_Sequence_IR_UsesDescSeq::_deallocate_buffer (void)
+ {
+ if (this->buffer_ == 0 || this->release_ == 0)
+ return;
+
+- IR::UsesDescription *tmp = ACE_reinterpret_cast (IR::UsesDescription *,this->buffer_);
++ IR_UsesDescription *tmp = ACE_reinterpret_cast (IR_UsesDescription *,this->buffer_);
+
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+ this->buffer_ = 0;
+ }
+
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Dtor.
++ _TAO_Unbounded_Sequence_IR_UsesDescSeq::~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Dtor.
+ {
+ this->_deallocate_buffer ();
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_USESDESCSEQ_CS_)
+-#define _TAO_IR_USESDESCSEQ_CS_
+-
+ // *************************************************************
+-// IR::UsesDescSeq
++// IR_UsesDescSeq
+ // *************************************************************
+
+-IR::UsesDescSeq::UsesDescSeq (void)
++IR_UsesDescSeq::IR_UsesDescSeq (void)
+ {}
+-IR::UsesDescSeq::UsesDescSeq (CORBA::ULong max) // uses max size
++IR_UsesDescSeq::IR_UsesDescSeq (CORBA::ULong max) // uses max size
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::UsesDescription>
++ TAO_Unbounded_Sequence<IR_UsesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max)
+ {}
+-IR::UsesDescSeq::UsesDescSeq (CORBA::ULong max, CORBA::ULong length, IR::UsesDescription *buffer, CORBA::Boolean release)
++IR_UsesDescSeq::IR_UsesDescSeq (CORBA::ULong max, CORBA::ULong length, IR_UsesDescription *buffer, CORBA::Boolean release)
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::UsesDescription>
++ TAO_Unbounded_Sequence<IR_UsesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (max, length, buffer, release)
+ {}
+-IR::UsesDescSeq::UsesDescSeq (const UsesDescSeq &seq) // copy ctor
++IR_UsesDescSeq::IR_UsesDescSeq (const IR_UsesDescSeq &seq) // copy ctor
+ :
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<IR::UsesDescription>
++ TAO_Unbounded_Sequence<IR_UsesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ (seq)
+ {}
+-IR::UsesDescSeq::~UsesDescSeq (void) // dtor
++IR_UsesDescSeq::~IR_UsesDescSeq (void) // dtor
+ {}
+-void IR::UsesDescSeq::_tao_any_destructor (void *x)
++void IR_UsesDescSeq::_tao_any_destructor (void *x)
+ {
+- UsesDescSeq *tmp = ACE_static_cast (UsesDescSeq*,x);
++ IR_UsesDescSeq *tmp = ACE_static_cast (IR_UsesDescSeq*,x);
+ delete tmp;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ static const CORBA::Long _oc_IR_UsesDescSeq[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -38575,7 +24710,7 @@
+ 60, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x6e746572), ACE_NTOHL (0x66616365), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/InterfaceDef:1.0
+- 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = InterfaceDef
++ 13, ACE_NTOHL (0x496e7465), ACE_NTOHL (0x72666163), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_InterfaceDef
+
+ 12, ACE_NTOHL (0x69735f6d), ACE_NTOHL (0x756c7469), ACE_NTOHL (0x706c6500), // name = is_multiple
+ CORBA::tk_boolean,
+@@ -38584,7 +24719,7 @@
+ 0U,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDescSeq), (char *) &_oc_IR_UsesDescSeq, 0, sizeof (IR::UsesDescSeq));
++static CORBA::TypeCode _tc_TAO_tc_IR_UsesDescSeq (CORBA::tk_alias, sizeof (_oc_IR_UsesDescSeq), (char *) &_oc_IR_UsesDescSeq, 0, sizeof (IR_UsesDescSeq));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
+@@ -38594,15 +24729,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
++_TAO_EventDef_Proxy_Impl::_TAO_EventDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
++_TAO_EventDef_Remote_Proxy_Impl::_TAO_EventDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::Boolean IR::_TAO_EventDef_Remote_Proxy_Impl::is_a (
++CORBA::Boolean _TAO_EventDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * event_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -38628,57 +24763,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a ri (
+- "is_a",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- event_id,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << event_id)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ _tao_retval
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -38687,7 +24796,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -38697,44 +24806,18 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-IR::ValueDef_ptr IR::_TAO_EventDef_Remote_Proxy_Impl::event (
++IR_ValueDef_ptr _TAO_EventDef_Remote_Proxy_Impl::event (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -38743,8 +24826,8 @@
+ ))
+ {
+
+- IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
+- IR::ValueDef_var _tao_safe_retval (_tao_retval);
++ IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
++ IR_ValueDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -38760,46 +24843,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get ri (
+- "_get_event",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -38808,7 +24866,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -38818,41 +24876,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -38866,32 +24897,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
++_TAO_EventDef_Proxy_Broker::_TAO_EventDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
++_TAO_EventDef_Proxy_Broker::~_TAO_EventDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_EventDef_Remote_Proxy_Broker *IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_EventDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_EventDef_Remote_Proxy_Broker::_TAO_EventDef_Remote_Proxy_Broker (void)
++_TAO_EventDef_Remote_Proxy_Broker::_TAO_EventDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
++_TAO_EventDef_Remote_Proxy_Broker::~_TAO_EventDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EventDef_Proxy_Impl&
+-IR::_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::EventDef *object,
++_TAO_EventDef_Proxy_Impl&
++_TAO_EventDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_EventDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -38907,110 +24938,110 @@
+
+
+ // default constructor
+-IR::EventDef::EventDef (int collocated)
++IR_EventDef::IR_EventDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::EventDef::~EventDef (void)
++IR_EventDef::~IR_EventDef (void)
+ {}
+
+ void
+-IR::EventDef::_tao_setup_collocation (int collocated)
++IR_EventDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_EventDef_Proxy_Broker_ =
+- ::IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_EventDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_EventDef_Proxy_Broker_ =
+- ::IR::_TAO_EventDef_Remote_Proxy_Broker::the_TAO_EventDef_Remote_Proxy_Broker ();
++ ::the_TAO_EventDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::EventDef::_tao_any_destructor (void *x)
++void IR_EventDef::_tao_any_destructor (void *x)
+ {
+- EventDef *tmp = ACE_static_cast (EventDef*,x);
++ IR_EventDef *tmp = ACE_static_cast (IR_EventDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::EventDef_ptr IR::EventDef::_narrow (
++IR_EventDef_ptr IR_EventDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return EventDef::_nil ();
++ return IR_EventDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EventDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (EventDef::_nil ());
++ ACE_CHECK_RETURN (IR_EventDef::_nil ());
+ if (is_a == 0)
+- return EventDef::_nil ();
++ return IR_EventDef::_nil ();
+ }
+- return EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_EventDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::EventDef_ptr IR::EventDef::_unchecked_narrow (
++IR_EventDef_ptr IR_EventDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return EventDef::_nil ();
++ return IR_EventDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- EventDef_ptr default_proxy = EventDef::_nil ();
++ IR_EventDef_ptr default_proxy = IR_EventDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_EventDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::EventDef (
++ ::IR_EventDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- EventDef::_nil ());
++ IR_EventDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::EventDef (stub, 0, obj->_servant ()), EventDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_EventDef (stub, 0, obj->_servant ()), IR_EventDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- EventDef_ptr,
++ IR_EventDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &EventDef::_narrow
++ &IR_EventDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::EventDef_ptr
+-IR::EventDef::_duplicate (EventDef_ptr obj)
++IR_EventDef_ptr
++IR_EventDef::_duplicate (IR_EventDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::EventDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_EventDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EventDef:1.0")) ||
+@@ -39022,34 +25053,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::EventDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_EventDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
++ &IR_EventDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -39062,12 +25093,12 @@
+ return retv;
+ }
+
+-const char* IR::EventDef::_interface_repository_id (void) const
++const char* IR_EventDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/EventDef:1.0";
+ }
+
+-CORBA::Boolean IR::EventDef::is_a (
++CORBA::Boolean IR_EventDef::is_a (
+ const char * event_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -39083,7 +25114,7 @@
+ );
+ }
+
+-IR::ValueDef_ptr IR::EventDef::event (
++IR_ValueDef_ptr IR_EventDef::event (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -39097,112 +25128,18 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::TAO_ClientRequestInfo_IR_EventDef_is_a (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * event_id,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- event_id_ (event_id)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_event_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_event_id + 1);
+- this->parameter_list_[length_event_id].argument <<= event_id_;
+- this->parameter_list_[length_event_id].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_is_a::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::TAO_ClientRequestInfo_IR_EventDef_event_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::EventDef::TAO_ClientRequestInfo_IR_EventDef_event_get::result (IR::ValueDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_EventDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x76656e74), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/EventDef:1.0
+- 9, ACE_NTOHL (0x4576656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0), // name = EventDef
++ 9, ACE_NTOHL (0x4576656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0), // name = IR_EventDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_EventDef (CORBA::tk_objref, sizeof (_oc_IR_EventDef), (char *) &_oc_IR_EventDef, 0, sizeof (IR::EventDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_EventDef (CORBA::tk_objref, sizeof (_oc_IR_EventDef), (char *) &_oc_IR_EventDef, 0, sizeof (IR_EventDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EventDef, &_tc_TAO_tc_IR_EventDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_EventDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -39250,17 +25187,18 @@
+ 52, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ValueDef:1.0
+- 9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = ValueDef
++ 9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_ValueDef
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_EventDescription (CORBA::tk_struct, sizeof (_oc_IR_EventDescription), (char *) &_oc_IR_EventDescription, 0, sizeof (IR::EventDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_EventDescription (CORBA::tk_struct, sizeof (_oc_IR_EventDescription), (char *) &_oc_IR_EventDescription, 0, sizeof (IR_EventDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EventDescription, &_tc_TAO_tc_IR_EventDescription)
+ TAO_NAMESPACE_END
+-void IR::EventDescription::_tao_any_destructor (void *x)
++
++void IR_EventDescription::_tao_any_destructor (void *x)
+ {
+- EventDescription *tmp = ACE_static_cast (EventDescription*,x);
++ IR_EventDescription *tmp = ACE_static_cast (IR_EventDescription*,x);
+ delete tmp;
+ }
+
+@@ -39269,10 +25207,10 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
++_TAO_EmitsDef_Proxy_Impl::_TAO_EmitsDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
++_TAO_EmitsDef_Remote_Proxy_Impl::_TAO_EmitsDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -39287,32 +25225,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
++_TAO_EmitsDef_Proxy_Broker::_TAO_EmitsDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
++_TAO_EmitsDef_Proxy_Broker::~_TAO_EmitsDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_EmitsDef_Remote_Proxy_Broker *IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_EmitsDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_EmitsDef_Remote_Proxy_Broker::_TAO_EmitsDef_Remote_Proxy_Broker (void)
++_TAO_EmitsDef_Remote_Proxy_Broker::_TAO_EmitsDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
++_TAO_EmitsDef_Remote_Proxy_Broker::~_TAO_EmitsDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_EmitsDef_Proxy_Impl&
+-IR::_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::EmitsDef *object,
++_TAO_EmitsDef_Proxy_Impl&
++_TAO_EmitsDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_EmitsDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -39328,110 +25266,110 @@
+
+
+ // default constructor
+-IR::EmitsDef::EmitsDef (int collocated)
++IR_EmitsDef::IR_EmitsDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::EmitsDef::~EmitsDef (void)
++IR_EmitsDef::~IR_EmitsDef (void)
+ {}
+
+ void
+-IR::EmitsDef::_tao_setup_collocation (int collocated)
++IR_EmitsDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_EmitsDef_Proxy_Broker_ =
+- ::IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_EmitsDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_EmitsDef_Proxy_Broker_ =
+- ::IR::_TAO_EmitsDef_Remote_Proxy_Broker::the_TAO_EmitsDef_Remote_Proxy_Broker ();
++ ::the_TAO_EmitsDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,EventDef)::_tao_setup_collocation (collocated);
++ IR_EventDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::EmitsDef::_tao_any_destructor (void *x)
++void IR_EmitsDef::_tao_any_destructor (void *x)
+ {
+- EmitsDef *tmp = ACE_static_cast (EmitsDef*,x);
++ IR_EmitsDef *tmp = ACE_static_cast (IR_EmitsDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::EmitsDef_ptr IR::EmitsDef::_narrow (
++IR_EmitsDef_ptr IR_EmitsDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return EmitsDef::_nil ();
++ return IR_EmitsDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/EmitsDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (EmitsDef::_nil ());
++ ACE_CHECK_RETURN (IR_EmitsDef::_nil ());
+ if (is_a == 0)
+- return EmitsDef::_nil ();
++ return IR_EmitsDef::_nil ();
+ }
+- return EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_EmitsDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::EmitsDef_ptr IR::EmitsDef::_unchecked_narrow (
++IR_EmitsDef_ptr IR_EmitsDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return EmitsDef::_nil ();
++ return IR_EmitsDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- EmitsDef_ptr default_proxy = EmitsDef::_nil ();
++ IR_EmitsDef_ptr default_proxy = IR_EmitsDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::EmitsDef (
++ ::IR_EmitsDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- EmitsDef::_nil ());
++ IR_EmitsDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::EmitsDef (stub, 0, obj->_servant ()), EmitsDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_EmitsDef (stub, 0, obj->_servant ()), IR_EmitsDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- EmitsDef_ptr,
++ IR_EmitsDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &EmitsDef::_narrow
++ &IR_EmitsDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::EmitsDef_ptr
+-IR::EmitsDef::_duplicate (EmitsDef_ptr obj)
++IR_EmitsDef_ptr
++IR_EmitsDef::_duplicate (IR_EmitsDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::EmitsDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_EmitsDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/EmitsDef:1.0")) ||
+@@ -39444,46 +25382,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::EmitsDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_EmitsDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, EmitsDef)::_narrow))
++ &IR_EmitsDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
++ &IR_EventDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::EventDef_ptr,
++ IR_EventDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -39496,21 +25434,18 @@
+ return retv;
+ }
+
+-const char* IR::EmitsDef::_interface_repository_id (void) const
++const char* IR_EmitsDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/EmitsDef:1.0";
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_EmitsDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/EmitsDef:1.0
+- 9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = EmitsDef
++ 9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_EmitsDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDef (CORBA::tk_objref, sizeof (_oc_IR_EmitsDef), (char *) &_oc_IR_EmitsDef, 0, sizeof (IR::EmitsDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_EmitsDef (CORBA::tk_objref, sizeof (_oc_IR_EmitsDef), (char *) &_oc_IR_EmitsDef, 0, sizeof (IR_EmitsDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
+@@ -39520,10 +25455,10 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
++_TAO_PublishesDef_Proxy_Impl::_TAO_PublishesDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
++_TAO_PublishesDef_Remote_Proxy_Impl::_TAO_PublishesDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -39538,32 +25473,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
++_TAO_PublishesDef_Proxy_Broker::_TAO_PublishesDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
++_TAO_PublishesDef_Proxy_Broker::~_TAO_PublishesDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_PublishesDef_Remote_Proxy_Broker *IR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_PublishesDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
++_TAO_PublishesDef_Remote_Proxy_Broker::_TAO_PublishesDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
++_TAO_PublishesDef_Remote_Proxy_Broker::~_TAO_PublishesDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PublishesDef_Proxy_Impl&
+-IR::_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::PublishesDef *object,
++_TAO_PublishesDef_Proxy_Impl&
++_TAO_PublishesDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_PublishesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -39579,110 +25514,110 @@
+
+
+ // default constructor
+-IR::PublishesDef::PublishesDef (int collocated)
++IR_PublishesDef::IR_PublishesDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::PublishesDef::~PublishesDef (void)
++IR_PublishesDef::~IR_PublishesDef (void)
+ {}
+
+ void
+-IR::PublishesDef::_tao_setup_collocation (int collocated)
++IR_PublishesDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_PublishesDef_Proxy_Broker_ =
+- ::IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_PublishesDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_PublishesDef_Proxy_Broker_ =
+- ::IR::_TAO_PublishesDef_Remote_Proxy_Broker::the_TAO_PublishesDef_Remote_Proxy_Broker ();
++ ::the_TAO_PublishesDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,EventDef)::_tao_setup_collocation (collocated);
++ IR_EventDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::PublishesDef::_tao_any_destructor (void *x)
++void IR_PublishesDef::_tao_any_destructor (void *x)
+ {
+- PublishesDef *tmp = ACE_static_cast (PublishesDef*,x);
++ IR_PublishesDef *tmp = ACE_static_cast (IR_PublishesDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::PublishesDef_ptr IR::PublishesDef::_narrow (
++IR_PublishesDef_ptr IR_PublishesDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return PublishesDef::_nil ();
++ return IR_PublishesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PublishesDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (PublishesDef::_nil ());
++ ACE_CHECK_RETURN (IR_PublishesDef::_nil ());
+ if (is_a == 0)
+- return PublishesDef::_nil ();
++ return IR_PublishesDef::_nil ();
+ }
+- return PublishesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_PublishesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::PublishesDef_ptr IR::PublishesDef::_unchecked_narrow (
++IR_PublishesDef_ptr IR_PublishesDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return PublishesDef::_nil ();
++ return IR_PublishesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- PublishesDef_ptr default_proxy = PublishesDef::_nil ();
++ IR_PublishesDef_ptr default_proxy = IR_PublishesDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::PublishesDef (
++ ::IR_PublishesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- PublishesDef::_nil ());
++ IR_PublishesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::PublishesDef (stub, 0, obj->_servant ()), PublishesDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_PublishesDef (stub, 0, obj->_servant ()), IR_PublishesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- PublishesDef_ptr,
++ IR_PublishesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &PublishesDef::_narrow
++ &IR_PublishesDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::PublishesDef_ptr
+-IR::PublishesDef::_duplicate (PublishesDef_ptr obj)
++IR_PublishesDef_ptr
++IR_PublishesDef::_duplicate (IR_PublishesDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::PublishesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_PublishesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PublishesDef:1.0")) ||
+@@ -39695,46 +25630,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::PublishesDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_PublishesDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, PublishesDef)::_narrow))
++ &IR_PublishesDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
++ &IR_EventDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::EventDef_ptr,
++ IR_EventDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -39747,21 +25682,18 @@
+ return retv;
+ }
+
+-const char* IR::PublishesDef::_interface_repository_id (void) const
++const char* IR_PublishesDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/PublishesDef:1.0";
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_PublishesDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/PublishesDef:1.0
+- 13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = PublishesDef
++ 13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_PublishesDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDef (CORBA::tk_objref, sizeof (_oc_IR_PublishesDef), (char *) &_oc_IR_PublishesDef, 0, sizeof (IR::PublishesDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_PublishesDef (CORBA::tk_objref, sizeof (_oc_IR_PublishesDef), (char *) &_oc_IR_PublishesDef, 0, sizeof (IR_PublishesDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
+@@ -39771,10 +25703,10 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
++_TAO_ConsumesDef_Proxy_Impl::_TAO_ConsumesDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void)
++_TAO_ConsumesDef_Remote_Proxy_Impl::_TAO_ConsumesDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -39789,32 +25721,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
++_TAO_ConsumesDef_Proxy_Broker::_TAO_ConsumesDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
++_TAO_ConsumesDef_Proxy_Broker::~_TAO_ConsumesDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ConsumesDef_Remote_Proxy_Broker *IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ConsumesDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ConsumesDef_Remote_Proxy_Broker::_TAO_ConsumesDef_Remote_Proxy_Broker (void)
++_TAO_ConsumesDef_Remote_Proxy_Broker::_TAO_ConsumesDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker (void)
++_TAO_ConsumesDef_Remote_Proxy_Broker::~_TAO_ConsumesDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ConsumesDef_Proxy_Impl&
+-IR::_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ConsumesDef *object,
++_TAO_ConsumesDef_Proxy_Impl&
++_TAO_ConsumesDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ConsumesDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -39830,110 +25762,110 @@
+
+
+ // default constructor
+-IR::ConsumesDef::ConsumesDef (int collocated)
++IR_ConsumesDef::IR_ConsumesDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ConsumesDef::~ConsumesDef (void)
++IR_ConsumesDef::~IR_ConsumesDef (void)
+ {}
+
+ void
+-IR::ConsumesDef::_tao_setup_collocation (int collocated)
++IR_ConsumesDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ConsumesDef_Proxy_Broker_ =
+- ::IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ConsumesDef_Proxy_Broker_ =
+- ::IR::_TAO_ConsumesDef_Remote_Proxy_Broker::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
++ ::the_TAO_ConsumesDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,EventDef)::_tao_setup_collocation (collocated);
++ IR_EventDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ConsumesDef::_tao_any_destructor (void *x)
++void IR_ConsumesDef::_tao_any_destructor (void *x)
+ {
+- ConsumesDef *tmp = ACE_static_cast (ConsumesDef*,x);
++ IR_ConsumesDef *tmp = ACE_static_cast (IR_ConsumesDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ConsumesDef_ptr IR::ConsumesDef::_narrow (
++IR_ConsumesDef_ptr IR_ConsumesDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ConsumesDef::_nil ();
++ return IR_ConsumesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ConsumesDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ConsumesDef::_nil ());
++ ACE_CHECK_RETURN (IR_ConsumesDef::_nil ());
+ if (is_a == 0)
+- return ConsumesDef::_nil ();
++ return IR_ConsumesDef::_nil ();
+ }
+- return ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ConsumesDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ConsumesDef_ptr IR::ConsumesDef::_unchecked_narrow (
++IR_ConsumesDef_ptr IR_ConsumesDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ConsumesDef::_nil ();
++ return IR_ConsumesDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ConsumesDef_ptr default_proxy = ConsumesDef::_nil ();
++ IR_ConsumesDef_ptr default_proxy = IR_ConsumesDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ConsumesDef (
++ ::IR_ConsumesDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ConsumesDef::_nil ());
++ IR_ConsumesDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ConsumesDef (stub, 0, obj->_servant ()), ConsumesDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ConsumesDef (stub, 0, obj->_servant ()), IR_ConsumesDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ConsumesDef_ptr,
++ IR_ConsumesDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ConsumesDef::_narrow
++ &IR_ConsumesDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ConsumesDef_ptr
+-IR::ConsumesDef::_duplicate (ConsumesDef_ptr obj)
++IR_ConsumesDef_ptr
++IR_ConsumesDef::_duplicate (IR_ConsumesDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ConsumesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ConsumesDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ConsumesDef:1.0")) ||
+@@ -39946,46 +25878,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ConsumesDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ConsumesDef)::_narrow))
++ &IR_ConsumesDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, EventDef)::_narrow))
++ &IR_EventDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::EventDef_ptr,
++ IR_EventDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -39998,21 +25930,18 @@
+ return retv;
+ }
+
+-const char* IR::ConsumesDef::_interface_repository_id (void) const
++const char* IR_ConsumesDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ConsumesDef:1.0";
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ConsumesDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
+- 12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600), // name = ConsumesDef
++ 12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600), // name = IR_ConsumesDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDef (CORBA::tk_objref, sizeof (_oc_IR_ConsumesDef), (char *) &_oc_IR_ConsumesDef, 0, sizeof (IR::ConsumesDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ConsumesDef (CORBA::tk_objref, sizeof (_oc_IR_ConsumesDef), (char *) &_oc_IR_ConsumesDef, 0, sizeof (IR_ConsumesDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDef, &_tc_TAO_tc_IR_ConsumesDef)
+@@ -40022,15 +25951,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
++_TAO_ComponentDef_Proxy_Impl::_TAO_ComponentDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (void)
++_TAO_ComponentDef_Remote_Proxy_Impl::_TAO_ComponentDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::InterfaceDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
++IR_InterfaceDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -40039,7 +25968,7 @@
+ ))
+ {
+
+- IR::InterfaceDefSeq *_tao_retval = 0;
++ IR_InterfaceDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -40047,8 +25976,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::InterfaceDefSeq, _tao_retval);
+- IR::InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_InterfaceDefSeq, _tao_retval);
++ IR_InterfaceDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_supported_interfaces",
+@@ -40057,46 +25986,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
+- "_get_supported_interfaces",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -40105,7 +26009,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -40115,57 +26019,26 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::InterfaceDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-void IR::_TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
++void _TAO_ComponentDef_Remote_Proxy_Impl::supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & supported_interfaces,
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ))
+ {
+-
+-
+-
+-
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+ if (istub == 0)
+ ACE_THROW (CORBA::INTERNAL ());
+@@ -40179,56 +26052,30 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set ri (
+- "_set_supported_interfaces",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- supported_interfaces,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK;
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << supported_interfaces)
+ ))
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::MARSHAL ()
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK;
++ ACE_CHECK;
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -40237,39 +26084,16 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW (
++ ACE_THROW (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES)
+ );
+ }
+
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK;
+ break;
+ }
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK;
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ }
+
+-IR::ComponentDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::base_component (
++IR_ComponentDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::base_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -40278,8 +26102,8 @@
+ ))
+ {
+
+- IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
+- IR::ComponentDef_var _tao_safe_retval (_tao_retval);
++ IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
++ IR_ComponentDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -40295,46 +26119,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get ri (
+- "_get_base_component",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -40343,7 +26142,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -40353,45 +26152,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ProvidesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
++IR_ProvidesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::provides_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -40400,7 +26172,7 @@
+ ))
+ {
+
+- IR::ProvidesDefSeq *_tao_retval = 0;
++ IR_ProvidesDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -40408,56 +26180,31 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::ProvidesDefSeq, _tao_retval);
+- IR::ProvidesDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_ProvidesDefSeq, _tao_retval);
++ IR_ProvidesDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_provides_interfaces",
+ 24,
+- 0,
+- istub->orb_core ()
+- );
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
+- "_get_provides_interfaces",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
++ 0,
++ istub->orb_core ()
+ );
+- ACE_CHECK_RETURN (0);
+
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -40466,7 +26213,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -40476,45 +26223,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ProvidesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::UsesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
++IR_UsesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::uses_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -40523,7 +26243,7 @@
+ ))
+ {
+
+- IR::UsesDefSeq *_tao_retval = 0;
++ IR_UsesDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -40531,8 +26251,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::UsesDefSeq, _tao_retval);
+- IR::UsesDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_UsesDefSeq, _tao_retval);
++ IR_UsesDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_uses_interfaces",
+@@ -40541,46 +26261,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
+- "_get_uses_interfaces",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -40589,7 +26284,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -40599,45 +26294,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::UsesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::EmitsDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
++IR_EmitsDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::emits_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -40646,7 +26314,7 @@
+ ))
+ {
+
+- IR::EmitsDefSeq *_tao_retval = 0;
++ IR_EmitsDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -40654,8 +26322,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::EmitsDefSeq, _tao_retval);
+- IR::EmitsDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_EmitsDefSeq, _tao_retval);
++ IR_EmitsDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_emits_events",
+@@ -40664,46 +26332,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get ri (
+- "_get_emits_events",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -40712,7 +26355,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -40722,45 +26365,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::EmitsDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::PublishesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
++IR_PublishesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::publishes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -40769,7 +26385,7 @@
+ ))
+ {
+
+- IR::PublishesDefSeq *_tao_retval = 0;
++ IR_PublishesDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -40777,8 +26393,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::PublishesDefSeq, _tao_retval);
+- IR::PublishesDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_PublishesDefSeq, _tao_retval);
++ IR_PublishesDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_publishes_events",
+@@ -40787,46 +26403,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get ri (
+- "_get_publishes_events",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -40835,7 +26426,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -40845,45 +26436,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::PublishesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ConsumesDefSeq * IR::_TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
++IR_ConsumesDefSeq * _TAO_ComponentDef_Remote_Proxy_Impl::consumes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -40892,7 +26456,7 @@
+ ))
+ {
+
+- IR::ConsumesDefSeq *_tao_retval = 0;
++ IR_ConsumesDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -40900,8 +26464,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::ConsumesDefSeq, _tao_retval);
+- IR::ConsumesDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_ConsumesDefSeq, _tao_retval);
++ IR_ConsumesDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_consumes_events",
+@@ -40910,46 +26474,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get ri (
+- "_get_consumes_events",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -40958,7 +26497,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -40968,45 +26507,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ConsumesDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-CORBA::Boolean IR::_TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
++CORBA::Boolean _TAO_ComponentDef_Remote_Proxy_Impl::is_basic (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -41031,46 +26543,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get ri (
+- "_get_is_basic",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -41079,7 +26566,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -41089,49 +26576,23 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-IR::ProvidesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
++IR_ProvidesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_provides (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41139,8 +26600,8 @@
+ ))
+ {
+
+- IR::ProvidesDef_ptr _tao_retval = IR::ProvidesDef::_nil ();
+- IR::ProvidesDef_var _tao_safe_retval (_tao_retval);
++ IR_ProvidesDef_ptr _tao_retval = IR_ProvidesDef::_nil ();
++ IR_ProvidesDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -41156,47 +26617,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides ri (
+- "create_provides",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- interface_type,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -41205,14 +26637,14 @@
+ (_tao_out << version) &&
+ (_tao_out << interface_type)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -41221,7 +26653,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -41231,50 +26663,23 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ProvidesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::UsesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
++IR_UsesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_uses (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -41283,8 +26688,8 @@
+ ))
+ {
+
+- IR::UsesDef_ptr _tao_retval = IR::UsesDef::_nil ();
+- IR::UsesDef_var _tao_safe_retval (_tao_retval);
++ IR_UsesDef_ptr _tao_retval = IR_UsesDef::_nil ();
++ IR_UsesDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -41300,48 +26705,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses ri (
+- "create_uses",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- interface_type,
+- is_multiple,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -41351,14 +26726,14 @@
+ (_tao_out << interface_type) &&
+ (_tao_out << CORBA::Any::from_boolean (is_multiple))
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -41367,7 +26742,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -41377,50 +26752,23 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::UsesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::EmitsDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
++IR_EmitsDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_emits (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41428,8 +26776,8 @@
+ ))
+ {
+
+- IR::EmitsDef_ptr _tao_retval = IR::EmitsDef::_nil ();
+- IR::EmitsDef_var _tao_safe_retval (_tao_retval);
++ IR_EmitsDef_ptr _tao_retval = IR_EmitsDef::_nil ();
++ IR_EmitsDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -41445,47 +26793,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits ri (
+- "create_emits",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- value,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -41494,14 +26813,14 @@
+ (_tao_out << version) &&
+ (_tao_out << value)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -41510,7 +26829,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -41520,50 +26839,23 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::EmitsDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::PublishesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
++IR_PublishesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_publishes (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41571,8 +26863,8 @@
+ ))
+ {
+
+- IR::PublishesDef_ptr _tao_retval = IR::PublishesDef::_nil ();
+- IR::PublishesDef_var _tao_safe_retval (_tao_retval);
++ IR_PublishesDef_ptr _tao_retval = IR_PublishesDef::_nil ();
++ IR_PublishesDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -41588,47 +26880,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes ri (
+- "create_publishes",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- value,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -41637,14 +26900,14 @@
+ (_tao_out << version) &&
+ (_tao_out << value)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -41653,7 +26916,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -41663,50 +26926,23 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::PublishesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ConsumesDef_ptr IR::_TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
++IR_ConsumesDef_ptr _TAO_ComponentDef_Remote_Proxy_Impl::create_consumes (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -41714,8 +26950,8 @@
+ ))
+ {
+
+- IR::ConsumesDef_ptr _tao_retval = IR::ConsumesDef::_nil ();
+- IR::ConsumesDef_var _tao_safe_retval (_tao_retval);
++ IR_ConsumesDef_ptr _tao_retval = IR_ConsumesDef::_nil ();
++ IR_ConsumesDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -41731,47 +26967,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes ri (
+- "create_consumes",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- value,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -41780,14 +26987,14 @@
+ (_tao_out << version) &&
+ (_tao_out << value)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -41796,7 +27003,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -41806,41 +27013,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ConsumesDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -41854,32 +27034,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
++_TAO_ComponentDef_Proxy_Broker::_TAO_ComponentDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
++_TAO_ComponentDef_Proxy_Broker::~_TAO_ComponentDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_ComponentDef_Remote_Proxy_Broker *IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_ComponentDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_ComponentDef_Remote_Proxy_Broker::_TAO_ComponentDef_Remote_Proxy_Broker (void)
++_TAO_ComponentDef_Remote_Proxy_Broker::_TAO_ComponentDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broker (void)
++_TAO_ComponentDef_Remote_Proxy_Broker::~_TAO_ComponentDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_ComponentDef_Proxy_Impl&
+-IR::_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::ComponentDef *object,
++_TAO_ComponentDef_Proxy_Impl&
++_TAO_ComponentDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_ComponentDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -41895,110 +27075,110 @@
+
+
+ // default constructor
+-IR::ComponentDef::ComponentDef (int collocated)
++IR_ComponentDef::IR_ComponentDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::ComponentDef::~ComponentDef (void)
++IR_ComponentDef::~IR_ComponentDef (void)
+ {}
+
+ void
+-IR::ComponentDef::_tao_setup_collocation (int collocated)
++IR_ComponentDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_ComponentDef_Proxy_Broker_ =
+- ::IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_ComponentDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_ComponentDef_Proxy_Broker_ =
+- ::IR::_TAO_ComponentDef_Remote_Proxy_Broker::the_TAO_ComponentDef_Remote_Proxy_Broker ();
++ ::the_TAO_ComponentDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,InterfaceDef)::_tao_setup_collocation (collocated);
++ IR_InterfaceDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::ComponentDef::_tao_any_destructor (void *x)
++void IR_ComponentDef::_tao_any_destructor (void *x)
+ {
+- ComponentDef *tmp = ACE_static_cast (ComponentDef*,x);
++ IR_ComponentDef *tmp = ACE_static_cast (IR_ComponentDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::ComponentDef_ptr IR::ComponentDef::_narrow (
++IR_ComponentDef_ptr IR_ComponentDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ComponentDef::_nil ();
++ return IR_ComponentDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/ComponentDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (ComponentDef::_nil ());
++ ACE_CHECK_RETURN (IR_ComponentDef::_nil ());
+ if (is_a == 0)
+- return ComponentDef::_nil ();
++ return IR_ComponentDef::_nil ();
+ }
+- return ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_ComponentDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::ComponentDef_ptr IR::ComponentDef::_unchecked_narrow (
++IR_ComponentDef_ptr IR_ComponentDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return ComponentDef::_nil ();
++ return IR_ComponentDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- ComponentDef_ptr default_proxy = ComponentDef::_nil ();
++ IR_ComponentDef_ptr default_proxy = IR_ComponentDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::ComponentDef (
++ ::IR_ComponentDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- ComponentDef::_nil ());
++ IR_ComponentDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::ComponentDef (stub, 0, obj->_servant ()), ComponentDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_ComponentDef (stub, 0, obj->_servant ()), IR_ComponentDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- ComponentDef_ptr,
++ IR_ComponentDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &ComponentDef::_narrow
++ &IR_ComponentDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::ComponentDef_ptr
+-IR::ComponentDef::_duplicate (ComponentDef_ptr obj)
++IR_ComponentDef_ptr
++IR_ComponentDef::_duplicate (IR_ComponentDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_ComponentDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/ComponentDef:1.0")) ||
+@@ -42013,70 +27193,70 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::ComponentDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_ComponentDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, ComponentDef)::_narrow))
++ &IR_ComponentDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, InterfaceDef)::_narrow))
++ &IR_InterfaceDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::InterfaceDef_ptr,
++ IR_InterfaceDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -42089,12 +27269,12 @@
+ return retv;
+ }
+
+-const char* IR::ComponentDef::_interface_repository_id (void) const
++const char* IR_ComponentDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/ComponentDef:1.0";
+ }
+
+-IR::InterfaceDefSeq * IR::ComponentDef::supported_interfaces (
++IR_InterfaceDefSeq * IR_ComponentDef::supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42108,8 +27288,8 @@
+ );
+ }
+
+-void IR::ComponentDef::supported_interfaces (
+- const IR::InterfaceDefSeq & supported_interfaces,
++void IR_ComponentDef::supported_interfaces (
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42124,7 +27304,7 @@
+ );
+ }
+
+-IR::ComponentDef_ptr IR::ComponentDef::base_component (
++IR_ComponentDef_ptr IR_ComponentDef::base_component (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42138,7 +27318,7 @@
+ );
+ }
+
+-IR::ProvidesDefSeq * IR::ComponentDef::provides_interfaces (
++IR_ProvidesDefSeq * IR_ComponentDef::provides_interfaces (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42152,7 +27332,7 @@
+ );
+ }
+
+-IR::UsesDefSeq * IR::ComponentDef::uses_interfaces (
++IR_UsesDefSeq * IR_ComponentDef::uses_interfaces (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42166,7 +27346,7 @@
+ );
+ }
+
+-IR::EmitsDefSeq * IR::ComponentDef::emits_events (
++IR_EmitsDefSeq * IR_ComponentDef::emits_events (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42180,7 +27360,7 @@
+ );
+ }
+
+-IR::PublishesDefSeq * IR::ComponentDef::publishes_events (
++IR_PublishesDefSeq * IR_ComponentDef::publishes_events (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42194,7 +27374,7 @@
+ );
+ }
+
+-IR::ConsumesDefSeq * IR::ComponentDef::consumes_events (
++IR_ConsumesDefSeq * IR_ComponentDef::consumes_events (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42208,7 +27388,7 @@
+ );
+ }
+
+-CORBA::Boolean IR::ComponentDef::is_basic (
++CORBA::Boolean IR_ComponentDef::is_basic (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42222,11 +27402,11 @@
+ );
+ }
+
+-IR::ProvidesDef_ptr IR::ComponentDef::create_provides (
++IR_ProvidesDef_ptr IR_ComponentDef::create_provides (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -42244,11 +27424,11 @@
+ );
+ }
+
+-IR::UsesDef_ptr IR::ComponentDef::create_uses (
++IR_UsesDef_ptr IR_ComponentDef::create_uses (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -42258,824 +27438,94 @@
+ {
+
+ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_uses (
+- this,
+- id,
+- name,
+- version,
+- interface_type,
+- is_multiple,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::EmitsDef_ptr IR::ComponentDef::create_emits (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_emits (
+- this,
+- id,
+- name,
+- version,
+- value,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::PublishesDef_ptr IR::ComponentDef::create_publishes (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_publishes (
+- this,
+- id,
+- name,
+- version,
+- value,
+- ACE_TRY_ENV
+- );
+-}
+-
+-IR::ConsumesDef_ptr IR::ComponentDef::create_consumes (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ))
+-{
+-
+- return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_consumes (
+- this,
+- id,
+- name,
+- version,
+- value,
+- ACE_TRY_ENV
+- );
+-}
+-
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get::result (IR::InterfaceDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- supported_interfaces_ (supported_interfaces)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_supported_interfaces = this->parameter_list_.length ();
+- this->parameter_list_.length (length_supported_interfaces + 1);
+- this->parameter_list_[length_supported_interfaces].argument <<= this->supported_interfaces_;
+-
+- this->parameter_list_[length_supported_interfaces].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- CORBA::TypeCode tc (CORBA::tk_void);
+- this->result_val_.type (&tc);
+-
+- return &this->result_val_;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_base_component_get::result (IR::ComponentDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get::result (IR::ProvidesDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get::result (IR::UsesDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get::result (IR::EmitsDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get::result (IR::PublishesDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get::result (IR::ConsumesDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::InterfaceDef_ptr interface_type,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- interface_type_ (interface_type)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_interface_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_interface_type + 1);
+- this->parameter_list_[length_interface_type].argument <<= this->interface_type_;
+-
+- this->parameter_list_[length_interface_type].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_provides::result (IR::ProvidesDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::InterfaceDef_ptr interface_type,
+- const CORBA::Boolean & is_multiple,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- interface_type_ (interface_type),
+- is_multiple_ (is_multiple)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_interface_type = this->parameter_list_.length ();
+- this->parameter_list_.length (length_interface_type + 1);
+- this->parameter_list_[length_interface_type].argument <<= this->interface_type_;
+-
+- this->parameter_list_[length_interface_type].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_is_multiple = this->parameter_list_.length ();
+- this->parameter_list_.length (length_is_multiple + 1);
+- this->parameter_list_[length_is_multiple].argument <<= CORBA::Any::from_boolean (this->is_multiple_);
+- this->parameter_list_[length_is_multiple].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_uses::result (IR::UsesDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- value_ (value)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_value = this->parameter_list_.length ();
+- this->parameter_list_.length (length_value + 1);
+- this->parameter_list_[length_value].argument <<= this->value_;
+-
+- this->parameter_list_[length_value].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_emits::result (IR::EmitsDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
++ this,
++ id,
++ name,
++ version,
++ interface_type,
++ is_multiple,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
++IR_EmitsDef_ptr IR_ComponentDef::create_emits (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &
++ IR_ValueDef_ptr value,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- value_ (value)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_value = this->parameter_list_.length ();
+- this->parameter_list_.length (length_value + 1);
+- this->parameter_list_[length_value].argument <<= this->value_;
+
+- this->parameter_list_[length_value].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_publishes::result (IR::PublishesDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
++ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_emits (
++ this,
++ id,
++ name,
++ version,
++ value,
++ ACE_TRY_ENV
++ );
+ }
+
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
++IR_PublishesDef_ptr IR_ComponentDef::create_publishes (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &
++ IR_ValueDef_ptr value,
++ CORBA::Environment &ACE_TRY_ENV
+ )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- value_ (value)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_value = this->parameter_list_.length ();
+- this->parameter_list_.length (length_value + 1);
+- this->parameter_list_[length_value].argument <<= this->value_;
+
+- this->parameter_list_[length_value].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
++ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_publishes (
++ this,
++ id,
++ name,
++ version,
++ value,
++ ACE_TRY_ENV
++ );
+ }
+
+-void
+-IR::ComponentDef::TAO_ClientRequestInfo_IR_ComponentDef_create_consumes::result (IR::ConsumesDef_ptr result)
++IR_ConsumesDef_ptr IR_ComponentDef::create_consumes (
++ const char * id,
++ const char * name,
++ const char * version,
++ IR_ValueDef_ptr value,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ))
+ {
+- // update the result
+- this->result_ = result;
++
++ return this->the_TAO_ComponentDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV).create_consumes (
++ this,
++ id,
++ name,
++ version,
++ value,
++ ACE_TRY_ENV
++ );
+ }
+
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_ComponentDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6d706f), ACE_NTOHL (0x6e656e74), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ComponentDef:1.0
+- 13, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0), // name = ComponentDef
++ 13, ACE_NTOHL (0x436f6d70), ACE_NTOHL (0x6f6e656e), ACE_NTOHL (0x74446566), ACE_NTOHL (0x0), // name = IR_ComponentDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDef (CORBA::tk_objref, sizeof (_oc_IR_ComponentDef), (char *) &_oc_IR_ComponentDef, 0, sizeof (IR::ComponentDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDef (CORBA::tk_objref, sizeof (_oc_IR_ComponentDef), (char *) &_oc_IR_ComponentDef, 0, sizeof (IR_ComponentDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDef, &_tc_TAO_tc_IR_ComponentDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_ComponentDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -43152,7 +27602,7 @@
+ 144, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ProvidesDefSeq:1.0
+- 15, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = ProvidesDefSeq
++ 15, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = IR_ProvidesDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -43160,7 +27610,7 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x726f7669), ACE_NTOHL (0x64657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ProvidesDef:1.0
+- 12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600), // name = ProvidesDef
++ 12, ACE_NTOHL (0x50726f76), ACE_NTOHL (0x69646573), ACE_NTOHL (0x44656600), // name = IR_ProvidesDef
+
+ 0U,
+
+@@ -43170,7 +27620,7 @@
+ 128, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/UsesDefSeq:1.0
+- 11, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = UsesDefSeq
++ 11, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = IR_UsesDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 64, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -43178,7 +27628,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f55), ACE_NTOHL (0x73657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/UsesDef:1.0
+- 8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600), // name = UsesDef
++ 8, ACE_NTOHL (0x55736573), ACE_NTOHL (0x44656600), // name = IR_UsesDef
+
+ 0U,
+
+@@ -43372,7 +27822,7 @@
+ 132, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/EmitsDefSeq:1.0
+- 12, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100), // name = EmitsDefSeq
++ 12, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100), // name = IR_EmitsDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 68, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -43380,7 +27830,7 @@
+ 52, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f45), ACE_NTOHL (0x6d697473), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/EmitsDef:1.0
+- 9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = EmitsDef
++ 9, ACE_NTOHL (0x456d6974), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_EmitsDef
+
+ 0U,
+
+@@ -43390,7 +27840,7 @@
+ 148, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 35, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65713a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/PublishesDefSeq:1.0
+- 16, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100), // name = PublishesDefSeq
++ 16, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x53657100), // name = IR_PublishesDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 76, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -43398,7 +27848,7 @@
+ 60, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x75626c69), ACE_NTOHL (0x73686573), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/PublishesDef:1.0
+- 13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = PublishesDef
++ 13, ACE_NTOHL (0x5075626c), ACE_NTOHL (0x69736865), ACE_NTOHL (0x73446566), ACE_NTOHL (0x0), // name = IR_PublishesDef
+
+ 0U,
+
+@@ -43408,7 +27858,7 @@
+ 144, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 34, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65665365), ACE_NTOHL (0x713a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/ConsumesDefSeq:1.0
+- 15, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = ConsumesDefSeq
++ 15, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656653), ACE_NTOHL (0x65710000), // name = IR_ConsumesDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -43416,7 +27866,7 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 31, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f43), ACE_NTOHL (0x6f6e7375), ACE_NTOHL (0x6d657344), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/ConsumesDef:1.0
+- 12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600), // name = ConsumesDef
++ 12, ACE_NTOHL (0x436f6e73), ACE_NTOHL (0x756d6573), ACE_NTOHL (0x44656600), // name = IR_ConsumesDef
+
+ 0U,
+
+@@ -43425,14 +27875,15 @@
+ CORBA::tk_boolean,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDescription (CORBA::tk_struct, sizeof (_oc_IR_ComponentDescription), (char *) &_oc_IR_ComponentDescription, 0, sizeof (IR::ComponentDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_ComponentDescription (CORBA::tk_struct, sizeof (_oc_IR_ComponentDescription), (char *) &_oc_IR_ComponentDescription, 0, sizeof (IR_ComponentDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentDescription, &_tc_TAO_tc_IR_ComponentDescription)
+ TAO_NAMESPACE_END
+-void IR::ComponentDescription::_tao_any_destructor (void *x)
++
++void IR_ComponentDescription::_tao_any_destructor (void *x)
+ {
+- ComponentDescription *tmp = ACE_static_cast (ComponentDescription*,x);
++ IR_ComponentDescription *tmp = ACE_static_cast (IR_ComponentDescription*,x);
+ delete tmp;
+ }
+
+@@ -43441,15 +27892,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_PrimaryKeyDef_Proxy_Impl::_TAO_PrimaryKeyDef_Proxy_Impl (void)
++_TAO_PrimaryKeyDef_Proxy_Impl::_TAO_PrimaryKeyDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void)
++_TAO_PrimaryKeyDef_Remote_Proxy_Impl::_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-CORBA::Boolean IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
++CORBA::Boolean _TAO_PrimaryKeyDef_Remote_Proxy_Impl::is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * primary_key_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -43475,57 +27926,31 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a ri (
+- "is_a",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- primary_key_id,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+ (_tao_out << primary_key_id)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ _tao_retval
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -43534,7 +27959,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -43544,44 +27969,18 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-IR::ValueDef_ptr IR::_TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
++IR_ValueDef_ptr _TAO_PrimaryKeyDef_Remote_Proxy_Impl::primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -43590,8 +27989,8 @@
+ ))
+ {
+
+- IR::ValueDef_ptr _tao_retval = IR::ValueDef::_nil ();
+- IR::ValueDef_var _tao_safe_retval (_tao_retval);
++ IR_ValueDef_ptr _tao_retval = IR_ValueDef::_nil ();
++ IR_ValueDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -43607,46 +28006,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
+- "_get_primary_key",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -43655,7 +28029,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -43665,41 +28039,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ValueDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -43713,32 +28060,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_PrimaryKeyDef_Proxy_Broker::_TAO_PrimaryKeyDef_Proxy_Broker (void)
++_TAO_PrimaryKeyDef_Proxy_Broker::_TAO_PrimaryKeyDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PrimaryKeyDef_Proxy_Broker::~_TAO_PrimaryKeyDef_Proxy_Broker (void)
++_TAO_PrimaryKeyDef_Proxy_Broker::~_TAO_PrimaryKeyDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker *IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_PrimaryKeyDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
++_TAO_PrimaryKeyDef_Remote_Proxy_Broker::_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
++_TAO_PrimaryKeyDef_Remote_Proxy_Broker::~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_PrimaryKeyDef_Proxy_Impl&
+-IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::PrimaryKeyDef *object,
++_TAO_PrimaryKeyDef_Proxy_Impl&
++_TAO_PrimaryKeyDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_PrimaryKeyDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -43754,110 +28101,110 @@
+
+
+ // default constructor
+-IR::PrimaryKeyDef::PrimaryKeyDef (int collocated)
++IR_PrimaryKeyDef::IR_PrimaryKeyDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::PrimaryKeyDef::~PrimaryKeyDef (void)
++IR_PrimaryKeyDef::~IR_PrimaryKeyDef (void)
+ {}
+
+ void
+-IR::PrimaryKeyDef::_tao_setup_collocation (int collocated)
++IR_PrimaryKeyDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
+- ::IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_PrimaryKeyDef_Proxy_Broker_ =
+- ::IR::_TAO_PrimaryKeyDef_Remote_Proxy_Broker::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
++ ::the_TAO_PrimaryKeyDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,Contained)::_tao_setup_collocation (collocated);
++ IR_Contained::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::PrimaryKeyDef::_tao_any_destructor (void *x)
++void IR_PrimaryKeyDef::_tao_any_destructor (void *x)
+ {
+- PrimaryKeyDef *tmp = ACE_static_cast (PrimaryKeyDef*,x);
++ IR_PrimaryKeyDef *tmp = ACE_static_cast (IR_PrimaryKeyDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_narrow (
++IR_PrimaryKeyDef_ptr IR_PrimaryKeyDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return PrimaryKeyDef::_nil ();
++ return IR_PrimaryKeyDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/PrimaryKeyDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (PrimaryKeyDef::_nil ());
++ ACE_CHECK_RETURN (IR_PrimaryKeyDef::_nil ());
+ if (is_a == 0)
+- return PrimaryKeyDef::_nil ();
++ return IR_PrimaryKeyDef::_nil ();
+ }
+- return PrimaryKeyDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_PrimaryKeyDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::PrimaryKeyDef_ptr IR::PrimaryKeyDef::_unchecked_narrow (
++IR_PrimaryKeyDef_ptr IR_PrimaryKeyDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return PrimaryKeyDef::_nil ();
++ return IR_PrimaryKeyDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- PrimaryKeyDef_ptr default_proxy = PrimaryKeyDef::_nil ();
++ IR_PrimaryKeyDef_ptr default_proxy = IR_PrimaryKeyDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::PrimaryKeyDef (
++ ::IR_PrimaryKeyDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- PrimaryKeyDef::_nil ());
++ IR_PrimaryKeyDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::PrimaryKeyDef (stub, 0, obj->_servant ()), PrimaryKeyDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_PrimaryKeyDef (stub, 0, obj->_servant ()), IR_PrimaryKeyDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- PrimaryKeyDef_ptr,
++ IR_PrimaryKeyDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &PrimaryKeyDef::_narrow
++ &IR_PrimaryKeyDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::PrimaryKeyDef_ptr
+-IR::PrimaryKeyDef::_duplicate (PrimaryKeyDef_ptr obj)
++IR_PrimaryKeyDef_ptr
++IR_PrimaryKeyDef::_duplicate (IR_PrimaryKeyDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_PrimaryKeyDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/PrimaryKeyDef:1.0")) ||
+@@ -43869,34 +28216,34 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_PrimaryKeyDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, PrimaryKeyDef)::_narrow))
++ &IR_PrimaryKeyDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -43909,12 +28256,12 @@
+ return retv;
+ }
+
+-const char* IR::PrimaryKeyDef::_interface_repository_id (void) const
++const char* IR_PrimaryKeyDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/PrimaryKeyDef:1.0";
+ }
+
+-CORBA::Boolean IR::PrimaryKeyDef::is_a (
++CORBA::Boolean IR_PrimaryKeyDef::is_a (
+ const char * primary_key_id,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -43930,7 +28277,7 @@
+ );
+ }
+
+-IR::ValueDef_ptr IR::PrimaryKeyDef::primary_key (
++IR_ValueDef_ptr IR_PrimaryKeyDef::primary_key (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -43944,112 +28291,18 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * primary_key_id,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- primary_key_id_ (primary_key_id)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_primary_key_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_primary_key_id + 1);
+- this->parameter_list_[length_primary_key_id].argument <<= primary_key_id_;
+- this->parameter_list_[length_primary_key_id].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::PrimaryKeyDef::TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (IR::ValueDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_PrimaryKeyDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
+- 14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x66000000), // name = PrimaryKeyDef
++ 14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x66000000), // name = IR_PrimaryKeyDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDef (CORBA::tk_objref, sizeof (_oc_IR_PrimaryKeyDef), (char *) &_oc_IR_PrimaryKeyDef, 0, sizeof (IR::PrimaryKeyDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDef (CORBA::tk_objref, sizeof (_oc_IR_PrimaryKeyDef), (char *) &_oc_IR_PrimaryKeyDef, 0, sizeof (IR_PrimaryKeyDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDef, &_tc_TAO_tc_IR_PrimaryKeyDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_PrimaryKeyDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -44097,17 +28350,18 @@
+ 52, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 28, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f56), ACE_NTOHL (0x616c7565), ACE_NTOHL (0x4465663a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/ValueDef:1.0
+- 9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = ValueDef
++ 9, ACE_NTOHL (0x56616c75), ACE_NTOHL (0x65446566), ACE_NTOHL (0x0), // name = IR_ValueDef
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDescription (CORBA::tk_struct, sizeof (_oc_IR_PrimaryKeyDescription), (char *) &_oc_IR_PrimaryKeyDescription, 0, sizeof (IR::PrimaryKeyDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_PrimaryKeyDescription (CORBA::tk_struct, sizeof (_oc_IR_PrimaryKeyDescription), (char *) &_oc_IR_PrimaryKeyDescription, 0, sizeof (IR_PrimaryKeyDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimaryKeyDescription, &_tc_TAO_tc_IR_PrimaryKeyDescription)
+ TAO_NAMESPACE_END
+-void IR::PrimaryKeyDescription::_tao_any_destructor (void *x)
++
++void IR_PrimaryKeyDescription::_tao_any_destructor (void *x)
+ {
+- PrimaryKeyDescription *tmp = ACE_static_cast (PrimaryKeyDescription*,x);
++ IR_PrimaryKeyDescription *tmp = ACE_static_cast (IR_PrimaryKeyDescription*,x);
+ delete tmp;
+ }
+
+@@ -44116,10 +28370,10 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
++_TAO_FactoryDef_Proxy_Impl::_TAO_FactoryDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
++_TAO_FactoryDef_Remote_Proxy_Impl::_TAO_FactoryDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -44134,32 +28388,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_FactoryDef_Proxy_Broker::_TAO_FactoryDef_Proxy_Broker (void)
++_TAO_FactoryDef_Proxy_Broker::_TAO_FactoryDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FactoryDef_Proxy_Broker::~_TAO_FactoryDef_Proxy_Broker (void)
++_TAO_FactoryDef_Proxy_Broker::~_TAO_FactoryDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_FactoryDef_Remote_Proxy_Broker *IR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_FactoryDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_FactoryDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_FactoryDef_Remote_Proxy_Broker::_TAO_FactoryDef_Remote_Proxy_Broker (void)
++_TAO_FactoryDef_Remote_Proxy_Broker::_TAO_FactoryDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (void)
++_TAO_FactoryDef_Remote_Proxy_Broker::~_TAO_FactoryDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FactoryDef_Proxy_Impl&
+-IR::_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::FactoryDef *object,
++_TAO_FactoryDef_Proxy_Impl&
++_TAO_FactoryDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_FactoryDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -44175,110 +28429,110 @@
+
+
+ // default constructor
+-IR::FactoryDef::FactoryDef (int collocated)
++IR_FactoryDef::IR_FactoryDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::FactoryDef::~FactoryDef (void)
++IR_FactoryDef::~IR_FactoryDef (void)
+ {}
+
+ void
+-IR::FactoryDef::_tao_setup_collocation (int collocated)
++IR_FactoryDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_FactoryDef_Proxy_Broker_ =
+- ::IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_FactoryDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_FactoryDef_Proxy_Broker_ =
+- ::IR::_TAO_FactoryDef_Remote_Proxy_Broker::the_TAO_FactoryDef_Remote_Proxy_Broker ();
++ ::the_TAO_FactoryDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,OperationDef)::_tao_setup_collocation (collocated);
++ IR_OperationDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::FactoryDef::_tao_any_destructor (void *x)
++void IR_FactoryDef::_tao_any_destructor (void *x)
+ {
+- FactoryDef *tmp = ACE_static_cast (FactoryDef*,x);
++ IR_FactoryDef *tmp = ACE_static_cast (IR_FactoryDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::FactoryDef_ptr IR::FactoryDef::_narrow (
++IR_FactoryDef_ptr IR_FactoryDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return FactoryDef::_nil ();
++ return IR_FactoryDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FactoryDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (FactoryDef::_nil ());
++ ACE_CHECK_RETURN (IR_FactoryDef::_nil ());
+ if (is_a == 0)
+- return FactoryDef::_nil ();
++ return IR_FactoryDef::_nil ();
+ }
+- return FactoryDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_FactoryDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::FactoryDef_ptr IR::FactoryDef::_unchecked_narrow (
++IR_FactoryDef_ptr IR_FactoryDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return FactoryDef::_nil ();
++ return IR_FactoryDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- FactoryDef_ptr default_proxy = FactoryDef::_nil ();
++ IR_FactoryDef_ptr default_proxy = IR_FactoryDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::FactoryDef (
++ ::IR_FactoryDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- FactoryDef::_nil ());
++ IR_FactoryDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::FactoryDef (stub, 0, obj->_servant ()), FactoryDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_FactoryDef (stub, 0, obj->_servant ()), IR_FactoryDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- FactoryDef_ptr,
++ IR_FactoryDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &FactoryDef::_narrow
++ &IR_FactoryDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::FactoryDef_ptr
+-IR::FactoryDef::_duplicate (FactoryDef_ptr obj)
++IR_FactoryDef_ptr
++IR_FactoryDef::_duplicate (IR_FactoryDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::FactoryDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_FactoryDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FactoryDef:1.0")) ||
+@@ -44291,46 +28545,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::FactoryDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_FactoryDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, FactoryDef)::_narrow))
++ &IR_FactoryDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, OperationDef)::_narrow))
++ &IR_OperationDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::OperationDef_ptr,
++ IR_OperationDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -44343,21 +28597,18 @@
+ return retv;
+ }
+
+-const char* IR::FactoryDef::_interface_repository_id (void) const
++const char* IR_FactoryDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/FactoryDef:1.0";
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_FactoryDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/FactoryDef:1.0
+- 11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000), // name = FactoryDef
++ 11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000), // name = IR_FactoryDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDef (CORBA::tk_objref, sizeof (_oc_IR_FactoryDef), (char *) &_oc_IR_FactoryDef, 0, sizeof (IR::FactoryDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_FactoryDef (CORBA::tk_objref, sizeof (_oc_IR_FactoryDef), (char *) &_oc_IR_FactoryDef, 0, sizeof (IR_FactoryDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
+@@ -44367,10 +28618,10 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
++_TAO_FinderDef_Proxy_Impl::_TAO_FinderDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
++_TAO_FinderDef_Remote_Proxy_Impl::_TAO_FinderDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+@@ -44385,32 +28636,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_FinderDef_Proxy_Broker::_TAO_FinderDef_Proxy_Broker (void)
++_TAO_FinderDef_Proxy_Broker::_TAO_FinderDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FinderDef_Proxy_Broker::~_TAO_FinderDef_Proxy_Broker (void)
++_TAO_FinderDef_Proxy_Broker::~_TAO_FinderDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_FinderDef_Remote_Proxy_Broker *IR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_FinderDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_FinderDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_FinderDef_Remote_Proxy_Broker::_TAO_FinderDef_Remote_Proxy_Broker (void)
++_TAO_FinderDef_Remote_Proxy_Broker::_TAO_FinderDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (void)
++_TAO_FinderDef_Remote_Proxy_Broker::~_TAO_FinderDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_FinderDef_Proxy_Impl&
+-IR::_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::FinderDef *object,
++_TAO_FinderDef_Proxy_Impl&
++_TAO_FinderDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_FinderDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -44426,110 +28677,110 @@
+
+
+ // default constructor
+-IR::FinderDef::FinderDef (int collocated)
++IR_FinderDef::IR_FinderDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::FinderDef::~FinderDef (void)
++IR_FinderDef::~IR_FinderDef (void)
+ {}
+
+ void
+-IR::FinderDef::_tao_setup_collocation (int collocated)
++IR_FinderDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_FinderDef_Proxy_Broker_ =
+- ::IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_FinderDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_FinderDef_Proxy_Broker_ =
+- ::IR::_TAO_FinderDef_Remote_Proxy_Broker::the_TAO_FinderDef_Remote_Proxy_Broker ();
++ ::the_TAO_FinderDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,OperationDef)::_tao_setup_collocation (collocated);
++ IR_OperationDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::FinderDef::_tao_any_destructor (void *x)
++void IR_FinderDef::_tao_any_destructor (void *x)
+ {
+- FinderDef *tmp = ACE_static_cast (FinderDef*,x);
++ IR_FinderDef *tmp = ACE_static_cast (IR_FinderDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::FinderDef_ptr IR::FinderDef::_narrow (
++IR_FinderDef_ptr IR_FinderDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return FinderDef::_nil ();
++ return IR_FinderDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/FinderDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (FinderDef::_nil ());
++ ACE_CHECK_RETURN (IR_FinderDef::_nil ());
+ if (is_a == 0)
+- return FinderDef::_nil ();
++ return IR_FinderDef::_nil ();
+ }
+- return FinderDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_FinderDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::FinderDef_ptr IR::FinderDef::_unchecked_narrow (
++IR_FinderDef_ptr IR_FinderDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return FinderDef::_nil ();
++ return IR_FinderDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- FinderDef_ptr default_proxy = FinderDef::_nil ();
++ IR_FinderDef_ptr default_proxy = IR_FinderDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_FinderDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::FinderDef (
++ ::IR_FinderDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- FinderDef::_nil ());
++ IR_FinderDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::FinderDef (stub, 0, obj->_servant ()), FinderDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_FinderDef (stub, 0, obj->_servant ()), IR_FinderDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- FinderDef_ptr,
++ IR_FinderDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &FinderDef::_narrow
++ &IR_FinderDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::FinderDef_ptr
+-IR::FinderDef::_duplicate (FinderDef_ptr obj)
++IR_FinderDef_ptr
++IR_FinderDef::_duplicate (IR_FinderDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::FinderDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_FinderDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/FinderDef:1.0")) ||
+@@ -44542,46 +28793,46 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::FinderDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_FinderDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, FinderDef)::_narrow))
++ &IR_FinderDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, OperationDef)::_narrow))
++ &IR_OperationDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::OperationDef_ptr,
++ IR_OperationDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -44594,21 +28845,18 @@
+ return retv;
+ }
+
+-const char* IR::FinderDef::_interface_repository_id (void) const
++const char* IR_FinderDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/FinderDef:1.0";
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_FinderDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/FinderDef:1.0
+- 10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000), // name = FinderDef
++ 10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000), // name = IR_FinderDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_FinderDef (CORBA::tk_objref, sizeof (_oc_IR_FinderDef), (char *) &_oc_IR_FinderDef, 0, sizeof (IR::FinderDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_FinderDef (CORBA::tk_objref, sizeof (_oc_IR_FinderDef), (char *) &_oc_IR_FinderDef, 0, sizeof (IR_FinderDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDef, &_tc_TAO_tc_IR_FinderDef)
+@@ -44618,15 +28866,15 @@
+ // Base & Remote Proxy Implementation.
+ //
+
+-IR::_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
++_TAO_HomeDef_Proxy_Impl::_TAO_HomeDef_Proxy_Impl (void)
+ {}
+
+-IR::_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
++_TAO_HomeDef_Remote_Proxy_Impl::_TAO_HomeDef_Remote_Proxy_Impl (void)
+ {}
+
+ // Remote Implementation of the IDL interface methods
+
+-IR::HomeDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::base_home (
++IR_HomeDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::base_home (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -44635,8 +28883,8 @@
+ ))
+ {
+
+- IR::HomeDef_ptr _tao_retval = IR::HomeDef::_nil ();
+- IR::HomeDef_var _tao_safe_retval (_tao_retval);
++ IR_HomeDef_ptr _tao_retval = IR_HomeDef::_nil ();
++ IR_HomeDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -44652,46 +28900,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get ri (
+- "_get_base_home",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -44700,7 +28923,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -44710,45 +28933,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::HomeDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::ComponentDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::managed_component (
++IR_ComponentDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::managed_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -44757,8 +28953,8 @@
+ ))
+ {
+
+- IR::ComponentDef_ptr _tao_retval = IR::ComponentDef::_nil ();
+- IR::ComponentDef_var _tao_safe_retval (_tao_retval);
++ IR_ComponentDef_ptr _tao_retval = IR_ComponentDef::_nil ();
++ IR_ComponentDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -44774,46 +28970,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get ri (
+- "_get_managed_component",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -44822,7 +28993,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -44832,45 +29003,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::ComponentDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::primary_key (
++IR_PrimaryKeyDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -44879,8 +29023,8 @@
+ ))
+ {
+
+- IR::PrimaryKeyDef_ptr _tao_retval = IR::PrimaryKeyDef::_nil ();
+- IR::PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
++ IR_PrimaryKeyDef_ptr _tao_retval = IR_PrimaryKeyDef::_nil ();
++ IR_PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -44896,46 +29040,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get ri (
+- "_get_primary_key",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -44944,7 +29063,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -44954,45 +29073,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::FactoryDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::factories (
++IR_FactoryDefSeq * _TAO_HomeDef_Remote_Proxy_Impl::factories (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -45001,7 +29093,7 @@
+ ))
+ {
+
+- IR::FactoryDefSeq *_tao_retval = 0;
++ IR_FactoryDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -45009,8 +29101,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::FactoryDefSeq, _tao_retval);
+- IR::FactoryDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_FactoryDefSeq, _tao_retval);
++ IR_FactoryDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_factories",
+@@ -45019,46 +29111,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get ri (
+- "_get_factories",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -45067,7 +29134,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -45077,45 +29144,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::FactoryDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::FinderDefSeq * IR::_TAO_HomeDef_Remote_Proxy_Impl::finders (
++IR_FinderDefSeq * _TAO_HomeDef_Remote_Proxy_Impl::finders (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -45124,7 +29164,7 @@
+ ))
+ {
+
+- IR::FinderDefSeq *_tao_retval = 0;
++ IR_FinderDefSeq *_tao_retval = 0;
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -45132,8 +29172,8 @@
+ ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
+
+
+- ACE_NEW_RETURN (_tao_retval, IR::FinderDefSeq, _tao_retval);
+- IR::FinderDefSeq_var _tao_safe_retval (_tao_retval);
++ ACE_NEW_RETURN (_tao_retval, IR_FinderDefSeq, _tao_retval);
++ IR_FinderDefSeq_var _tao_safe_retval (_tao_retval);
+ TAO_GIOP_Twoway_Invocation _tao_call (
+ istub,
+ "_get_finders",
+@@ -45142,46 +29182,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get ri (
+- "_get_finders",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -45190,7 +29205,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -45200,45 +29215,18 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::FinderDefSeq * _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-CORBA::Boolean IR::_TAO_HomeDef_Remote_Proxy_Impl::is_basic (
++CORBA::Boolean _TAO_HomeDef_Remote_Proxy_Impl::is_basic (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -45263,46 +29251,21 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get ri (
+- "_get_is_basic",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (_tao_retval);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
++ ACE_CHECK_RETURN (_tao_retval);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -45311,7 +29274,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+@@ -45321,49 +29284,23 @@
+ (_tao_in >> CORBA::Any::to_boolean (_tao_retval))
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ _tao_retval
+ );
+ }
+- TAO_INTERCEPTOR (
+- CORBA::Boolean _tao_retval_info = _tao_retval;
+- ri.result (_tao_retval_info);
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (_tao_retval);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_retval;
+ }
+
+-IR::PrimaryKeyDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
++IR_PrimaryKeyDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr primary_key,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -45371,8 +29308,8 @@
+ ))
+ {
+
+- IR::PrimaryKeyDef_ptr _tao_retval = IR::PrimaryKeyDef::_nil ();
+- IR::PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
++ IR_PrimaryKeyDef_ptr _tao_retval = IR_PrimaryKeyDef::_nil ();
++ IR_PrimaryKeyDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -45388,47 +29325,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key ri (
+- "create_primary_key",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- primary_key,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -45437,14 +29345,14 @@
+ (_tao_out << version) &&
+ (_tao_out << primary_key)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -45453,7 +29361,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -45463,51 +29371,24 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::PrimaryKeyDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::FactoryDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_factory (
++IR_FactoryDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_factory (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -45515,8 +29396,8 @@
+ ))
+ {
+
+- IR::FactoryDef_ptr _tao_retval = IR::FactoryDef::_nil ();
+- IR::FactoryDef_var _tao_safe_retval (_tao_retval);
++ IR_FactoryDef_ptr _tao_retval = IR_FactoryDef::_nil ();
++ IR_FactoryDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -45532,48 +29413,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory ri (
+- "create_factory",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- params,
+- exceptions,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -45583,14 +29434,14 @@
+ (_tao_out << params) &&
+ (_tao_out << exceptions)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -45599,7 +29450,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -45609,51 +29460,24 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::FactoryDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+-IR::FinderDef_ptr IR::_TAO_HomeDef_Remote_Proxy_Impl::create_finder (
++IR_FinderDef_ptr _TAO_HomeDef_Remote_Proxy_Impl::create_finder (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -45661,8 +29485,8 @@
+ ))
+ {
+
+- IR::FinderDef_ptr _tao_retval = IR::FinderDef::_nil ();
+- IR::FinderDef_var _tao_safe_retval (_tao_retval);
++ IR_FinderDef_ptr _tao_retval = IR_FinderDef::_nil ();
++ IR_FinderDef_var _tao_safe_retval (_tao_retval);
+
+
+ TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+@@ -45678,48 +29502,18 @@
+ istub->orb_core ()
+ );
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- TAO_ClientRequestInterceptor_Adapter _tao_vfr (
+- istub->orb_core ()->client_request_interceptors ()
+- );
+-
+- IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder ri (
+- "create_finder",
+- _tao_call.service_info (),
+- _collocated_tao_target_,
+- id,
+- name,
+- version,
+- params,
+- exceptions,
+- ACE_TRY_ENV
+- );
+- ACE_CHECK_RETURN (0);
+-
+- ACE_TRY
+- {
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+ for (;;)
+ {
+ _tao_call.start (ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+- TAO_INTERCEPTOR (
+- ri.request_id (_tao_call.request_id ());
+- _tao_vfr.send_request (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
+
+ _tao_call.prepare_header (
+ ACE_static_cast (CORBA::Octet, _tao_response_flag),
+ ACE_TRY_ENV
+ );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
+ if (!(
+@@ -45729,14 +29523,14 @@
+ (_tao_out << params) &&
+ (_tao_out << exceptions)
+ ))
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (),
+ 0
+ );
+
+ int _invoke_status =
+ _tao_call.invoke (0, 0, ACE_TRY_ENV);
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
++ ACE_CHECK_RETURN (0);
+
+ if (_invoke_status == TAO_INVOKE_RESTART)
+ {
+@@ -45745,7 +29539,7 @@
+ }
+ if (_invoke_status != TAO_INVOKE_OK)
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+@@ -45755,41 +29549,14 @@
+ (_tao_in >> _tao_safe_retval.inout ())
+ ))
+ {
+- TAO_INTERCEPTOR_THROW_RETURN (
++ ACE_THROW_RETURN (
+ CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES),
+ 0
+ );
+ }
+- TAO_INTERCEPTOR (
+- IR::FinderDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+- ri.result (_tao_retval_info);
+- _tao_safe_retval = _tao_retval_info;
+- );
+-
+- TAO_INTERCEPTOR (
+- _tao_vfr.receive_reply (
+- &ri,
+- ACE_TRY_ENV
+- )
+- );
+- TAO_INTERCEPTOR_CHECK_RETURN (0);
+ break;
+ }
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- }
+- ACE_CATCHANY
+- {
+- ri.exception (&ACE_ANY_EXCEPTION);
+- _tao_vfr.receive_exception (
+- &ri,
+- ACE_TRY_ENV
+- );
+- ACE_RE_THROW;
+- }
+- ACE_ENDTRY;
+- ACE_CHECK_RETURN (0);
+-#endif /* TAO_HAS_INTERCEPTORS */
+ return _tao_safe_retval._retn ();
+ }
+
+@@ -45803,32 +29570,32 @@
+ // Remote & Base Proxy Broker Implementation
+ //
+
+-IR::_TAO_HomeDef_Proxy_Broker::_TAO_HomeDef_Proxy_Broker (void)
++_TAO_HomeDef_Proxy_Broker::_TAO_HomeDef_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_HomeDef_Proxy_Broker::~_TAO_HomeDef_Proxy_Broker (void)
++_TAO_HomeDef_Proxy_Broker::~_TAO_HomeDef_Proxy_Broker (void)
+ {
+ }
+
+-// Factory Member function Implementation.
+-IR::_TAO_HomeDef_Remote_Proxy_Broker *IR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker (void)
++// Factory function Implementation.
++_TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void)
+ {
+- static ::IR::_TAO_HomeDef_Remote_Proxy_Broker remote_proxy_broker;
++ static ::_TAO_HomeDef_Remote_Proxy_Broker remote_proxy_broker;
+ return &remote_proxy_broker;
+ }
+
+-IR::_TAO_HomeDef_Remote_Proxy_Broker::_TAO_HomeDef_Remote_Proxy_Broker (void)
++_TAO_HomeDef_Remote_Proxy_Broker::_TAO_HomeDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
++_TAO_HomeDef_Remote_Proxy_Broker::~_TAO_HomeDef_Remote_Proxy_Broker (void)
+ {
+ }
+
+-IR::_TAO_HomeDef_Proxy_Impl&
+-IR::_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
+- ::IR::HomeDef *object,
++_TAO_HomeDef_Proxy_Impl&
++_TAO_HomeDef_Remote_Proxy_Broker::select_proxy (
++ ::IR_HomeDef *object,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+@@ -45844,110 +29611,110 @@
+
+
+ // default constructor
+-IR::HomeDef::HomeDef (int collocated)
++IR_HomeDef::IR_HomeDef (int collocated)
+ {
+ this->_tao_setup_collocation (collocated);
+ }
+
+ // destructor
+-IR::HomeDef::~HomeDef (void)
++IR_HomeDef::~IR_HomeDef (void)
+ {}
+
+ void
+-IR::HomeDef::_tao_setup_collocation (int collocated)
++IR_HomeDef::_tao_setup_collocation (int collocated)
+ {
+ if (collocated)
+ this->the_TAO_HomeDef_Proxy_Broker_ =
+- ::IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
++ _TAO_HomeDef_Proxy_Broker_Factory_function_pointer (this);
+ else
+ this->the_TAO_HomeDef_Proxy_Broker_ =
+- ::IR::_TAO_HomeDef_Remote_Proxy_Broker::the_TAO_HomeDef_Remote_Proxy_Broker ();
++ ::the_TAO_HomeDef_Remote_Proxy_Broker ();
+
+- ACE_NESTED_CLASS (IR,InterfaceDef)::_tao_setup_collocation (collocated);
++ IR_InterfaceDef::_tao_setup_collocation (collocated);
+
+ }
+
+-void IR::HomeDef::_tao_any_destructor (void *x)
++void IR_HomeDef::_tao_any_destructor (void *x)
+ {
+- HomeDef *tmp = ACE_static_cast (HomeDef*,x);
++ IR_HomeDef *tmp = ACE_static_cast (IR_HomeDef*,x);
+ CORBA::release (tmp);
+ }
+
+-IR::HomeDef_ptr IR::HomeDef::_narrow (
++IR_HomeDef_ptr IR_HomeDef::_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return HomeDef::_nil ();
++ return IR_HomeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/IR/HomeDef:1.0", ACE_TRY_ENV);
+- ACE_CHECK_RETURN (HomeDef::_nil ());
++ ACE_CHECK_RETURN (IR_HomeDef::_nil ());
+ if (is_a == 0)
+- return HomeDef::_nil ();
++ return IR_HomeDef::_nil ();
+ }
+- return HomeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
++ return IR_HomeDef::_unchecked_narrow (obj, ACE_TRY_ENV);
+ }
+
+-IR::HomeDef_ptr IR::HomeDef::_unchecked_narrow (
++IR_HomeDef_ptr IR_HomeDef::_unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &
+ )
+ {
+ if (CORBA::is_nil (obj))
+- return HomeDef::_nil ();
++ return IR_HomeDef::_nil ();
+ if (! obj->_is_local ())
+ {
+ TAO_Stub* stub = obj->_stubobj ();
+ if (stub)
+ stub->_incr_refcnt ();
+- HomeDef_ptr default_proxy = HomeDef::_nil ();
++ IR_HomeDef_ptr default_proxy = IR_HomeDef::_nil ();
+
+ if (
+ !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
+ stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
+- obj->_is_collocated () &&IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer != 0
++ obj->_is_collocated () &&_TAO_HomeDef_Proxy_Broker_Factory_function_pointer != 0
+ )
+ {
+ ACE_NEW_RETURN (
+ default_proxy,
+- ::IR::HomeDef (
++ ::IR_HomeDef (
+ stub,
+ 1,
+ obj->_servant ()),
+
+- HomeDef::_nil ());
++ IR_HomeDef::_nil ());
+ }
+ if (CORBA::is_nil (default_proxy))
+- ACE_NEW_RETURN (default_proxy, ::IR::HomeDef (stub, 0, obj->_servant ()), HomeDef::_nil ());
++ ACE_NEW_RETURN (default_proxy, ::IR_HomeDef (stub, 0, obj->_servant ()), IR_HomeDef::_nil ());
+ return default_proxy;
+ }
+ else
+ return
+ ACE_reinterpret_cast
+ (
+- HomeDef_ptr,
++ IR_HomeDef_ptr,
+ obj->_tao_QueryInterface
+ (
+ ACE_reinterpret_cast
+ (
+ ptr_arith_t,
+- &HomeDef::_narrow
++ &IR_HomeDef::_narrow
+ )
+ )
+ );
+ }
+
+-IR::HomeDef_ptr
+-IR::HomeDef::_duplicate (HomeDef_ptr obj)
++IR_HomeDef_ptr
++IR_HomeDef::_duplicate (IR_HomeDef_ptr obj)
+ {
+ if (!CORBA::is_nil (obj))
+ obj->_add_ref ();
+ return obj;
+ }
+
+-CORBA::Boolean IR::HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
++CORBA::Boolean IR_HomeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+ if (
+ (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/IR/HomeDef:1.0")) ||
+@@ -45962,70 +29729,70 @@
+ return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+ }
+
+-void *IR::HomeDef::_tao_QueryInterface (ptr_arith_t type)
++void *IR_HomeDef::_tao_QueryInterface (ptr_arith_t type)
+ {
+ void *retv = 0;
+ if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, HomeDef)::_narrow))
++ &IR_HomeDef::_narrow))
+ retv = ACE_reinterpret_cast (void*, this);
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, InterfaceDef)::_narrow))
++ &IR_InterfaceDef::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::InterfaceDef_ptr,
++ IR_InterfaceDef_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Container)::_narrow))
++ &IR_Container::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Container_ptr,
++ IR_Container_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, Contained)::_narrow))
++ &IR_Contained::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::Contained_ptr,
++ IR_Contained_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &ACE_NESTED_CLASS (::IR, IDLType)::_narrow))
++ &IR_IDLType::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- IR::IDLType_ptr,
++ IR_IDLType_ptr,
+ this
+ )
+ );
+ else if (type == ACE_reinterpret_cast
+ (ptr_arith_t,
+- &::CORBA::IRObject::_narrow))
++ &CORBA_IRObject::_narrow))
+ retv = ACE_reinterpret_cast
+ (
+ void *,
+ ACE_static_cast
+ (
+- CORBA::IRObject_ptr,
++ CORBA_IRObject_ptr,
+ this
+ )
+ );
+@@ -46038,12 +29805,12 @@
+ return retv;
+ }
+
+-const char* IR::HomeDef::_interface_repository_id (void) const
++const char* IR_HomeDef::_interface_repository_id (void) const
+ {
+ return "IDL:omg.org/IR/HomeDef:1.0";
+ }
+
+-IR::HomeDef_ptr IR::HomeDef::base_home (
++IR_HomeDef_ptr IR_HomeDef::base_home (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46057,7 +29824,7 @@
+ );
+ }
+
+-IR::ComponentDef_ptr IR::HomeDef::managed_component (
++IR_ComponentDef_ptr IR_HomeDef::managed_component (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46071,7 +29838,7 @@
+ );
+ }
+
+-IR::PrimaryKeyDef_ptr IR::HomeDef::primary_key (
++IR_PrimaryKeyDef_ptr IR_HomeDef::primary_key (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46085,7 +29852,7 @@
+ );
+ }
+
+-IR::FactoryDefSeq * IR::HomeDef::factories (
++IR_FactoryDefSeq * IR_HomeDef::factories (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46099,7 +29866,7 @@
+ );
+ }
+
+-IR::FinderDefSeq * IR::HomeDef::finders (
++IR_FinderDefSeq * IR_HomeDef::finders (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46113,7 +29880,7 @@
+ );
+ }
+
+-CORBA::Boolean IR::HomeDef::is_basic (
++CORBA::Boolean IR_HomeDef::is_basic (
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46127,11 +29894,11 @@
+ );
+ }
+
+-IR::PrimaryKeyDef_ptr IR::HomeDef::create_primary_key (
++IR_PrimaryKeyDef_ptr IR_HomeDef::create_primary_key (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr primary_key,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46149,12 +29916,12 @@
+ );
+ }
+
+-IR::FactoryDef_ptr IR::HomeDef::create_factory (
++IR_FactoryDef_ptr IR_HomeDef::create_factory (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46173,12 +29940,12 @@
+ );
+ }
+
+-IR::FinderDef_ptr IR::HomeDef::create_finder (
++IR_FinderDef_ptr IR_HomeDef::create_finder (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -46197,491 +29964,18 @@
+ );
+ }
+
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_base_home_get::result (IR::HomeDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_managed_component_get::result (IR::ComponentDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_primary_key_get::result (IR::PrimaryKeyDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::TAO_ClientRequestInfo_IR_HomeDef_factories_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_factories_get::result (IR::FactoryDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::TAO_ClientRequestInfo_IR_HomeDef_finders_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_finders_get::result (IR::FinderDefSeq * result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- return 0;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= CORBA::Any::from_boolean (this->result_);
+-
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Boolean result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr primary_key,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- primary_key_ (primary_key)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_primary_key = this->parameter_list_.length ();
+- this->parameter_list_.length (length_primary_key + 1);
+- this->parameter_list_[length_primary_key].argument <<= this->primary_key_;
+-
+- this->parameter_list_[length_primary_key].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_primary_key::result (IR::PrimaryKeyDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::TAO_ClientRequestInfo_IR_HomeDef_create_factory (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- params_ (params),
+- exceptions_ (exceptions)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_params = this->parameter_list_.length ();
+- this->parameter_list_.length (length_params + 1);
+- this->parameter_list_[length_params].argument <<= this->params_;
+-
+- this->parameter_list_[length_params].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_exceptions + 1);
+- this->parameter_list_[length_exceptions].argument <<= this->exceptions_;
+-
+- this->parameter_list_[length_exceptions].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_factory::result (IR::FactoryDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::TAO_ClientRequestInfo_IR_HomeDef_create_finder (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- CORBA::Environment &
+- )
+- : TAO_ClientRequestInfo (_tao_operation, _tao_service_context_list, _tao_target),
+- id_ (id),
+- name_ (name),
+- version_ (version),
+- params_ (params),
+- exceptions_ (exceptions)
+-{}
+-
+-Dynamic::ParameterList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the arg list on demand
+- CORBA::ULong length_id = this->parameter_list_.length ();
+- this->parameter_list_.length (length_id + 1);
+- this->parameter_list_[length_id].argument <<= id_;
+- this->parameter_list_[length_id].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_name = this->parameter_list_.length ();
+- this->parameter_list_.length (length_name + 1);
+- this->parameter_list_[length_name].argument <<= name_;
+- this->parameter_list_[length_name].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_version = this->parameter_list_.length ();
+- this->parameter_list_.length (length_version + 1);
+- this->parameter_list_[length_version].argument <<= version_;
+- this->parameter_list_[length_version].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_params = this->parameter_list_.length ();
+- this->parameter_list_.length (length_params + 1);
+- this->parameter_list_[length_params].argument <<= this->params_;
+-
+- this->parameter_list_[length_params].mode = Dynamic::PARAM_IN;
+- CORBA::ULong length_exceptions = this->parameter_list_.length ();
+- this->parameter_list_.length (length_exceptions + 1);
+- this->parameter_list_[length_exceptions].argument <<= this->exceptions_;
+-
+- this->parameter_list_[length_exceptions].mode = Dynamic::PARAM_IN;
+-
+- return &this->parameter_list_;
+-}
+-
+-Dynamic::ExceptionList *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the exception list on demand
+- return 0;
+-}
+-
+-
+-CORBA::Any *
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &)
+- ACE_THROW_SPEC ((CORBA::SystemException))
+-{
+- // Generate the result on demand.
+- this->result_val_ <<= this->result_;
+- return &this->result_val_;
+-}
+-
+-void
+-IR::HomeDef::TAO_ClientRequestInfo_IR_HomeDef_create_finder::result (IR::FinderDef_ptr result)
+-{
+- // update the result
+- this->result_ = result;
+-}
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+ static const CORBA::Long _oc_IR_HomeDef[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f48), ACE_NTOHL (0x6f6d6544), ACE_NTOHL (0x65663a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/HomeDef:1.0
+- 8, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656600), // name = HomeDef
++ 8, ACE_NTOHL (0x486f6d65), ACE_NTOHL (0x44656600), // name = IR_HomeDef
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_HomeDef (CORBA::tk_objref, sizeof (_oc_IR_HomeDef), (char *) &_oc_IR_HomeDef, 0, sizeof (IR::HomeDef));
++static CORBA::TypeCode _tc_TAO_tc_IR_HomeDef (CORBA::tk_objref, sizeof (_oc_IR_HomeDef), (char *) &_oc_IR_HomeDef, 0, sizeof (IR_HomeDef));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDef, &_tc_TAO_tc_IR_HomeDef)
+ TAO_NAMESPACE_END
++
+ static const CORBA::Long _oc_IR_HomeDescription[] =
+ {
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -46747,14 +30041,14 @@
+ 64, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f50), ACE_NTOHL (0x72696d61), ACE_NTOHL (0x72794b65), ACE_NTOHL (0x79446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/PrimaryKeyDef:1.0
+- 14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x66000000), // name = PrimaryKeyDef
++ 14, ACE_NTOHL (0x5072696d), ACE_NTOHL (0x6172794b), ACE_NTOHL (0x65794465), ACE_NTOHL (0x66000000), // name = IR_PrimaryKeyDef
+
+ 10, ACE_NTOHL (0x66616374), ACE_NTOHL (0x6f726965), ACE_NTOHL (0x73000000), // name = factories
+ CORBA::tk_alias, // typecode kind for typedefs
+ 144, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 33, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/FactoryDefSeq:1.0
+- 14, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65665365), ACE_NTOHL (0x71000000), // name = FactoryDefSeq
++ 14, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65665365), ACE_NTOHL (0x71000000), // name = IR_FactoryDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -46762,7 +30056,7 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 30, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x6163746f), ACE_NTOHL (0x72794465), ACE_NTOHL (0x663a312e), ACE_NTOHL (0x30000000), // repository ID = IDL:omg.org/IR/FactoryDef:1.0
+- 11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000), // name = FactoryDef
++ 11, ACE_NTOHL (0x46616374), ACE_NTOHL (0x6f727944), ACE_NTOHL (0x65660000), // name = IR_FactoryDef
+
+ 0U,
+
+@@ -46772,7 +30066,7 @@
+ 140, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 32, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x5365713a), ACE_NTOHL (0x312e3000), // repository ID = IDL:omg.org/IR/FinderDefSeq:1.0
+- 13, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x0), // name = FinderDefSeq
++ 13, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66536571), ACE_NTOHL (0x0), // name = IR_FinderDefSeq
+ CORBA::tk_sequence, // typecode kind
+ 72, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -46780,7 +30074,7 @@
+ 56, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 29, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f46), ACE_NTOHL (0x696e6465), ACE_NTOHL (0x72446566), ACE_NTOHL (0x3a312e30), ACE_NTOHL (0x0), // repository ID = IDL:omg.org/IR/FinderDef:1.0
+- 10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000), // name = FinderDef
++ 10, ACE_NTOHL (0x46696e64), ACE_NTOHL (0x65724465), ACE_NTOHL (0x66000000), // name = IR_FinderDef
+
+ 0U,
+
+@@ -46907,7 +30201,7 @@
+ 48, // encapsulation length
+ TAO_ENCAP_BYTE_ORDER, // byte order
+ 27, ACE_NTOHL (0x49444c3a), ACE_NTOHL (0x6f6d672e), ACE_NTOHL (0x6f72672f), ACE_NTOHL (0x49522f49), ACE_NTOHL (0x444c5479), ACE_NTOHL (0x70653a31), ACE_NTOHL (0x2e300000), // repository ID = IDL:omg.org/IR/IDLType:1.0
+- 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IDLType
++ 8, ACE_NTOHL (0x49444c54), ACE_NTOHL (0x79706500), // name = IR_IDLType
+
+ 5, ACE_NTOHL (0x6d6f6465), ACE_NTOHL (0x0), // name = mode
+ CORBA::tk_enum, // typecode kind
+@@ -47174,18 +30468,19 @@
+ CORBA::tk_boolean,
+
+ };
+-static CORBA::TypeCode _tc_TAO_tc_IR_HomeDescription (CORBA::tk_struct, sizeof (_oc_IR_HomeDescription), (char *) &_oc_IR_HomeDescription, 0, sizeof (IR::HomeDescription));
++static CORBA::TypeCode _tc_TAO_tc_IR_HomeDescription (CORBA::tk_struct, sizeof (_oc_IR_HomeDescription), (char *) &_oc_IR_HomeDescription, 0, sizeof (IR_HomeDescription));
+ TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+ TAO_NAMESPACE_BEGIN (IR)
+ TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_HomeDescription, &_tc_TAO_tc_IR_HomeDescription)
+ TAO_NAMESPACE_END
+-void IR::HomeDescription::_tao_any_destructor (void *x)
++
++void IR_HomeDescription::_tao_any_destructor (void *x)
+ {
+- HomeDescription *tmp = ACE_static_cast (HomeDescription*,x);
++ IR_HomeDescription *tmp = ACE_static_cast (IR_HomeDescription*,x);
+ delete tmp;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::DefinitionKind _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_DefinitionKind _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -47196,7 +30491,7 @@
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::DefinitionKind &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_DefinitionKind &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+@@ -47223,11 +30518,11 @@
+ return 0;
+ }
+
+-CORBA::_TAO_IRObject_Proxy_Broker * (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
++_TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, CORBA::IRObject_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, CORBA_IRObject_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -47237,17 +30532,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- CORBA::IRObject::_duplicate (_tao_elem),
+- CORBA::IRObject::_tao_any_destructor
++ CORBA_IRObject::_duplicate (_tao_elem),
++ CORBA_IRObject::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::IRObject_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_IRObject_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = CORBA::IRObject::_nil ();
++ _tao_elem = CORBA_IRObject::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (CORBA::_tc_IRObject, ACE_TRY_ENV)) // not equal
+ {
+@@ -47264,33 +30559,33 @@
+ CORBA::_tc_IRObject,
+ 1,
+ _tao_elem,
+- CORBA::IRObject::_tao_any_destructor
++ CORBA_IRObject::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = CORBA::IRObject::_nil ();
++ _tao_elem = CORBA_IRObject::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = CORBA::IRObject::_nil ();
++ _tao_elem = CORBA_IRObject::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>;
++ template class TAO_Object_Manager<CORBA_IRObject,CORBA::IRObject_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<CORBA::IRObject,CORBA::IRObject_var>
++ # pragma instantiate TAO_Object_Manager<CORBA_IRObject,CORBA::IRObject_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_Contained_Proxy_Broker * (*IR__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
++_TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::Contained_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_Contained_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -47300,17 +30595,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::Contained::_duplicate (_tao_elem),
+- IR::Contained::_tao_any_destructor
++ IR_Contained::_duplicate (_tao_elem),
++ IR_Contained::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Contained_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Contained_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::Contained::_nil ();
++ _tao_elem = IR_Contained::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_Contained, ACE_TRY_ENV)) // not equal
+ {
+@@ -47327,65 +30622,65 @@
+ IR::_tc_Contained,
+ 1,
+ _tao_elem,
+- IR::Contained::_tao_any_destructor
++ IR_Contained::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::Contained::_nil ();
++ _tao_elem = IR_Contained::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::Contained::_nil ();
++ _tao_elem = IR_Contained::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::Contained,IR::Contained_var>;
++ template class TAO_Object_Manager<IR_Contained,IR_Contained_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::Contained,IR::Contained_var>
++ # pragma instantiate TAO_Object_Manager<IR_Contained,IR_Contained_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::Contained::Description &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_Contained::Description &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+ _tao_any._tao_replace (
+- IR::Contained::_tc_Description,
++ IR_Contained::_tc_Description,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin ()
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::Contained::Description *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_Contained::Description *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+ _tao_any._tao_replace (
+- IR::Contained::_tc_Description,
++ IR_Contained::_tc_Description,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::Contained::Description::_tao_any_destructor
++ IR_Contained::Description::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Contained::Description *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Contained::Description *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::Contained::Description*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_Contained::Description*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::Contained::Description *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Contained::Description *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+- if (!type->equivalent (IR::Contained::_tc_Description, ACE_TRY_ENV)) // not equal
++ if (!type->equivalent (IR_Contained::_tc_Description, ACE_TRY_ENV)) // not equal
+ {
+ return 0;
+ }
+@@ -47393,15 +30688,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::Contained::Description*,
++ const IR_Contained::Description*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::Contained::Description *tmp;
+- ACE_NEW_RETURN (tmp, IR::Contained::Description, 0);
++ IR_Contained::Description *tmp;
++ ACE_NEW_RETURN (tmp, IR_Contained::Description, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -47409,10 +30704,10 @@
+ if (stream >> *tmp)
+ {
+ ((CORBA::Any *)&_tao_any)->_tao_replace (
+- IR::Contained::_tc_Description,
++ IR_Contained::_tc_Description,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::Contained::Description::_tao_any_destructor
++ IR_Contained::Description::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -47432,7 +30727,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::InterfaceDefSeq &_tao_elem
++ const IR_InterfaceDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -47446,7 +30741,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::InterfaceDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_InterfaceDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -47456,19 +30751,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::InterfaceDefSeq::_tao_any_destructor
++ IR_InterfaceDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::InterfaceDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InterfaceDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::InterfaceDefSeq*&,
++ const IR_InterfaceDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::InterfaceDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_InterfaceDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -47482,15 +30777,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::InterfaceDefSeq*,
++ const IR_InterfaceDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::InterfaceDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::InterfaceDefSeq, 0);
++ IR_InterfaceDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_InterfaceDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -47501,7 +30796,7 @@
+ IR::_tc_InterfaceDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::InterfaceDefSeq::_tao_any_destructor
++ IR_InterfaceDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -47521,7 +30816,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ValueDefSeq &_tao_elem
++ const IR_ValueDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -47535,7 +30830,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ValueDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ValueDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -47545,19 +30840,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ValueDefSeq::_tao_any_destructor
++ IR_ValueDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ValueDefSeq*&,
++ const IR_ValueDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ValueDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -47571,15 +30866,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ValueDefSeq*,
++ const IR_ValueDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ValueDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ValueDefSeq, 0);
++ IR_ValueDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ValueDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -47590,7 +30885,7 @@
+ IR::_tc_ValueDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ValueDefSeq::_tao_any_destructor
++ IR_ValueDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -47610,7 +30905,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ComponentDefSeq &_tao_elem
++ const IR_ComponentDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -47624,7 +30919,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ComponentDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ComponentDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -47634,19 +30929,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ComponentDefSeq::_tao_any_destructor
++ IR_ComponentDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ComponentDefSeq*&,
++ const IR_ComponentDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ComponentDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -47660,15 +30955,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ComponentDefSeq*,
++ const IR_ComponentDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ComponentDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ComponentDefSeq, 0);
++ IR_ComponentDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ComponentDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -47679,7 +30974,7 @@
+ IR::_tc_ComponentDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ComponentDefSeq::_tao_any_destructor
++ IR_ComponentDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -47699,7 +30994,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ProvidesDefSeq &_tao_elem
++ const IR_ProvidesDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -47713,7 +31008,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -47723,19 +31018,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ProvidesDefSeq::_tao_any_destructor
++ IR_ProvidesDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ProvidesDefSeq*&,
++ const IR_ProvidesDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ProvidesDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -47749,15 +31044,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ProvidesDefSeq*,
++ const IR_ProvidesDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ProvidesDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ProvidesDefSeq, 0);
++ IR_ProvidesDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ProvidesDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -47768,7 +31063,7 @@
+ IR::_tc_ProvidesDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ProvidesDefSeq::_tao_any_destructor
++ IR_ProvidesDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -47788,7 +31083,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::UsesDefSeq &_tao_elem
++ const IR_UsesDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -47802,7 +31097,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::UsesDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_UsesDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -47812,19 +31107,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::UsesDefSeq::_tao_any_destructor
++ IR_UsesDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::UsesDefSeq*&,
++ const IR_UsesDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UsesDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -47838,15 +31133,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::UsesDefSeq*,
++ const IR_UsesDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::UsesDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::UsesDefSeq, 0);
++ IR_UsesDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_UsesDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -47857,7 +31152,7 @@
+ IR::_tc_UsesDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::UsesDefSeq::_tao_any_destructor
++ IR_UsesDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -47877,7 +31172,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::HomeDefSeq &_tao_elem
++ const IR_HomeDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -47891,7 +31186,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::HomeDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_HomeDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -47901,19 +31196,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::HomeDefSeq::_tao_any_destructor
++ IR_HomeDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_HomeDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::HomeDefSeq*&,
++ const IR_HomeDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_HomeDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -47927,15 +31222,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::HomeDefSeq*,
++ const IR_HomeDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::HomeDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::HomeDefSeq, 0);
++ IR_HomeDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_HomeDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -47946,7 +31241,7 @@
+ IR::_tc_HomeDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::HomeDefSeq::_tao_any_destructor
++ IR_HomeDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -47966,7 +31261,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::EmitsDefSeq &_tao_elem
++ const IR_EmitsDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -47980,7 +31275,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::EmitsDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_EmitsDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -47990,19 +31285,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::EmitsDefSeq::_tao_any_destructor
++ IR_EmitsDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EmitsDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EmitsDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::EmitsDefSeq*&,
++ const IR_EmitsDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EmitsDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EmitsDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48016,15 +31311,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::EmitsDefSeq*,
++ const IR_EmitsDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::EmitsDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::EmitsDefSeq, 0);
++ IR_EmitsDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_EmitsDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48035,7 +31330,7 @@
+ IR::_tc_EmitsDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::EmitsDefSeq::_tao_any_destructor
++ IR_EmitsDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48055,7 +31350,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::PublishesDefSeq &_tao_elem
++ const IR_PublishesDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -48069,7 +31364,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::PublishesDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_PublishesDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48079,19 +31374,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::PublishesDefSeq::_tao_any_destructor
++ IR_PublishesDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PublishesDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PublishesDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::PublishesDefSeq*&,
++ const IR_PublishesDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PublishesDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_PublishesDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48105,15 +31400,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::PublishesDefSeq*,
++ const IR_PublishesDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::PublishesDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::PublishesDefSeq, 0);
++ IR_PublishesDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_PublishesDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48124,7 +31419,7 @@
+ IR::_tc_PublishesDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::PublishesDefSeq::_tao_any_destructor
++ IR_PublishesDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48144,7 +31439,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ConsumesDefSeq &_tao_elem
++ const IR_ConsumesDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -48158,7 +31453,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ConsumesDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ConsumesDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48168,19 +31463,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ConsumesDefSeq::_tao_any_destructor
++ IR_ConsumesDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConsumesDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConsumesDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ConsumesDefSeq*&,
++ const IR_ConsumesDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ConsumesDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ConsumesDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48194,15 +31489,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ConsumesDefSeq*,
++ const IR_ConsumesDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ConsumesDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ConsumesDefSeq, 0);
++ IR_ConsumesDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ConsumesDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48213,7 +31508,7 @@
+ IR::_tc_ConsumesDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ConsumesDefSeq::_tao_any_destructor
++ IR_ConsumesDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48233,7 +31528,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::FactoryDefSeq &_tao_elem
++ const IR_FactoryDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -48247,7 +31542,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::FactoryDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_FactoryDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48257,19 +31552,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::FactoryDefSeq::_tao_any_destructor
++ IR_FactoryDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FactoryDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FactoryDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::FactoryDefSeq*&,
++ const IR_FactoryDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FactoryDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_FactoryDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48283,15 +31578,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::FactoryDefSeq*,
++ const IR_FactoryDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::FactoryDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::FactoryDefSeq, 0);
++ IR_FactoryDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_FactoryDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48302,7 +31597,7 @@
+ IR::_tc_FactoryDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::FactoryDefSeq::_tao_any_destructor
++ IR_FactoryDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48322,7 +31617,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::FinderDefSeq &_tao_elem
++ const IR_FinderDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -48336,7 +31631,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::FinderDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_FinderDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48346,19 +31641,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::FinderDefSeq::_tao_any_destructor
++ IR_FinderDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FinderDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FinderDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::FinderDefSeq*&,
++ const IR_FinderDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::FinderDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_FinderDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48372,15 +31667,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::FinderDefSeq*,
++ const IR_FinderDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::FinderDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::FinderDefSeq, 0);
++ IR_FinderDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_FinderDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48391,7 +31686,7 @@
+ IR::_tc_FinderDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::FinderDefSeq::_tao_any_destructor
++ IR_FinderDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48411,7 +31706,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ContainedSeq &_tao_elem
++ const IR_ContainedSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -48425,7 +31720,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ContainedSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ContainedSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48435,19 +31730,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ContainedSeq::_tao_any_destructor
++ IR_ContainedSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ContainedSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ContainedSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ContainedSeq*&,
++ const IR_ContainedSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ContainedSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ContainedSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48461,15 +31756,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ContainedSeq*,
++ const IR_ContainedSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ContainedSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ContainedSeq, 0);
++ IR_ContainedSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ContainedSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48480,7 +31775,7 @@
+ IR::_tc_ContainedSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ContainedSeq::_tao_any_destructor
++ IR_ContainedSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48498,7 +31793,7 @@
+ return 0;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::StructMember &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_StructMember &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -48509,7 +31804,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::StructMember *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_StructMember *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48519,16 +31814,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::StructMember::_tao_any_destructor
++ IR_StructMember::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::StructMember *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StructMember *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::StructMember*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_StructMember*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::StructMember *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_StructMember *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48542,15 +31837,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::StructMember*,
++ const IR_StructMember*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::StructMember *tmp;
+- ACE_NEW_RETURN (tmp, IR::StructMember, 0);
++ IR_StructMember *tmp;
++ ACE_NEW_RETURN (tmp, IR_StructMember, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48561,7 +31856,7 @@
+ IR::_tc_StructMember,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::StructMember::_tao_any_destructor
++ IR_StructMember::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48581,7 +31876,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::StructMemberSeq &_tao_elem
++ const IR_StructMemberSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -48595,7 +31890,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::StructMemberSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_StructMemberSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48605,19 +31900,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::StructMemberSeq::_tao_any_destructor
++ IR_StructMemberSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::StructMemberSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StructMemberSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::StructMemberSeq*&,
++ const IR_StructMemberSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::StructMemberSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_StructMemberSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48631,15 +31926,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::StructMemberSeq*,
++ const IR_StructMemberSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::StructMemberSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::StructMemberSeq, 0);
++ IR_StructMemberSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_StructMemberSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48650,7 +31945,7 @@
+ IR::_tc_StructMemberSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::StructMemberSeq::_tao_any_destructor
++ IR_StructMemberSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48668,7 +31963,7 @@
+ return 0;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::Initializer &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_Initializer &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -48679,7 +31974,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::Initializer *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_Initializer *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48689,16 +31984,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::Initializer::_tao_any_destructor
++ IR_Initializer::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Initializer *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Initializer *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::Initializer*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_Initializer*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::Initializer *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Initializer *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48712,15 +32007,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::Initializer*,
++ const IR_Initializer*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::Initializer *tmp;
+- ACE_NEW_RETURN (tmp, IR::Initializer, 0);
++ IR_Initializer *tmp;
++ ACE_NEW_RETURN (tmp, IR_Initializer, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48731,7 +32026,7 @@
+ IR::_tc_Initializer,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::Initializer::_tao_any_destructor
++ IR_Initializer::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48751,7 +32046,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::InitializerSeq &_tao_elem
++ const IR_InitializerSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -48765,7 +32060,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::InitializerSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_InitializerSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48775,19 +32070,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::InitializerSeq::_tao_any_destructor
++ IR_InitializerSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::InitializerSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InitializerSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::InitializerSeq*&,
++ const IR_InitializerSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::InitializerSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_InitializerSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48801,15 +32096,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::InitializerSeq*,
++ const IR_InitializerSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::InitializerSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::InitializerSeq, 0);
++ IR_InitializerSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_InitializerSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48820,7 +32115,7 @@
+ IR::_tc_InitializerSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::InitializerSeq::_tao_any_destructor
++ IR_InitializerSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48838,7 +32133,7 @@
+ return 0;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::UnionMember &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_UnionMember &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -48849,7 +32144,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::UnionMember *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_UnionMember *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48859,16 +32154,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::UnionMember::_tao_any_destructor
++ IR_UnionMember::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UnionMember *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UnionMember *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::UnionMember*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_UnionMember*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UnionMember *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UnionMember *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48882,15 +32177,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::UnionMember*,
++ const IR_UnionMember*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::UnionMember *tmp;
+- ACE_NEW_RETURN (tmp, IR::UnionMember, 0);
++ IR_UnionMember *tmp;
++ ACE_NEW_RETURN (tmp, IR_UnionMember, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48901,7 +32196,7 @@
+ IR::_tc_UnionMember,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::UnionMember::_tao_any_destructor
++ IR_UnionMember::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -48921,7 +32216,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::UnionMemberSeq &_tao_elem
++ const IR_UnionMemberSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -48935,7 +32230,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::UnionMemberSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_UnionMemberSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -48945,19 +32240,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::UnionMemberSeq::_tao_any_destructor
++ IR_UnionMemberSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UnionMemberSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UnionMemberSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::UnionMemberSeq*&,
++ const IR_UnionMemberSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UnionMemberSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UnionMemberSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -48971,15 +32266,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::UnionMemberSeq*,
++ const IR_UnionMemberSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::UnionMemberSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::UnionMemberSeq, 0);
++ IR_UnionMemberSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_UnionMemberSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -48990,7 +32285,7 @@
+ IR::_tc_UnionMemberSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::UnionMemberSeq::_tao_any_destructor
++ IR_UnionMemberSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -49010,7 +32305,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::EnumMemberSeq &_tao_elem
++ const IR_EnumMemberSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -49024,7 +32319,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::EnumMemberSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_EnumMemberSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -49034,19 +32329,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::EnumMemberSeq::_tao_any_destructor
++ IR_EnumMemberSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EnumMemberSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EnumMemberSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::EnumMemberSeq*&,
++ const IR_EnumMemberSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EnumMemberSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EnumMemberSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -49060,15 +32355,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::EnumMemberSeq*,
++ const IR_EnumMemberSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::EnumMemberSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::EnumMemberSeq, 0);
++ IR_EnumMemberSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_EnumMemberSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -49079,7 +32374,7 @@
+ IR::_tc_EnumMemberSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::EnumMemberSeq::_tao_any_destructor
++ IR_EnumMemberSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -49097,11 +32392,11 @@
+ return 0;
+ }
+
+-IR::_TAO_Container_Proxy_Broker * (*IR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
++_TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::Container_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_Container_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -49111,17 +32406,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::Container::_duplicate (_tao_elem),
+- IR::Container::_tao_any_destructor
++ IR_Container::_duplicate (_tao_elem),
++ IR_Container::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Container_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Container_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::Container::_nil ();
++ _tao_elem = IR_Container::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_Container, ACE_TRY_ENV)) // not equal
+ {
+@@ -49138,65 +32433,65 @@
+ IR::_tc_Container,
+ 1,
+ _tao_elem,
+- IR::Container::_tao_any_destructor
++ IR_Container::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::Container::_nil ();
++ _tao_elem = IR_Container::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::Container::_nil ();
++ _tao_elem = IR_Container::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::Container,IR::Container_var>;
++ template class TAO_Object_Manager<IR_Container,IR_Container_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::Container,IR::Container_var>
++ # pragma instantiate TAO_Object_Manager<IR_Container,IR_Container_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::Container::Description &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_Container::Description &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+ _tao_any._tao_replace (
+- IR::Container::_tc_Description,
++ IR_Container::_tc_Description,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin ()
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::Container::Description *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_Container::Description *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+ _tao_any._tao_replace (
+- IR::Container::_tc_Description,
++ IR_Container::_tc_Description,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::Container::Description::_tao_any_destructor
++ IR_Container::Description::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Container::Description *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Container::Description *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::Container::Description*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_Container::Description*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::Container::Description *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Container::Description *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+- if (!type->equivalent (IR::Container::_tc_Description, ACE_TRY_ENV)) // not equal
++ if (!type->equivalent (IR_Container::_tc_Description, ACE_TRY_ENV)) // not equal
+ {
+ return 0;
+ }
+@@ -49204,15 +32499,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::Container::Description*,
++ const IR_Container::Description*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::Container::Description *tmp;
+- ACE_NEW_RETURN (tmp, IR::Container::Description, 0);
++ IR_Container::Description *tmp;
++ ACE_NEW_RETURN (tmp, IR_Container::Description, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -49220,10 +32515,10 @@
+ if (stream >> *tmp)
+ {
+ ((CORBA::Any *)&_tao_any)->_tao_replace (
+- IR::Container::_tc_Description,
++ IR_Container::_tc_Description,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::Container::Description::_tao_any_destructor
++ IR_Container::Description::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -49243,49 +32538,49 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::Container::DescriptionSeq &_tao_elem
++ const IR_Container::DescriptionSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+ {
+ _tao_any._tao_replace (
+- IR::Container::_tc_DescriptionSeq,
++ IR_Container::_tc_DescriptionSeq,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin ()
+ );
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::Container::DescriptionSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_Container::DescriptionSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+ _tao_any._tao_replace (
+- IR::Container::_tc_DescriptionSeq,
++ IR_Container::_tc_DescriptionSeq,
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::Container::DescriptionSeq::_tao_any_destructor
++ IR_Container::DescriptionSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Container::DescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Container::DescriptionSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::Container::DescriptionSeq*&,
++ const IR_Container::DescriptionSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::Container::DescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_Container::DescriptionSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+ {
+ CORBA::TypeCode_var type = _tao_any.type ();
+- if (!type->equivalent (IR::Container::_tc_DescriptionSeq, ACE_TRY_ENV)) // not equal
++ if (!type->equivalent (IR_Container::_tc_DescriptionSeq, ACE_TRY_ENV)) // not equal
+ {
+ return 0;
+ }
+@@ -49293,15 +32588,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::Container::DescriptionSeq*,
++ const IR_Container::DescriptionSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::Container::DescriptionSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::Container::DescriptionSeq, 0);
++ IR_Container::DescriptionSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_Container::DescriptionSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -49309,10 +32604,10 @@
+ if (stream >> *tmp)
+ {
+ ((CORBA::Any *)&_tao_any)->_tao_replace (
+- IR::Container::_tc_DescriptionSeq,
++ IR_Container::_tc_DescriptionSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::Container::DescriptionSeq::_tao_any_destructor
++ IR_Container::DescriptionSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -49330,11 +32625,11 @@
+ return 0;
+ }
+
+-IR::_TAO_IDLType_Proxy_Broker * (*IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
++_TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::IDLType_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_IDLType_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -49344,17 +32639,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::IDLType::_duplicate (_tao_elem),
+- IR::IDLType::_tao_any_destructor
++ IR_IDLType::_duplicate (_tao_elem),
++ IR_IDLType::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::IDLType_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_IDLType_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::IDLType::_nil ();
++ _tao_elem = IR_IDLType::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_IDLType, ACE_TRY_ENV)) // not equal
+ {
+@@ -49371,29 +32666,29 @@
+ IR::_tc_IDLType,
+ 1,
+ _tao_elem,
+- IR::IDLType::_tao_any_destructor
++ IR_IDLType::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::IDLType::_nil ();
++ _tao_elem = IR_IDLType::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::IDLType::_nil ();
++ _tao_elem = IR_IDLType::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::IDLType,IR::IDLType_var>;
++ template class TAO_Object_Manager<IR_IDLType,IR_IDLType_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::IDLType,IR::IDLType_var>
++ # pragma instantiate TAO_Object_Manager<IR_IDLType,IR_IDLType_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, IR::PrimitiveKind _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_PrimitiveKind _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -49404,7 +32699,7 @@
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimitiveKind &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimitiveKind &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+@@ -49431,11 +32726,11 @@
+ return 0;
+ }
+
+-IR::_TAO_Repository_Proxy_Broker * (*IR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
++_TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::Repository_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_Repository_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -49445,17 +32740,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::Repository::_duplicate (_tao_elem),
+- IR::Repository::_tao_any_destructor
++ IR_Repository::_duplicate (_tao_elem),
++ IR_Repository::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::Repository_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_Repository_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::Repository::_nil ();
++ _tao_elem = IR_Repository::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_Repository, ACE_TRY_ENV)) // not equal
+ {
+@@ -49472,33 +32767,33 @@
+ IR::_tc_Repository,
+ 1,
+ _tao_elem,
+- IR::Repository::_tao_any_destructor
++ IR_Repository::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::Repository::_nil ();
++ _tao_elem = IR_Repository::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::Repository::_nil ();
++ _tao_elem = IR_Repository::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::Repository,IR::Repository_var>;
++ template class TAO_Object_Manager<IR_Repository,IR_Repository_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::Repository,IR::Repository_var>
++ # pragma instantiate TAO_Object_Manager<IR_Repository,IR_Repository_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_ComponentRepository_Proxy_Broker * (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
++_TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ComponentRepository_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ComponentRepository_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -49508,17 +32803,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ComponentRepository::_duplicate (_tao_elem),
+- IR::ComponentRepository::_tao_any_destructor
++ IR_ComponentRepository::_duplicate (_tao_elem),
++ IR_ComponentRepository::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentRepository_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentRepository_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ComponentRepository::_nil ();
++ _tao_elem = IR_ComponentRepository::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ComponentRepository, ACE_TRY_ENV)) // not equal
+ {
+@@ -49535,33 +32830,33 @@
+ IR::_tc_ComponentRepository,
+ 1,
+ _tao_elem,
+- IR::ComponentRepository::_tao_any_destructor
++ IR_ComponentRepository::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ComponentRepository::_nil ();
++ _tao_elem = IR_ComponentRepository::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ComponentRepository::_nil ();
++ _tao_elem = IR_ComponentRepository::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ComponentRepository,IR::ComponentRepository_var>;
++ template class TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ComponentRepository,IR::ComponentRepository_var>
++ # pragma instantiate TAO_Object_Manager<IR_ComponentRepository,IR_ComponentRepository_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_ModuleDef_Proxy_Broker * (*IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ModuleDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ModuleDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -49571,17 +32866,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ModuleDef::_duplicate (_tao_elem),
+- IR::ModuleDef::_tao_any_destructor
++ IR_ModuleDef::_duplicate (_tao_elem),
++ IR_ModuleDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ModuleDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ModuleDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ModuleDef::_nil ();
++ _tao_elem = IR_ModuleDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ModuleDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -49598,29 +32893,29 @@
+ IR::_tc_ModuleDef,
+ 1,
+ _tao_elem,
+- IR::ModuleDef::_tao_any_destructor
++ IR_ModuleDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ModuleDef::_nil ();
++ _tao_elem = IR_ModuleDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ModuleDef::_nil ();
++ _tao_elem = IR_ModuleDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ModuleDef,IR::ModuleDef_var>;
++ template class TAO_Object_Manager<IR_ModuleDef,IR_ModuleDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ModuleDef,IR::ModuleDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ModuleDef,IR_ModuleDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::ModuleDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_ModuleDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -49631,7 +32926,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ModuleDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ModuleDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -49641,16 +32936,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ModuleDescription::_tao_any_destructor
++ IR_ModuleDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ModuleDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ModuleDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::ModuleDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_ModuleDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ModuleDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ModuleDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -49664,15 +32959,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ModuleDescription*,
++ const IR_ModuleDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ModuleDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::ModuleDescription, 0);
++ IR_ModuleDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_ModuleDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -49683,7 +32978,7 @@
+ IR::_tc_ModuleDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ModuleDescription::_tao_any_destructor
++ IR_ModuleDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -49701,11 +32996,11 @@
+ return 0;
+ }
+
+-IR::_TAO_ConstantDef_Proxy_Broker * (*IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ConstantDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ConstantDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -49715,17 +33010,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ConstantDef::_duplicate (_tao_elem),
+- IR::ConstantDef::_tao_any_destructor
++ IR_ConstantDef::_duplicate (_tao_elem),
++ IR_ConstantDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConstantDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConstantDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ConstantDef::_nil ();
++ _tao_elem = IR_ConstantDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ConstantDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -49742,29 +33037,29 @@
+ IR::_tc_ConstantDef,
+ 1,
+ _tao_elem,
+- IR::ConstantDef::_tao_any_destructor
++ IR_ConstantDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ConstantDef::_nil ();
++ _tao_elem = IR_ConstantDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ConstantDef::_nil ();
++ _tao_elem = IR_ConstantDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ConstantDef,IR::ConstantDef_var>;
++ template class TAO_Object_Manager<IR_ConstantDef,IR_ConstantDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ConstantDef,IR::ConstantDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ConstantDef,IR_ConstantDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::ConstantDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_ConstantDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -49775,7 +33070,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ConstantDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ConstantDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -49785,16 +33080,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ConstantDescription::_tao_any_destructor
++ IR_ConstantDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConstantDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConstantDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::ConstantDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_ConstantDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ConstantDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ConstantDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -49808,15 +33103,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ConstantDescription*,
++ const IR_ConstantDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ConstantDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::ConstantDescription, 0);
++ IR_ConstantDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_ConstantDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -49827,7 +33122,7 @@
+ IR::_tc_ConstantDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ConstantDescription::_tao_any_destructor
++ IR_ConstantDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -49845,11 +33140,11 @@
+ return 0;
+ }
+
+-IR::_TAO_TypedefDef_Proxy_Broker * (*IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::TypedefDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_TypedefDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -49859,17 +33154,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::TypedefDef::_duplicate (_tao_elem),
+- IR::TypedefDef::_tao_any_destructor
++ IR_TypedefDef::_duplicate (_tao_elem),
++ IR_TypedefDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::TypedefDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_TypedefDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::TypedefDef::_nil ();
++ _tao_elem = IR_TypedefDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_TypedefDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -49886,29 +33181,29 @@
+ IR::_tc_TypedefDef,
+ 1,
+ _tao_elem,
+- IR::TypedefDef::_tao_any_destructor
++ IR_TypedefDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::TypedefDef::_nil ();
++ _tao_elem = IR_TypedefDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::TypedefDef::_nil ();
++ _tao_elem = IR_TypedefDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::TypedefDef,IR::TypedefDef_var>;
++ template class TAO_Object_Manager<IR_TypedefDef,IR_TypedefDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::TypedefDef,IR::TypedefDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_TypedefDef,IR_TypedefDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::TypeDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_TypeDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -49919,7 +33214,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::TypeDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_TypeDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -49929,16 +33224,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::TypeDescription::_tao_any_destructor
++ IR_TypeDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::TypeDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_TypeDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::TypeDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_TypeDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::TypeDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_TypeDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -49952,15 +33247,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::TypeDescription*,
++ const IR_TypeDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::TypeDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::TypeDescription, 0);
++ IR_TypeDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_TypeDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -49971,7 +33266,7 @@
+ IR::_tc_TypeDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::TypeDescription::_tao_any_destructor
++ IR_TypeDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -49989,11 +33284,11 @@
+ return 0;
+ }
+
+-IR::_TAO_StructDef_Proxy_Broker * (*IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::StructDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_StructDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50003,17 +33298,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::StructDef::_duplicate (_tao_elem),
+- IR::StructDef::_tao_any_destructor
++ IR_StructDef::_duplicate (_tao_elem),
++ IR_StructDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::StructDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StructDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::StructDef::_nil ();
++ _tao_elem = IR_StructDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_StructDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50030,33 +33325,33 @@
+ IR::_tc_StructDef,
+ 1,
+ _tao_elem,
+- IR::StructDef::_tao_any_destructor
++ IR_StructDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::StructDef::_nil ();
++ _tao_elem = IR_StructDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::StructDef::_nil ();
++ _tao_elem = IR_StructDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::StructDef,IR::StructDef_var>;
++ template class TAO_Object_Manager<IR_StructDef,IR_StructDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::StructDef,IR::StructDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_StructDef,IR_StructDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_UnionDef_Proxy_Broker * (*IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::UnionDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_UnionDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50066,17 +33361,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::UnionDef::_duplicate (_tao_elem),
+- IR::UnionDef::_tao_any_destructor
++ IR_UnionDef::_duplicate (_tao_elem),
++ IR_UnionDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UnionDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UnionDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::UnionDef::_nil ();
++ _tao_elem = IR_UnionDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_UnionDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50093,33 +33388,33 @@
+ IR::_tc_UnionDef,
+ 1,
+ _tao_elem,
+- IR::UnionDef::_tao_any_destructor
++ IR_UnionDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::UnionDef::_nil ();
++ _tao_elem = IR_UnionDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::UnionDef::_nil ();
++ _tao_elem = IR_UnionDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::UnionDef,IR::UnionDef_var>;
++ template class TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::UnionDef,IR::UnionDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_UnionDef,IR_UnionDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_EnumDef_Proxy_Broker * (*IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::EnumDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_EnumDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50129,17 +33424,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::EnumDef::_duplicate (_tao_elem),
+- IR::EnumDef::_tao_any_destructor
++ IR_EnumDef::_duplicate (_tao_elem),
++ IR_EnumDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EnumDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EnumDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::EnumDef::_nil ();
++ _tao_elem = IR_EnumDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_EnumDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50156,33 +33451,33 @@
+ IR::_tc_EnumDef,
+ 1,
+ _tao_elem,
+- IR::EnumDef::_tao_any_destructor
++ IR_EnumDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::EnumDef::_nil ();
++ _tao_elem = IR_EnumDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::EnumDef::_nil ();
++ _tao_elem = IR_EnumDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::EnumDef,IR::EnumDef_var>;
++ template class TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::EnumDef,IR::EnumDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_EnumDef,IR_EnumDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_AliasDef_Proxy_Broker * (*IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::AliasDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_AliasDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50192,17 +33487,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::AliasDef::_duplicate (_tao_elem),
+- IR::AliasDef::_tao_any_destructor
++ IR_AliasDef::_duplicate (_tao_elem),
++ IR_AliasDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AliasDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AliasDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::AliasDef::_nil ();
++ _tao_elem = IR_AliasDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_AliasDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50219,33 +33514,33 @@
+ IR::_tc_AliasDef,
+ 1,
+ _tao_elem,
+- IR::AliasDef::_tao_any_destructor
++ IR_AliasDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::AliasDef::_nil ();
++ _tao_elem = IR_AliasDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::AliasDef::_nil ();
++ _tao_elem = IR_AliasDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::AliasDef,IR::AliasDef_var>;
++ template class TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::AliasDef,IR::AliasDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_AliasDef,IR_AliasDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_NativeDef_Proxy_Broker * (*IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::NativeDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_NativeDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50255,17 +33550,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::NativeDef::_duplicate (_tao_elem),
+- IR::NativeDef::_tao_any_destructor
++ IR_NativeDef::_duplicate (_tao_elem),
++ IR_NativeDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::NativeDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_NativeDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::NativeDef::_nil ();
++ _tao_elem = IR_NativeDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_NativeDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50282,33 +33577,33 @@
+ IR::_tc_NativeDef,
+ 1,
+ _tao_elem,
+- IR::NativeDef::_tao_any_destructor
++ IR_NativeDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::NativeDef::_nil ();
++ _tao_elem = IR_NativeDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::NativeDef::_nil ();
++ _tao_elem = IR_NativeDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::NativeDef,IR::NativeDef_var>;
++ template class TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::NativeDef,IR::NativeDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_NativeDef,IR_NativeDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_PrimitiveDef_Proxy_Broker * (*IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::PrimitiveDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_PrimitiveDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50318,17 +33613,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::PrimitiveDef::_duplicate (_tao_elem),
+- IR::PrimitiveDef::_tao_any_destructor
++ IR_PrimitiveDef::_duplicate (_tao_elem),
++ IR_PrimitiveDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimitiveDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimitiveDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::PrimitiveDef::_nil ();
++ _tao_elem = IR_PrimitiveDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_PrimitiveDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50345,33 +33640,33 @@
+ IR::_tc_PrimitiveDef,
+ 1,
+ _tao_elem,
+- IR::PrimitiveDef::_tao_any_destructor
++ IR_PrimitiveDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::PrimitiveDef::_nil ();
++ _tao_elem = IR_PrimitiveDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::PrimitiveDef::_nil ();
++ _tao_elem = IR_PrimitiveDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::PrimitiveDef,IR::PrimitiveDef_var>;
++ template class TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::PrimitiveDef,IR::PrimitiveDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_PrimitiveDef,IR_PrimitiveDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_StringDef_Proxy_Broker * (*IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::StringDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_StringDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50381,17 +33676,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::StringDef::_duplicate (_tao_elem),
+- IR::StringDef::_tao_any_destructor
++ IR_StringDef::_duplicate (_tao_elem),
++ IR_StringDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::StringDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_StringDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::StringDef::_nil ();
++ _tao_elem = IR_StringDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_StringDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50408,33 +33703,33 @@
+ IR::_tc_StringDef,
+ 1,
+ _tao_elem,
+- IR::StringDef::_tao_any_destructor
++ IR_StringDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::StringDef::_nil ();
++ _tao_elem = IR_StringDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::StringDef::_nil ();
++ _tao_elem = IR_StringDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::StringDef,IR::StringDef_var>;
++ template class TAO_Object_Manager<IR_StringDef,IR_StringDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::StringDef,IR::StringDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_StringDef,IR_StringDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_WstringDef_Proxy_Broker * (*IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::WstringDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_WstringDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50444,17 +33739,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::WstringDef::_duplicate (_tao_elem),
+- IR::WstringDef::_tao_any_destructor
++ IR_WstringDef::_duplicate (_tao_elem),
++ IR_WstringDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::WstringDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_WstringDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::WstringDef::_nil ();
++ _tao_elem = IR_WstringDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_WstringDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50471,33 +33766,33 @@
+ IR::_tc_WstringDef,
+ 1,
+ _tao_elem,
+- IR::WstringDef::_tao_any_destructor
++ IR_WstringDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::WstringDef::_nil ();
++ _tao_elem = IR_WstringDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::WstringDef::_nil ();
++ _tao_elem = IR_WstringDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::WstringDef,IR::WstringDef_var>;
++ template class TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::WstringDef,IR::WstringDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_WstringDef,IR_WstringDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_FixedDef_Proxy_Broker * (*IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::FixedDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_FixedDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50507,17 +33802,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::FixedDef::_duplicate (_tao_elem),
+- IR::FixedDef::_tao_any_destructor
++ IR_FixedDef::_duplicate (_tao_elem),
++ IR_FixedDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FixedDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FixedDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::FixedDef::_nil ();
++ _tao_elem = IR_FixedDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_FixedDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50534,33 +33829,33 @@
+ IR::_tc_FixedDef,
+ 1,
+ _tao_elem,
+- IR::FixedDef::_tao_any_destructor
++ IR_FixedDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::FixedDef::_nil ();
++ _tao_elem = IR_FixedDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::FixedDef::_nil ();
++ _tao_elem = IR_FixedDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::FixedDef,IR::FixedDef_var>;
++ template class TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::FixedDef,IR::FixedDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_FixedDef,IR_FixedDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_SequenceDef_Proxy_Broker * (*IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::SequenceDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_SequenceDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50570,17 +33865,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::SequenceDef::_duplicate (_tao_elem),
+- IR::SequenceDef::_tao_any_destructor
++ IR_SequenceDef::_duplicate (_tao_elem),
++ IR_SequenceDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::SequenceDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_SequenceDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::SequenceDef::_nil ();
++ _tao_elem = IR_SequenceDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_SequenceDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50597,33 +33892,33 @@
+ IR::_tc_SequenceDef,
+ 1,
+ _tao_elem,
+- IR::SequenceDef::_tao_any_destructor
++ IR_SequenceDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::SequenceDef::_nil ();
++ _tao_elem = IR_SequenceDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::SequenceDef::_nil ();
++ _tao_elem = IR_SequenceDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::SequenceDef,IR::SequenceDef_var>;
++ template class TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::SequenceDef,IR::SequenceDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_SequenceDef,IR_SequenceDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_ArrayDef_Proxy_Broker * (*IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ArrayDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ArrayDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50633,17 +33928,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ArrayDef::_duplicate (_tao_elem),
+- IR::ArrayDef::_tao_any_destructor
++ IR_ArrayDef::_duplicate (_tao_elem),
++ IR_ArrayDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ArrayDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ArrayDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ArrayDef::_nil ();
++ _tao_elem = IR_ArrayDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ArrayDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50660,33 +33955,33 @@
+ IR::_tc_ArrayDef,
+ 1,
+ _tao_elem,
+- IR::ArrayDef::_tao_any_destructor
++ IR_ArrayDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ArrayDef::_nil ();
++ _tao_elem = IR_ArrayDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ArrayDef::_nil ();
++ _tao_elem = IR_ArrayDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ArrayDef,IR::ArrayDef_var>;
++ template class TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ArrayDef,IR::ArrayDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ArrayDef,IR_ArrayDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_ExceptionDef_Proxy_Broker * (*IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ExceptionDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ExceptionDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -50696,17 +33991,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ExceptionDef::_duplicate (_tao_elem),
+- IR::ExceptionDef::_tao_any_destructor
++ IR_ExceptionDef::_duplicate (_tao_elem),
++ IR_ExceptionDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ExceptionDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExceptionDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ExceptionDef::_nil ();
++ _tao_elem = IR_ExceptionDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ExceptionDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -50723,29 +34018,29 @@
+ IR::_tc_ExceptionDef,
+ 1,
+ _tao_elem,
+- IR::ExceptionDef::_tao_any_destructor
++ IR_ExceptionDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ExceptionDef::_nil ();
++ _tao_elem = IR_ExceptionDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ExceptionDef::_nil ();
++ _tao_elem = IR_ExceptionDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var>;
++ template class TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::ExceptionDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_ExceptionDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -50756,7 +34051,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ExceptionDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ExceptionDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -50766,16 +34061,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ExceptionDescription::_tao_any_destructor
++ IR_ExceptionDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ExceptionDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExceptionDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::ExceptionDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_ExceptionDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ExceptionDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ExceptionDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -50789,15 +34084,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ExceptionDescription*,
++ const IR_ExceptionDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ExceptionDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::ExceptionDescription, 0);
++ IR_ExceptionDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_ExceptionDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -50808,7 +34103,7 @@
+ IR::_tc_ExceptionDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ExceptionDescription::_tao_any_destructor
++ IR_ExceptionDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -50828,7 +34123,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ExceptionDefSeq &_tao_elem
++ const IR_ExceptionDefSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -50842,7 +34137,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ExceptionDefSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ExceptionDefSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -50852,19 +34147,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ExceptionDefSeq::_tao_any_destructor
++ IR_ExceptionDefSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ExceptionDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExceptionDefSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ExceptionDefSeq*&,
++ const IR_ExceptionDefSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ExceptionDefSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ExceptionDefSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -50878,15 +34173,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ExceptionDefSeq*,
++ const IR_ExceptionDefSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ExceptionDefSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ExceptionDefSeq, 0);
++ IR_ExceptionDefSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ExceptionDefSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -50897,7 +34192,7 @@
+ IR::_tc_ExceptionDefSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ExceptionDefSeq::_tao_any_destructor
++ IR_ExceptionDefSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -50917,7 +34212,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ExcDescriptionSeq &_tao_elem
++ const IR_ExcDescriptionSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -50931,7 +34226,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ExcDescriptionSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ExcDescriptionSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -50941,19 +34236,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ExcDescriptionSeq::_tao_any_destructor
++ IR_ExcDescriptionSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ExcDescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ExcDescriptionSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ExcDescriptionSeq*&,
++ const IR_ExcDescriptionSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ExcDescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ExcDescriptionSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -50967,15 +34262,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ExcDescriptionSeq*,
++ const IR_ExcDescriptionSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ExcDescriptionSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ExcDescriptionSeq, 0);
++ IR_ExcDescriptionSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ExcDescriptionSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -50986,7 +34281,7 @@
+ IR::_tc_ExcDescriptionSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ExcDescriptionSeq::_tao_any_destructor
++ IR_ExcDescriptionSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51004,7 +34299,7 @@
+ return 0;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::AttributeMode _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_AttributeMode _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -51015,7 +34310,7 @@
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttributeMode &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeMode &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+@@ -51042,11 +34337,11 @@
+ return 0;
+ }
+
+-IR::_TAO_AttributeDef_Proxy_Broker * (*IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::AttributeDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_AttributeDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -51056,17 +34351,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::AttributeDef::_duplicate (_tao_elem),
+- IR::AttributeDef::_tao_any_destructor
++ IR_AttributeDef::_duplicate (_tao_elem),
++ IR_AttributeDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttributeDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::AttributeDef::_nil ();
++ _tao_elem = IR_AttributeDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_AttributeDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -51083,29 +34378,29 @@
+ IR::_tc_AttributeDef,
+ 1,
+ _tao_elem,
+- IR::AttributeDef::_tao_any_destructor
++ IR_AttributeDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::AttributeDef::_nil ();
++ _tao_elem = IR_AttributeDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::AttributeDef::_nil ();
++ _tao_elem = IR_AttributeDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::AttributeDef,IR::AttributeDef_var>;
++ template class TAO_Object_Manager<IR_AttributeDef,IR_AttributeDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::AttributeDef,IR::AttributeDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_AttributeDef,IR_AttributeDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::AttributeDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_AttributeDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -51116,7 +34411,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::AttributeDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_AttributeDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -51126,16 +34421,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::AttributeDescription::_tao_any_destructor
++ IR_AttributeDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttributeDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttributeDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::AttributeDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_AttributeDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::AttributeDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_AttributeDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -51149,15 +34444,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::AttributeDescription*,
++ const IR_AttributeDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::AttributeDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::AttributeDescription, 0);
++ IR_AttributeDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_AttributeDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -51168,7 +34463,7 @@
+ IR::_tc_AttributeDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::AttributeDescription::_tao_any_destructor
++ IR_AttributeDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51186,7 +34481,7 @@
+ return 0;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::OperationMode _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_OperationMode _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -51197,7 +34492,7 @@
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OperationMode &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OperationMode &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+@@ -51224,7 +34519,7 @@
+ return 0;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ParameterMode _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ParameterMode _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -51235,7 +34530,7 @@
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ParameterMode &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ParameterMode &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+@@ -51262,7 +34557,7 @@
+ return 0;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::ParameterDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_ParameterDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -51273,7 +34568,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ParameterDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ParameterDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -51283,16 +34578,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ParameterDescription::_tao_any_destructor
++ IR_ParameterDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ParameterDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ParameterDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::ParameterDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_ParameterDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ParameterDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ParameterDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -51306,15 +34601,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ParameterDescription*,
++ const IR_ParameterDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ParameterDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::ParameterDescription, 0);
++ IR_ParameterDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_ParameterDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -51325,7 +34620,7 @@
+ IR::_tc_ParameterDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ParameterDescription::_tao_any_destructor
++ IR_ParameterDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51345,7 +34640,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ParDescriptionSeq &_tao_elem
++ const IR_ParDescriptionSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -51359,7 +34654,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ParDescriptionSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ParDescriptionSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -51369,19 +34664,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ParDescriptionSeq::_tao_any_destructor
++ IR_ParDescriptionSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ParDescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ParDescriptionSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ParDescriptionSeq*&,
++ const IR_ParDescriptionSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ParDescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ParDescriptionSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -51395,15 +34690,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ParDescriptionSeq*,
++ const IR_ParDescriptionSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ParDescriptionSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ParDescriptionSeq, 0);
++ IR_ParDescriptionSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ParDescriptionSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -51414,7 +34709,7 @@
+ IR::_tc_ParDescriptionSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ParDescriptionSeq::_tao_any_destructor
++ IR_ParDescriptionSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51434,7 +34729,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ContextIdSeq &_tao_elem
++ const IR_ContextIdSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -51448,7 +34743,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ContextIdSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ContextIdSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -51458,19 +34753,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ContextIdSeq::_tao_any_destructor
++ IR_ContextIdSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ContextIdSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ContextIdSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ContextIdSeq*&,
++ const IR_ContextIdSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ContextIdSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ContextIdSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -51484,15 +34779,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ContextIdSeq*,
++ const IR_ContextIdSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ContextIdSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ContextIdSeq, 0);
++ IR_ContextIdSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ContextIdSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -51503,7 +34798,7 @@
+ IR::_tc_ContextIdSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ContextIdSeq::_tao_any_destructor
++ IR_ContextIdSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51521,11 +34816,11 @@
+ return 0;
+ }
+
+-IR::_TAO_OperationDef_Proxy_Broker * (*IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::OperationDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_OperationDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -51535,17 +34830,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::OperationDef::_duplicate (_tao_elem),
+- IR::OperationDef::_tao_any_destructor
++ IR_OperationDef::_duplicate (_tao_elem),
++ IR_OperationDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OperationDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OperationDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::OperationDef::_nil ();
++ _tao_elem = IR_OperationDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_OperationDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -51562,29 +34857,29 @@
+ IR::_tc_OperationDef,
+ 1,
+ _tao_elem,
+- IR::OperationDef::_tao_any_destructor
++ IR_OperationDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::OperationDef::_nil ();
++ _tao_elem = IR_OperationDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::OperationDef::_nil ();
++ _tao_elem = IR_OperationDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::OperationDef,IR::OperationDef_var>;
++ template class TAO_Object_Manager<IR_OperationDef,IR_OperationDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::OperationDef,IR::OperationDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_OperationDef,IR_OperationDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::OperationDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_OperationDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -51595,7 +34890,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::OperationDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_OperationDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -51605,16 +34900,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::OperationDescription::_tao_any_destructor
++ IR_OperationDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OperationDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OperationDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::OperationDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_OperationDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::OperationDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_OperationDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -51628,15 +34923,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::OperationDescription*,
++ const IR_OperationDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::OperationDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::OperationDescription, 0);
++ IR_OperationDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_OperationDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -51647,7 +34942,7 @@
+ IR::_tc_OperationDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::OperationDescription::_tao_any_destructor
++ IR_OperationDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51667,7 +34962,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::RepositoryIdSeq &_tao_elem
++ const IR_RepositoryIdSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -51681,7 +34976,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::RepositoryIdSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_RepositoryIdSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -51691,19 +34986,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::RepositoryIdSeq::_tao_any_destructor
++ IR_RepositoryIdSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::RepositoryIdSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_RepositoryIdSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::RepositoryIdSeq*&,
++ const IR_RepositoryIdSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::RepositoryIdSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_RepositoryIdSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -51717,15 +35012,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::RepositoryIdSeq*,
++ const IR_RepositoryIdSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::RepositoryIdSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::RepositoryIdSeq, 0);
++ IR_RepositoryIdSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_RepositoryIdSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -51736,7 +35031,7 @@
+ IR::_tc_RepositoryIdSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::RepositoryIdSeq::_tao_any_destructor
++ IR_RepositoryIdSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51756,7 +35051,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::OpDescriptionSeq &_tao_elem
++ const IR_OpDescriptionSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -51770,7 +35065,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::OpDescriptionSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_OpDescriptionSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -51780,19 +35075,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::OpDescriptionSeq::_tao_any_destructor
++ IR_OpDescriptionSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::OpDescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_OpDescriptionSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::OpDescriptionSeq*&,
++ const IR_OpDescriptionSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::OpDescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_OpDescriptionSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -51806,15 +35101,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::OpDescriptionSeq*,
++ const IR_OpDescriptionSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::OpDescriptionSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::OpDescriptionSeq, 0);
++ IR_OpDescriptionSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_OpDescriptionSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -51825,7 +35120,7 @@
+ IR::_tc_OpDescriptionSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::OpDescriptionSeq::_tao_any_destructor
++ IR_OpDescriptionSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51845,7 +35140,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::AttrDescriptionSeq &_tao_elem
++ const IR_AttrDescriptionSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -51859,7 +35154,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::AttrDescriptionSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_AttrDescriptionSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -51869,19 +35164,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::AttrDescriptionSeq::_tao_any_destructor
++ IR_AttrDescriptionSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::AttrDescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_AttrDescriptionSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::AttrDescriptionSeq*&,
++ const IR_AttrDescriptionSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::AttrDescriptionSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_AttrDescriptionSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -51895,15 +35190,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::AttrDescriptionSeq*,
++ const IR_AttrDescriptionSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::AttrDescriptionSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::AttrDescriptionSeq, 0);
++ IR_AttrDescriptionSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_AttrDescriptionSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -51914,7 +35209,7 @@
+ IR::_tc_AttrDescriptionSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::AttrDescriptionSeq::_tao_any_destructor
++ IR_AttrDescriptionSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -51932,11 +35227,11 @@
+ return 0;
+ }
+
+-IR::_TAO_InterfaceDef_Proxy_Broker * (*IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::InterfaceDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_InterfaceDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -51946,17 +35241,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::InterfaceDef::_duplicate (_tao_elem),
+- IR::InterfaceDef::_tao_any_destructor
++ IR_InterfaceDef::_duplicate (_tao_elem),
++ IR_InterfaceDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::InterfaceDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InterfaceDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::InterfaceDef::_nil ();
++ _tao_elem = IR_InterfaceDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_InterfaceDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -51973,29 +35268,29 @@
+ IR::_tc_InterfaceDef,
+ 1,
+ _tao_elem,
+- IR::InterfaceDef::_tao_any_destructor
++ IR_InterfaceDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::InterfaceDef::_nil ();
++ _tao_elem = IR_InterfaceDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::InterfaceDef::_nil ();
++ _tao_elem = IR_InterfaceDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var>;
++ template class TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::InterfaceDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_InterfaceDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -52006,7 +35301,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::InterfaceDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_InterfaceDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -52016,16 +35311,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::InterfaceDescription::_tao_any_destructor
++ IR_InterfaceDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::InterfaceDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_InterfaceDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::InterfaceDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_InterfaceDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::InterfaceDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_InterfaceDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -52039,15 +35334,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::InterfaceDescription*,
++ const IR_InterfaceDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::InterfaceDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::InterfaceDescription, 0);
++ IR_InterfaceDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_InterfaceDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -52058,7 +35353,7 @@
+ IR::_tc_InterfaceDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::InterfaceDescription::_tao_any_destructor
++ IR_InterfaceDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -52076,7 +35371,7 @@
+ return 0;
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::ValueMember &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_ValueMember &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -52087,7 +35382,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ValueMember *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ValueMember *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -52097,16 +35392,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ValueMember::_tao_any_destructor
++ IR_ValueMember::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueMember *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueMember *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::ValueMember*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_ValueMember*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ValueMember *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueMember *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -52120,15 +35415,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ValueMember*,
++ const IR_ValueMember*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ValueMember *tmp;
+- ACE_NEW_RETURN (tmp, IR::ValueMember, 0);
++ IR_ValueMember *tmp;
++ ACE_NEW_RETURN (tmp, IR_ValueMember, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -52139,7 +35434,7 @@
+ IR::_tc_ValueMember,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ValueMember::_tao_any_destructor
++ IR_ValueMember::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -52159,7 +35454,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ValueMemberSeq &_tao_elem
++ const IR_ValueMemberSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -52173,7 +35468,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ValueMemberSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ValueMemberSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -52183,19 +35478,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ValueMemberSeq::_tao_any_destructor
++ IR_ValueMemberSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueMemberSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueMemberSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ValueMemberSeq*&,
++ const IR_ValueMemberSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ValueMemberSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueMemberSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -52209,15 +35504,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ValueMemberSeq*,
++ const IR_ValueMemberSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ValueMemberSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ValueMemberSeq, 0);
++ IR_ValueMemberSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ValueMemberSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -52228,7 +35523,7 @@
+ IR::_tc_ValueMemberSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ValueMemberSeq::_tao_any_destructor
++ IR_ValueMemberSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -52246,11 +35541,11 @@
+ return 0;
+ }
+
+-IR::_TAO_ValueMemberDef_Proxy_Broker * (*IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ValueMemberDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ValueMemberDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -52260,17 +35555,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ValueMemberDef::_duplicate (_tao_elem),
+- IR::ValueMemberDef::_tao_any_destructor
++ IR_ValueMemberDef::_duplicate (_tao_elem),
++ IR_ValueMemberDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueMemberDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueMemberDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ValueMemberDef::_nil ();
++ _tao_elem = IR_ValueMemberDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ValueMemberDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -52287,33 +35582,33 @@
+ IR::_tc_ValueMemberDef,
+ 1,
+ _tao_elem,
+- IR::ValueMemberDef::_tao_any_destructor
++ IR_ValueMemberDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ValueMemberDef::_nil ();
++ _tao_elem = IR_ValueMemberDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ValueMemberDef::_nil ();
++ _tao_elem = IR_ValueMemberDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ValueMemberDef,IR::ValueMemberDef_var>;
++ template class TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ValueMemberDef,IR::ValueMemberDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ValueMemberDef,IR_ValueMemberDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_ValueDef_Proxy_Broker * (*IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ValueDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ValueDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -52323,17 +35618,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ValueDef::_duplicate (_tao_elem),
+- IR::ValueDef::_tao_any_destructor
++ IR_ValueDef::_duplicate (_tao_elem),
++ IR_ValueDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ValueDef::_nil ();
++ _tao_elem = IR_ValueDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ValueDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -52350,29 +35645,29 @@
+ IR::_tc_ValueDef,
+ 1,
+ _tao_elem,
+- IR::ValueDef::_tao_any_destructor
++ IR_ValueDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ValueDef::_nil ();
++ _tao_elem = IR_ValueDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ValueDef::_nil ();
++ _tao_elem = IR_ValueDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var>;
++ template class TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::ValueDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_ValueDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -52383,7 +35678,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ValueDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ValueDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -52393,16 +35688,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ValueDescription::_tao_any_destructor
++ IR_ValueDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::ValueDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_ValueDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ValueDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ValueDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -52416,15 +35711,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ValueDescription*,
++ const IR_ValueDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ValueDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::ValueDescription, 0);
++ IR_ValueDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_ValueDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -52435,7 +35730,7 @@
+ IR::_tc_ValueDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ValueDescription::_tao_any_destructor
++ IR_ValueDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -52453,11 +35748,11 @@
+ return 0;
+ }
+
+-IR::_TAO_ValueBoxDef_Proxy_Broker * (*IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ValueBoxDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ValueBoxDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -52467,17 +35762,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ValueBoxDef::_duplicate (_tao_elem),
+- IR::ValueBoxDef::_tao_any_destructor
++ IR_ValueBoxDef::_duplicate (_tao_elem),
++ IR_ValueBoxDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ValueBoxDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ValueBoxDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ValueBoxDef::_nil ();
++ _tao_elem = IR_ValueBoxDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ValueBoxDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -52494,33 +35789,33 @@
+ IR::_tc_ValueBoxDef,
+ 1,
+ _tao_elem,
+- IR::ValueBoxDef::_tao_any_destructor
++ IR_ValueBoxDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ValueBoxDef::_nil ();
++ _tao_elem = IR_ValueBoxDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ValueBoxDef::_nil ();
++ _tao_elem = IR_ValueBoxDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ValueBoxDef,IR::ValueBoxDef_var>;
++ template class TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ValueBoxDef,IR::ValueBoxDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ValueBoxDef,IR_ValueBoxDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_ProvidesDef_Proxy_Broker * (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -52530,17 +35825,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ProvidesDef::_duplicate (_tao_elem),
+- IR::ProvidesDef::_tao_any_destructor
++ IR_ProvidesDef::_duplicate (_tao_elem),
++ IR_ProvidesDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ProvidesDef::_nil ();
++ _tao_elem = IR_ProvidesDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ProvidesDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -52557,29 +35852,29 @@
+ IR::_tc_ProvidesDef,
+ 1,
+ _tao_elem,
+- IR::ProvidesDef::_tao_any_destructor
++ IR_ProvidesDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ProvidesDef::_nil ();
++ _tao_elem = IR_ProvidesDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ProvidesDef::_nil ();
++ _tao_elem = IR_ProvidesDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>;
++ template class TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::ProvidesDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_ProvidesDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -52590,7 +35885,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -52600,16 +35895,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ProvidesDescription::_tao_any_destructor
++ IR_ProvidesDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::ProvidesDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_ProvidesDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ProvidesDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -52623,15 +35918,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ProvidesDescription*,
++ const IR_ProvidesDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ProvidesDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::ProvidesDescription, 0);
++ IR_ProvidesDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_ProvidesDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -52642,7 +35937,7 @@
+ IR::_tc_ProvidesDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ProvidesDescription::_tao_any_destructor
++ IR_ProvidesDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -52660,11 +35955,11 @@
+ return 0;
+ }
+
+-IR::_TAO_UsesDef_Proxy_Broker * (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::UsesDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_UsesDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -52674,17 +35969,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::UsesDef::_duplicate (_tao_elem),
+- IR::UsesDef::_tao_any_destructor
++ IR_UsesDef::_duplicate (_tao_elem),
++ IR_UsesDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::UsesDef::_nil ();
++ _tao_elem = IR_UsesDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_UsesDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -52701,29 +35996,29 @@
+ IR::_tc_UsesDef,
+ 1,
+ _tao_elem,
+- IR::UsesDef::_tao_any_destructor
++ IR_UsesDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::UsesDef::_nil ();
++ _tao_elem = IR_UsesDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::UsesDef::_nil ();
++ _tao_elem = IR_UsesDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>;
++ template class TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::UsesDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_UsesDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -52734,7 +36029,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::UsesDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_UsesDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -52744,16 +36039,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::UsesDescription::_tao_any_destructor
++ IR_UsesDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::UsesDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_UsesDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UsesDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -52767,15 +36062,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::UsesDescription*,
++ const IR_UsesDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::UsesDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::UsesDescription, 0);
++ IR_UsesDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_UsesDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -52786,7 +36081,7 @@
+ IR::_tc_UsesDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::UsesDescription::_tao_any_destructor
++ IR_UsesDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -52806,7 +36101,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::ProvidesDescSeq &_tao_elem
++ const IR_ProvidesDescSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -52820,7 +36115,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ProvidesDescSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ProvidesDescSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -52830,19 +36125,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ProvidesDescSeq::_tao_any_destructor
++ IR_ProvidesDescSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ProvidesDescSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ProvidesDescSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::ProvidesDescSeq*&,
++ const IR_ProvidesDescSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ProvidesDescSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ProvidesDescSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -52856,15 +36151,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ProvidesDescSeq*,
++ const IR_ProvidesDescSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ProvidesDescSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::ProvidesDescSeq, 0);
++ IR_ProvidesDescSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_ProvidesDescSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -52875,7 +36170,7 @@
+ IR::_tc_ProvidesDescSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ProvidesDescSeq::_tao_any_destructor
++ IR_ProvidesDescSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -52895,7 +36190,7 @@
+
+ void operator<<= (
+ CORBA::Any &_tao_any,
+- const IR::UsesDescSeq &_tao_elem
++ const IR_UsesDescSeq &_tao_elem
+ ) // copying
+ {
+ TAO_OutputCDR stream;
+@@ -52909,7 +36204,7 @@
+ }
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::UsesDescSeq *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_UsesDescSeq *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -52919,19 +36214,19 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::UsesDescSeq::_tao_any_destructor
++ IR_UsesDescSeq::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::UsesDescSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_UsesDescSeq *&_tao_elem)
+ {
+ return _tao_any >>= ACE_const_cast(
+- const IR::UsesDescSeq*&,
++ const IR_UsesDescSeq*&,
+ _tao_elem
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::UsesDescSeq *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_UsesDescSeq *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -52945,15 +36240,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::UsesDescSeq*,
++ const IR_UsesDescSeq*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::UsesDescSeq *tmp;
+- ACE_NEW_RETURN (tmp, IR::UsesDescSeq, 0);
++ IR_UsesDescSeq *tmp;
++ ACE_NEW_RETURN (tmp, IR_UsesDescSeq, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -52964,7 +36259,7 @@
+ IR::_tc_UsesDescSeq,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::UsesDescSeq::_tao_any_destructor
++ IR_UsesDescSeq::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -52982,11 +36277,11 @@
+ return 0;
+ }
+
+-IR::_TAO_EventDef_Proxy_Broker * (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::EventDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_EventDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -52996,17 +36291,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::EventDef::_duplicate (_tao_elem),
+- IR::EventDef::_tao_any_destructor
++ IR_EventDef::_duplicate (_tao_elem),
++ IR_EventDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EventDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EventDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::EventDef::_nil ();
++ _tao_elem = IR_EventDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_EventDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53023,29 +36318,29 @@
+ IR::_tc_EventDef,
+ 1,
+ _tao_elem,
+- IR::EventDef::_tao_any_destructor
++ IR_EventDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::EventDef::_nil ();
++ _tao_elem = IR_EventDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::EventDef::_nil ();
++ _tao_elem = IR_EventDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::EventDef,IR::EventDef_var>;
++ template class TAO_Object_Manager<IR_EventDef,IR_EventDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::EventDef,IR::EventDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_EventDef,IR_EventDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::EventDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_EventDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -53056,7 +36351,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::EventDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_EventDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -53066,16 +36361,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::EventDescription::_tao_any_destructor
++ IR_EventDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EventDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EventDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::EventDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_EventDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::EventDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_EventDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -53089,15 +36384,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::EventDescription*,
++ const IR_EventDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::EventDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::EventDescription, 0);
++ IR_EventDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_EventDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -53108,7 +36403,7 @@
+ IR::_tc_EventDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::EventDescription::_tao_any_destructor
++ IR_EventDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -53126,11 +36421,11 @@
+ return 0;
+ }
+
+-IR::_TAO_EmitsDef_Proxy_Broker * (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::EmitsDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_EmitsDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -53140,17 +36435,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::EmitsDef::_duplicate (_tao_elem),
+- IR::EmitsDef::_tao_any_destructor
++ IR_EmitsDef::_duplicate (_tao_elem),
++ IR_EmitsDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::EmitsDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_EmitsDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::EmitsDef::_nil ();
++ _tao_elem = IR_EmitsDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_EmitsDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53167,33 +36462,33 @@
+ IR::_tc_EmitsDef,
+ 1,
+ _tao_elem,
+- IR::EmitsDef::_tao_any_destructor
++ IR_EmitsDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::EmitsDef::_nil ();
++ _tao_elem = IR_EmitsDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::EmitsDef::_nil ();
++ _tao_elem = IR_EmitsDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>;
++ template class TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_PublishesDef_Proxy_Broker * (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::PublishesDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_PublishesDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -53203,17 +36498,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::PublishesDef::_duplicate (_tao_elem),
+- IR::PublishesDef::_tao_any_destructor
++ IR_PublishesDef::_duplicate (_tao_elem),
++ IR_PublishesDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PublishesDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PublishesDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::PublishesDef::_nil ();
++ _tao_elem = IR_PublishesDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_PublishesDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53230,33 +36525,33 @@
+ IR::_tc_PublishesDef,
+ 1,
+ _tao_elem,
+- IR::PublishesDef::_tao_any_destructor
++ IR_PublishesDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::PublishesDef::_nil ();
++ _tao_elem = IR_PublishesDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::PublishesDef::_nil ();
++ _tao_elem = IR_PublishesDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>;
++ template class TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_ConsumesDef_Proxy_Broker * (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ConsumesDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ConsumesDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -53266,17 +36561,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ConsumesDef::_duplicate (_tao_elem),
+- IR::ConsumesDef::_tao_any_destructor
++ IR_ConsumesDef::_duplicate (_tao_elem),
++ IR_ConsumesDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ConsumesDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ConsumesDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ConsumesDef::_nil ();
++ _tao_elem = IR_ConsumesDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ConsumesDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53293,33 +36588,33 @@
+ IR::_tc_ConsumesDef,
+ 1,
+ _tao_elem,
+- IR::ConsumesDef::_tao_any_destructor
++ IR_ConsumesDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ConsumesDef::_nil ();
++ _tao_elem = IR_ConsumesDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ConsumesDef::_nil ();
++ _tao_elem = IR_ConsumesDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>;
++ template class TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_ComponentDef_Proxy_Broker * (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ComponentDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_ComponentDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -53329,17 +36624,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::ComponentDef::_duplicate (_tao_elem),
+- IR::ComponentDef::_tao_any_destructor
++ IR_ComponentDef::_duplicate (_tao_elem),
++ IR_ComponentDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::ComponentDef::_nil ();
++ _tao_elem = IR_ComponentDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_ComponentDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53356,29 +36651,29 @@
+ IR::_tc_ComponentDef,
+ 1,
+ _tao_elem,
+- IR::ComponentDef::_tao_any_destructor
++ IR_ComponentDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::ComponentDef::_nil ();
++ _tao_elem = IR_ComponentDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::ComponentDef::_nil ();
++ _tao_elem = IR_ComponentDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>;
++ template class TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::ComponentDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_ComponentDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -53389,7 +36684,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::ComponentDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_ComponentDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -53399,16 +36694,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::ComponentDescription::_tao_any_destructor
++ IR_ComponentDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::ComponentDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_ComponentDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::ComponentDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_ComponentDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::ComponentDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_ComponentDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -53422,15 +36717,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::ComponentDescription*,
++ const IR_ComponentDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::ComponentDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::ComponentDescription, 0);
++ IR_ComponentDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_ComponentDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -53441,7 +36736,7 @@
+ IR::_tc_ComponentDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::ComponentDescription::_tao_any_destructor
++ IR_ComponentDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -53459,11 +36754,11 @@
+ return 0;
+ }
+
+-IR::_TAO_PrimaryKeyDef_Proxy_Broker * (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_PrimaryKeyDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -53473,17 +36768,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::PrimaryKeyDef::_duplicate (_tao_elem),
+- IR::PrimaryKeyDef::_tao_any_destructor
++ IR_PrimaryKeyDef::_duplicate (_tao_elem),
++ IR_PrimaryKeyDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimaryKeyDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimaryKeyDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::PrimaryKeyDef::_nil ();
++ _tao_elem = IR_PrimaryKeyDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_PrimaryKeyDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53500,29 +36795,29 @@
+ IR::_tc_PrimaryKeyDef,
+ 1,
+ _tao_elem,
+- IR::PrimaryKeyDef::_tao_any_destructor
++ IR_PrimaryKeyDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::PrimaryKeyDef::_nil ();
++ _tao_elem = IR_PrimaryKeyDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::PrimaryKeyDef::_nil ();
++ _tao_elem = IR_PrimaryKeyDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::PrimaryKeyDef,IR::PrimaryKeyDef_var>;
++ template class TAO_Object_Manager<IR_PrimaryKeyDef,IR_PrimaryKeyDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::PrimaryKeyDef,IR::PrimaryKeyDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_PrimaryKeyDef,IR_PrimaryKeyDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::PrimaryKeyDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_PrimaryKeyDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -53533,7 +36828,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::PrimaryKeyDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_PrimaryKeyDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -53543,16 +36838,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::PrimaryKeyDescription::_tao_any_destructor
++ IR_PrimaryKeyDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::PrimaryKeyDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_PrimaryKeyDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::PrimaryKeyDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_PrimaryKeyDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::PrimaryKeyDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_PrimaryKeyDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -53566,15 +36861,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::PrimaryKeyDescription*,
++ const IR_PrimaryKeyDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::PrimaryKeyDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::PrimaryKeyDescription, 0);
++ IR_PrimaryKeyDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_PrimaryKeyDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -53585,7 +36880,7 @@
+ IR::_tc_PrimaryKeyDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::PrimaryKeyDescription::_tao_any_destructor
++ IR_PrimaryKeyDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -53603,11 +36898,11 @@
+ return 0;
+ }
+
+-IR::_TAO_FactoryDef_Proxy_Broker * (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::FactoryDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_FactoryDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -53617,17 +36912,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::FactoryDef::_duplicate (_tao_elem),
+- IR::FactoryDef::_tao_any_destructor
++ IR_FactoryDef::_duplicate (_tao_elem),
++ IR_FactoryDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FactoryDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FactoryDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::FactoryDef::_nil ();
++ _tao_elem = IR_FactoryDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_FactoryDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53644,33 +36939,33 @@
+ IR::_tc_FactoryDef,
+ 1,
+ _tao_elem,
+- IR::FactoryDef::_tao_any_destructor
++ IR_FactoryDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::FactoryDef::_nil ();
++ _tao_elem = IR_FactoryDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::FactoryDef::_nil ();
++ _tao_elem = IR_FactoryDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>;
++ template class TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_FinderDef_Proxy_Broker * (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::FinderDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_FinderDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -53680,17 +36975,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::FinderDef::_duplicate (_tao_elem),
+- IR::FinderDef::_tao_any_destructor
++ IR_FinderDef::_duplicate (_tao_elem),
++ IR_FinderDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::FinderDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_FinderDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::FinderDef::_nil ();
++ _tao_elem = IR_FinderDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_FinderDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53707,33 +37002,33 @@
+ IR::_tc_FinderDef,
+ 1,
+ _tao_elem,
+- IR::FinderDef::_tao_any_destructor
++ IR_FinderDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::FinderDef::_nil ();
++ _tao_elem = IR_FinderDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::FinderDef::_nil ();
++ _tao_elem = IR_FinderDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>;
++ template class TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-IR::_TAO_HomeDef_Proxy_Broker * (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
++_TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ ) = 0;
+
+-void operator<<= (CORBA::Any &_tao_any, IR::HomeDef_ptr _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, IR_HomeDef_ptr _tao_elem)
+ {
+ TAO_OutputCDR stream;
+ if (stream << _tao_elem)
+@@ -53743,17 +37038,17 @@
+ TAO_ENCAP_BYTE_ORDER,
+ stream.begin (),
+ 1,
+- IR::HomeDef::_duplicate (_tao_elem),
+- IR::HomeDef::_tao_any_destructor
++ IR_HomeDef::_duplicate (_tao_elem),
++ IR_HomeDef::_tao_any_destructor
+ );
+ }
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDef_ptr &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_HomeDef_ptr &_tao_elem)
+ {
+ ACE_TRY_NEW_ENV
+ {
+- _tao_elem = IR::HomeDef::_nil ();
++ _tao_elem = IR_HomeDef::_nil ();
+ CORBA::TypeCode_var type = _tao_any.type ();
+ if (!type->equivalent (IR::_tc_HomeDef, ACE_TRY_ENV)) // not equal
+ {
+@@ -53770,29 +37065,29 @@
+ IR::_tc_HomeDef,
+ 1,
+ _tao_elem,
+- IR::HomeDef::_tao_any_destructor
++ IR_HomeDef::_tao_any_destructor
+ );
+ return 1;
+ }
+ }
+ ACE_CATCHANY
+ {
+- _tao_elem = IR::HomeDef::_nil ();
++ _tao_elem = IR_HomeDef::_nil ();
+ return 0;
+ }
+ ACE_ENDTRY;
+- _tao_elem = IR::HomeDef::_nil ();
++ _tao_elem = IR_HomeDef::_nil ();
+ return 0;
+ }
+
+ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
+ defined (ACE_HAS_GNU_REPO)
+- template class TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>;
++ template class TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>;
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+- # pragma instantiate TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
++ # pragma instantiate TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>
+ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+-void operator<<= (CORBA::Any &_tao_any, const IR::HomeDescription &_tao_elem) // copying
++void operator<<= (CORBA::Any &_tao_any, const IR_HomeDescription &_tao_elem) // copying
+ {
+ TAO_OutputCDR stream;
+ stream << _tao_elem;
+@@ -53803,7 +37098,7 @@
+ );
+ }
+
+-void operator<<= (CORBA::Any &_tao_any, IR::HomeDescription *_tao_elem) // non copying
++void operator<<= (CORBA::Any &_tao_any, IR_HomeDescription *_tao_elem) // non copying
+ {
+ TAO_OutputCDR stream;
+ stream << *_tao_elem;
+@@ -53813,16 +37108,16 @@
+ stream.begin (),
+ 1,
+ _tao_elem,
+- IR::HomeDescription::_tao_any_destructor
++ IR_HomeDescription::_tao_any_destructor
+ );
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR::HomeDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, IR_HomeDescription *&_tao_elem)
+ {
+- return _tao_any >>= ACE_const_cast(const IR::HomeDescription*&,_tao_elem);
++ return _tao_any >>= ACE_const_cast(const IR_HomeDescription*&,_tao_elem);
+ }
+
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR::HomeDescription *&_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const IR_HomeDescription *&_tao_elem)
+ {
+ _tao_elem = 0;
+ ACE_TRY_NEW_ENV
+@@ -53836,15 +37131,15 @@
+ if (_tao_any.any_owns_data ())
+ {
+ _tao_elem = ACE_static_cast(
+- const IR::HomeDescription*,
++ const IR_HomeDescription*,
+ _tao_any.value ()
+ );
+ return 1;
+ }
+ else
+ {
+- IR::HomeDescription *tmp;
+- ACE_NEW_RETURN (tmp, IR::HomeDescription, 0);
++ IR_HomeDescription *tmp;
++ ACE_NEW_RETURN (tmp, IR_HomeDescription, 0);
+ TAO_InputCDR stream (
+ _tao_any._tao_get_cdr (),
+ _tao_any._tao_byte_order ()
+@@ -53855,7 +37150,7 @@
+ IR::_tc_HomeDescription,
+ 1,
+ ACE_static_cast (void *, tmp),
+- IR::HomeDescription::_tao_any_destructor
++ IR_HomeDescription::_tao_any_destructor
+ );
+ _tao_elem = tmp;
+ return 1;
+@@ -53875,7 +37170,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::InterfaceDefSeq &_tao_sequence
++ const IR_InterfaceDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -53893,7 +37188,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::InterfaceDefSeq &_tao_sequence
++ IR_InterfaceDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -53917,7 +37212,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ValueDefSeq &_tao_sequence
++ const IR_ValueDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -53935,7 +37230,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ValueDefSeq &_tao_sequence
++ IR_ValueDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -53959,7 +37254,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ComponentDefSeq &_tao_sequence
++ const IR_ComponentDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -53977,7 +37272,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ComponentDefSeq &_tao_sequence
++ IR_ComponentDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54001,7 +37296,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ProvidesDefSeq &_tao_sequence
++ const IR_ProvidesDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54019,7 +37314,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ProvidesDefSeq &_tao_sequence
++ IR_ProvidesDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54043,7 +37338,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::UsesDefSeq &_tao_sequence
++ const IR_UsesDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54061,7 +37356,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::UsesDefSeq &_tao_sequence
++ IR_UsesDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54085,7 +37380,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::HomeDefSeq &_tao_sequence
++ const IR_HomeDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54103,7 +37398,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::HomeDefSeq &_tao_sequence
++ IR_HomeDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54127,7 +37422,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::EmitsDefSeq &_tao_sequence
++ const IR_EmitsDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54145,7 +37440,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::EmitsDefSeq &_tao_sequence
++ IR_EmitsDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54169,7 +37464,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::PublishesDefSeq &_tao_sequence
++ const IR_PublishesDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54187,7 +37482,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::PublishesDefSeq &_tao_sequence
++ IR_PublishesDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54211,7 +37506,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ConsumesDefSeq &_tao_sequence
++ const IR_ConsumesDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54229,7 +37524,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ConsumesDefSeq &_tao_sequence
++ IR_ConsumesDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54253,7 +37548,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::FactoryDefSeq &_tao_sequence
++ const IR_FactoryDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54271,7 +37566,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::FactoryDefSeq &_tao_sequence
++ IR_FactoryDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54295,7 +37590,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::FinderDefSeq &_tao_sequence
++ const IR_FinderDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54313,7 +37608,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::FinderDefSeq &_tao_sequence
++ IR_FinderDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54337,7 +37632,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ContainedSeq &_tao_sequence
++ const IR_ContainedSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54355,7 +37650,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ContainedSeq &_tao_sequence
++ IR_ContainedSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54379,7 +37674,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::StructMemberSeq &_tao_sequence
++ const IR_StructMemberSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54397,7 +37692,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::StructMemberSeq &_tao_sequence
++ IR_StructMemberSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54421,7 +37716,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::InitializerSeq &_tao_sequence
++ const IR_InitializerSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54439,7 +37734,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::InitializerSeq &_tao_sequence
++ IR_InitializerSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54463,7 +37758,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::UnionMemberSeq &_tao_sequence
++ const IR_UnionMemberSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54481,7 +37776,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::UnionMemberSeq &_tao_sequence
++ IR_UnionMemberSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54505,7 +37800,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::EnumMemberSeq &_tao_sequence
++ const IR_EnumMemberSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54523,7 +37818,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::EnumMemberSeq &_tao_sequence
++ IR_EnumMemberSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54547,7 +37842,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::Container::DescriptionSeq &_tao_sequence
++ const IR_Container::DescriptionSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54565,7 +37860,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::Container::DescriptionSeq &_tao_sequence
++ IR_Container::DescriptionSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54589,7 +37884,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ExceptionDefSeq &_tao_sequence
++ const IR_ExceptionDefSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54607,7 +37902,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ExceptionDefSeq &_tao_sequence
++ IR_ExceptionDefSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54631,7 +37926,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ExcDescriptionSeq &_tao_sequence
++ const IR_ExcDescriptionSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54649,7 +37944,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ExcDescriptionSeq &_tao_sequence
++ IR_ExcDescriptionSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54673,7 +37968,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ParDescriptionSeq &_tao_sequence
++ const IR_ParDescriptionSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54691,7 +37986,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ParDescriptionSeq &_tao_sequence
++ IR_ParDescriptionSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54715,7 +38010,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ContextIdSeq &_tao_sequence
++ const IR_ContextIdSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54733,7 +38028,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ContextIdSeq &_tao_sequence
++ IR_ContextIdSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54757,7 +38052,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::RepositoryIdSeq &_tao_sequence
++ const IR_RepositoryIdSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54775,7 +38070,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::RepositoryIdSeq &_tao_sequence
++ IR_RepositoryIdSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54799,7 +38094,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::OpDescriptionSeq &_tao_sequence
++ const IR_OpDescriptionSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54817,7 +38112,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::OpDescriptionSeq &_tao_sequence
++ IR_OpDescriptionSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54841,7 +38136,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::AttrDescriptionSeq &_tao_sequence
++ const IR_AttrDescriptionSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54859,7 +38154,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::AttrDescriptionSeq &_tao_sequence
++ IR_AttrDescriptionSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54883,7 +38178,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ValueMemberSeq &_tao_sequence
++ const IR_ValueMemberSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54901,7 +38196,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ValueMemberSeq &_tao_sequence
++ IR_ValueMemberSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54925,7 +38220,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ProvidesDescSeq &_tao_sequence
++ const IR_ProvidesDescSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54943,7 +38238,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::ProvidesDescSeq &_tao_sequence
++ IR_ProvidesDescSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -54967,7 +38262,7 @@
+
+ CORBA::Boolean operator<< (
+ TAO_OutputCDR &strm,
+- const IR::UsesDescSeq &_tao_sequence
++ const IR_UsesDescSeq &_tao_sequence
+ )
+ {
+ if (strm << _tao_sequence.length ())
+@@ -54985,7 +38280,7 @@
+
+ CORBA::Boolean operator>> (
+ TAO_InputCDR &strm,
+- IR::UsesDescSeq &_tao_sequence
++ IR_UsesDescSeq &_tao_sequence
+ )
+ {
+ CORBA::ULong _tao_seq_len;
+@@ -55007,3 +38302,4 @@
+ return 0; // error
+ }
+
++#endif /* TAO_HAS_INTERFACE_REPOSITORY */
diff --git a/TAO/tao/diffs/InterfaceC.h.diff b/TAO/tao/diffs/InterfaceC.h.diff
new file mode 100644
index 00000000000..96eed4623cc
--- /dev/null
+++ b/TAO/tao/diffs/InterfaceC.h.diff
@@ -0,0 +1,32149 @@
+--- InterfaceC.h Fri Dec 01 16:26:23 2000
++++ ..\..\..\tao\InterfaceC.h Mon Nov 27 19:25:21 2000
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++//$Id$
+
+ // **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,11 +19,21 @@
+ // Information about TAO is available at:
+ // http://www.cs.wustl.edu/~schmidt/TAO.html
+
+-#ifndef _TAO_IDL_INTERFACEC_H_
+-#define _TAO_IDL_INTERFACEC_H_
+-
++#ifndef TAO_IDL_INTERFACEC_H
++#define TAO_IDL_INTERFACEC_H
+ #include "ace/pre.h"
+-#include "tao/corba.h"
++
++#include "tao/TAO_Singleton.h"
++#include "tao/corbafwd.h"
++#include "tao/ifrfwd.h"
++#include "tao/Any.h"
++#include "tao/Object.h"
++#include "tao/Managed_Types.h"
++#include "tao/Sequence.h"
++#include "tao/Typecode.h"
++#include "tao/Remote_Object_Proxy_Impl.h"
++
++#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
+
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+ # pragma once
+@@ -49,160 +59,122 @@
+ #pragma warning(disable:4250)
+ #endif /* _MSC_VER */
+
+-TAO_NAMESPACE IR
+-{
+- enum DefinitionKind
++enum IR_DefinitionKind
+ {
+- dk_none,
+- dk_all,
+- dk_Attribute,
+- dk_Constant,
+- dk_Exception,
+- dk_Interface,
+- dk_Module,
+- dk_Operation,
+- dk_Typedef,
+- dk_Alias,
+- dk_Struct,
+- dk_Union,
+- dk_Enum,
+- dk_Primitive,
+- dk_String,
+- dk_Sequence,
+- dk_Array,
+- dk_Repository,
+- dk_Wstring,
+- dk_Fixed,
+- dk_Value,
+- dk_ValueBox,
+- dk_ValueMember,
+- dk_Native,
+- dk_Component,
+- dk_Home,
+- dk_Factory,
+- dk_Finder,
+- dk_PrimaryKey,
+- dk_Emits,
+- dk_Publishes,
+- dk_Consumes,
+- dk_Provides,
+- dk_Uses
++ dk_none,
++ dk_all,
++ dk_Attribute,
++ dk_Constant,
++ dk_Exception,
++ dk_Interface,
++ dk_Module,
++ dk_Operation,
++ dk_Typedef,
++ dk_Alias,
++ dk_Struct,
++ dk_Union,
++ dk_Enum,
++ dk_Primitive,
++ dk_String,
++ dk_Sequence,
++ dk_Array,
++ dk_Repository,
++ dk_Wstring,
++ dk_Fixed,
++ dk_Value,
++ dk_ValueBox,
++ dk_ValueMember,
++ dk_Native,
++ dk_Component,
++ dk_Home,
++ dk_Factory,
++ dk_Finder,
++ dk_PrimaryKey,
++ dk_Emits,
++ dk_Publishes,
++ dk_Consumes,
++ dk_Provides,
++ dk_Uses
+ };
+- typedef DefinitionKind &DefinitionKind_out;
+- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DefinitionKind;
+-
+-
+-}
+-TAO_NAMESPACE_CLOSE // module IR
+-
+-TAO_NAMESPACE CORBA
+-{
+
+-#if !defined (_TAO_CORBA_IROBJECT___PTR_CH_)
+-#define _TAO_CORBA_IROBJECT___PTR_CH_
+-
+- class IRObject;
+- typedef IRObject *IRObject_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_CORBA_IROBJECT___VAR_CH_)
+-#define _TAO_CORBA_IROBJECT___VAR_CH_
+-
+- class TAO_Export IRObject_var : public TAO_Base_var
++ class TAO_Export CORBA_IRObject_var : public TAO_Base_var
+ {
+ public:
+- IRObject_var (void); // default constructor
+- IRObject_var (IRObject_ptr p) : ptr_ (p) {}
+- IRObject_var (const IRObject_var &); // copy constructor
+- ~IRObject_var (void); // destructor
+-
+- IRObject_var &operator= (IRObject_ptr);
+- IRObject_var &operator= (const IRObject_var &);
+- IRObject_ptr operator-> (void) const;
++ CORBA_IRObject_var (void); // default constructor
++ CORBA_IRObject_var (CORBA_IRObject_ptr p) : ptr_ (p) {}
++ CORBA_IRObject_var (const CORBA_IRObject_var &); // copy constructor
++ ~CORBA_IRObject_var (void); // destructor
++
++ CORBA_IRObject_var &operator= (CORBA_IRObject_ptr);
++ CORBA_IRObject_var &operator= (const CORBA_IRObject_var &);
++ CORBA_IRObject_ptr operator-> (void) const;
+
+- operator const IRObject_ptr &() const;
+- operator IRObject_ptr &();
++ operator const CORBA_IRObject_ptr &() const;
++ operator CORBA_IRObject_ptr &();
+ // in, inout, out, _retn
+- IRObject_ptr in (void) const;
+- IRObject_ptr &inout (void);
+- IRObject_ptr &out (void);
+- IRObject_ptr _retn (void);
+- IRObject_ptr ptr (void) const;
++ CORBA_IRObject_ptr in (void) const;
++ CORBA_IRObject_ptr &inout (void);
++ CORBA_IRObject_ptr &out (void);
++ CORBA_IRObject_ptr _retn (void);
++ CORBA_IRObject_ptr ptr (void) const;
+
+ private:
+- IRObject_ptr ptr_;
++ CORBA_IRObject_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- IRObject_var (const TAO_Base_var &rhs);
+- IRObject_var &operator= (const TAO_Base_var &rhs);
++ CORBA_IRObject_var (const TAO_Base_var &rhs);
++ CORBA_IRObject_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_CORBA_IROBJECT___OUT_CH_)
+-#define _TAO_CORBA_IROBJECT___OUT_CH_
+-
+- class TAO_Export IRObject_out
++ class TAO_Export CORBA_IRObject_out
+ {
+ public:
+- IRObject_out (IRObject_ptr &);
+- IRObject_out (IRObject_var &);
+- IRObject_out (const IRObject_out &);
+- IRObject_out &operator= (const IRObject_out &);
+- IRObject_out &operator= (const IRObject_var &);
+- IRObject_out &operator= (IRObject_ptr);
+- operator IRObject_ptr &();
+- IRObject_ptr &ptr (void);
+- IRObject_ptr operator-> (void);
++ CORBA_IRObject_out (CORBA_IRObject_ptr &);
++ CORBA_IRObject_out (CORBA_IRObject_var &);
++ CORBA_IRObject_out (const CORBA_IRObject_out &);
++ CORBA_IRObject_out &operator= (const CORBA_IRObject_out &);
++ CORBA_IRObject_out &operator= (const CORBA_IRObject_var &);
++ CORBA_IRObject_out &operator= (CORBA_IRObject_ptr);
++ operator CORBA_IRObject_ptr &();
++ CORBA_IRObject_ptr &ptr (void);
++ CORBA_IRObject_ptr operator-> (void);
+
+ private:
+- IRObject_ptr &ptr_;
++ CORBA_IRObject_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_CORBA_IROBJECT_CH_)
+-#define _TAO_CORBA_IROBJECT_CH_
+-
+-// Forward Classes Declaration
+ class _TAO_IRObject_Proxy_Impl;
+ class _TAO_IRObject_Remote_Proxy_Impl;
+ class _TAO_IRObject_Proxy_Broker;
+ class _TAO_IRObject_Remote_Proxy_Broker;
+
+- class TAO_Export IRObject : public virtual CORBA_Object
++ class TAO_Export CORBA_IRObject : public virtual CORBA_Object
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef IRObject_ptr _ptr_type;
+- typedef IRObject_var _var_type;
++ typedef CORBA_IRObject_ptr _ptr_type;
++ typedef CORBA_IRObject_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static IRObject_ptr _duplicate (IRObject_ptr obj);
+- static IRObject_ptr _narrow (
++ static CORBA_IRObject_ptr _duplicate (CORBA_IRObject_ptr obj);
++ static CORBA_IRObject_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static IRObject_ptr _unchecked_narrow (
++ static CORBA_IRObject_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static IRObject_ptr _nil (void)
++ static CORBA_IRObject_ptr _nil (void)
+ {
+- return (IRObject_ptr)0;
++ return (CORBA_IRObject_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::DefinitionKind def_kind (
++ virtual IR_DefinitionKind def_kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -212,7 +184,7 @@
+
+ virtual void destroy (
+ CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
++ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+@@ -231,120 +203,28 @@
+ _TAO_IRObject_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
+
+ protected:
+- IRObject (int collocated = 0);
++ CORBA_IRObject (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++ protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- IRObject (
++ CORBA_IRObject (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_IRObject_Remote_Proxy_Impl;
+- friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
+- friend class _TAO_IRObject_Direct_Proxy_Impl;
+-
+- virtual ~IRObject (void);
+- private:
+- IRObject (const IRObject &);
+- void operator= (const IRObject &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class CORBA::IRObject;
+-
+- friend class _TAO_IRObject_Remote_Proxy_Impl;
+- friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
+- friend class _TAO_IRObject_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get (const TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get &);
+- void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_def_kind_get &);
+- void result (IR::DefinitionKind result);
+- // update the result
+- IR::DefinitionKind result_;
+- };
+-
+- class TAO_ClientRequestInfo_CORBA_IRObject_destroy : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class CORBA::IRObject;
+-
+- friend class _TAO_IRObject_Remote_Proxy_Impl;
+- friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
+- friend class _TAO_IRObject_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_CORBA_IRObject_destroy (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_IRObject_Remote_Proxy_Impl;
++ friend class _TAO_IRObject_ThruPOA_Proxy_Impl;
++ friend class _TAO_IRObject_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~CORBA_IRObject (void);
+ private:
+- TAO_ClientRequestInfo_CORBA_IRObject_destroy (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
+- void operator= (const TAO_ClientRequestInfo_CORBA_IRObject_destroy &);
+-
++ CORBA_IRObject (const CORBA_IRObject &);
++ void operator= (const CORBA_IRObject &);
+ };
+-
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+-};
+
+
+ // The Proxy Implementations are used by each interface to
+@@ -361,7 +241,7 @@
+ public:
+ virtual ~_TAO_IRObject_Proxy_Impl (void) { }
+
+- virtual IR::DefinitionKind def_kind (
++ virtual IR_DefinitionKind def_kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -381,6 +261,7 @@
+ _TAO_IRObject_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -399,7 +280,7 @@
+
+ virtual ~_TAO_IRObject_Remote_Proxy_Impl (void) { }
+
+- virtual IR::DefinitionKind def_kind (
++ virtual IR_DefinitionKind def_kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -437,8 +318,9 @@
+ {
+ public:
+ virtual ~_TAO_IRObject_Proxy_Broker (void);
++
+ virtual _TAO_IRObject_Proxy_Impl &select_proxy (
+- IRObject *object,
++ CORBA_IRObject *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -463,9 +345,9 @@
+ _TAO_IRObject_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_IRObject_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_IRObject_Proxy_Impl &select_proxy (
+- IRObject *object,
++ CORBA_IRObject *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -479,355 +361,175 @@
+ static _TAO_IRObject_Remote_Proxy_Broker *the_TAO_IRObject_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IRObject;
+-
+-typedef CORBA::Short Visibility;
+-typedef CORBA::Short_out Visibility_out;
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Visibility;
+-
+-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short PRIVATE_MEMBER;
+-
+-TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short PUBLIC_MEMBER;
+-
+-
+-}
+-TAO_NAMESPACE_CLOSE // module CORBA
+-
+-TAO_NAMESPACE IR
+-{
+- typedef char * Identifier;
+- typedef CORBA::String_var Identifier_var;
+- typedef CORBA::String_out Identifier_out;
+- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
+-
+- typedef char * ScopedName;
+- typedef CORBA::String_var ScopedName_var;
+- typedef CORBA::String_out ScopedName_out;
+- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
+-
+- typedef char * RepositoryId;
+- typedef CORBA::String_var RepositoryId_var;
+- typedef CORBA::String_out RepositoryId_out;
+- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryId;
+-
+- typedef char * VersionSpec;
+- typedef CORBA::String_var VersionSpec_var;
+- typedef CORBA::String_out VersionSpec_out;
+- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_VersionSpec;
+-
+- class Contained;
+-
+-#if !defined (_TAO_IR_CONTAINED___PTR_CH_)
+-#define _TAO_IR_CONTAINED___PTR_CH_
+-
+-typedef Contained *Contained_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED___VAR_CH_)
+-#define _TAO_IR_CONTAINED___VAR_CH_
+-
+- class TAO_Export Contained_var : public TAO_Base_var
+- {
+- public:
+- Contained_var (void); // default constructor
+- Contained_var (Contained_ptr p) : ptr_ (p) {}
+- Contained_var (const Contained_var &); // copy constructor
+- ~Contained_var (void); // destructor
+-
+- Contained_var &operator= (Contained_ptr);
+- Contained_var &operator= (const Contained_var &);
+- Contained_ptr operator-> (void) const;
+-
+- operator const Contained_ptr &() const;
+- operator Contained_ptr &();
+- // in, inout, out, _retn
+- Contained_ptr in (void) const;
+- Contained_ptr &inout (void);
+- Contained_ptr &out (void);
+- Contained_ptr _retn (void);
+- Contained_ptr ptr (void) const;
+-
+- private:
+- Contained_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- Contained_var (const TAO_Base_var &rhs);
+- Contained_var &operator= (const TAO_Base_var &rhs);
+- };
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED___OUT_CH_)
+-#define _TAO_IR_CONTAINED___OUT_CH_
+-
+- class TAO_Export Contained_out
+- {
+- public:
+- Contained_out (Contained_ptr &);
+- Contained_out (Contained_var &);
+- Contained_out (const Contained_out &);
+- Contained_out &operator= (const Contained_out &);
+- Contained_out &operator= (const Contained_var &);
+- Contained_out &operator= (Contained_ptr);
+- operator Contained_ptr &();
+- Contained_ptr &ptr (void);
+- Contained_ptr operator-> (void);
+-
+- private:
+- Contained_ptr &ptr_;
+- };
+-
+-
+-#endif /* end #if !defined */
+-
+- class Repository;
+-
+-#if !defined (_TAO_IR_REPOSITORY___PTR_CH_)
+-#define _TAO_IR_REPOSITORY___PTR_CH_
+-
+-typedef Repository *Repository_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY___VAR_CH_)
+-#define _TAO_IR_REPOSITORY___VAR_CH_
+-
+- class TAO_Export Repository_var : public TAO_Base_var
++ class TAO_Export IR_Contained_var : public TAO_Base_var
+ {
+ public:
+- Repository_var (void); // default constructor
+- Repository_var (Repository_ptr p) : ptr_ (p) {}
+- Repository_var (const Repository_var &); // copy constructor
+- ~Repository_var (void); // destructor
+-
+- Repository_var &operator= (Repository_ptr);
+- Repository_var &operator= (const Repository_var &);
+- Repository_ptr operator-> (void) const;
++ IR_Contained_var (void); // default constructor
++ IR_Contained_var (IR_Contained_ptr p) : ptr_ (p) {}
++ IR_Contained_var (const IR_Contained_var &); // copy constructor
++ ~IR_Contained_var (void); // destructor
++
++ IR_Contained_var &operator= (IR_Contained_ptr);
++ IR_Contained_var &operator= (const IR_Contained_var &);
++ IR_Contained_ptr operator-> (void) const;
+
+- operator const Repository_ptr &() const;
+- operator Repository_ptr &();
++ operator const IR_Contained_ptr &() const;
++ operator IR_Contained_ptr &();
+ // in, inout, out, _retn
+- Repository_ptr in (void) const;
+- Repository_ptr &inout (void);
+- Repository_ptr &out (void);
+- Repository_ptr _retn (void);
+- Repository_ptr ptr (void) const;
++ IR_Contained_ptr in (void) const;
++ IR_Contained_ptr &inout (void);
++ IR_Contained_ptr &out (void);
++ IR_Contained_ptr _retn (void);
++ IR_Contained_ptr ptr (void) const;
+
+ private:
+- Repository_ptr ptr_;
++ IR_Contained_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- Repository_var (const TAO_Base_var &rhs);
+- Repository_var &operator= (const TAO_Base_var &rhs);
++ IR_Contained_var (const TAO_Base_var &rhs);
++ IR_Contained_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY___OUT_CH_)
+-#define _TAO_IR_REPOSITORY___OUT_CH_
+-
+- class TAO_Export Repository_out
++ class TAO_Export IR_Contained_out
+ {
+ public:
+- Repository_out (Repository_ptr &);
+- Repository_out (Repository_var &);
+- Repository_out (const Repository_out &);
+- Repository_out &operator= (const Repository_out &);
+- Repository_out &operator= (const Repository_var &);
+- Repository_out &operator= (Repository_ptr);
+- operator Repository_ptr &();
+- Repository_ptr &ptr (void);
+- Repository_ptr operator-> (void);
++ IR_Contained_out (IR_Contained_ptr &);
++ IR_Contained_out (IR_Contained_var &);
++ IR_Contained_out (const IR_Contained_out &);
++ IR_Contained_out &operator= (const IR_Contained_out &);
++ IR_Contained_out &operator= (const IR_Contained_var &);
++ IR_Contained_out &operator= (IR_Contained_ptr);
++ operator IR_Contained_ptr &();
++ IR_Contained_ptr &ptr (void);
++ IR_Contained_ptr operator-> (void);
+
+ private:
+- Repository_ptr &ptr_;
++ IR_Contained_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+- class Container;
+-
+-#if !defined (_TAO_IR_CONTAINER___PTR_CH_)
+-#define _TAO_IR_CONTAINER___PTR_CH_
+-
+-typedef Container *Container_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER___VAR_CH_)
+-#define _TAO_IR_CONTAINER___VAR_CH_
+-
+- class TAO_Export Container_var : public TAO_Base_var
++ class TAO_Export IR_Repository_var : public TAO_Base_var
+ {
+ public:
+- Container_var (void); // default constructor
+- Container_var (Container_ptr p) : ptr_ (p) {}
+- Container_var (const Container_var &); // copy constructor
+- ~Container_var (void); // destructor
+-
+- Container_var &operator= (Container_ptr);
+- Container_var &operator= (const Container_var &);
+- Container_ptr operator-> (void) const;
++ IR_Repository_var (void); // default constructor
++ IR_Repository_var (IR_Repository_ptr p) : ptr_ (p) {}
++ IR_Repository_var (const IR_Repository_var &); // copy constructor
++ ~IR_Repository_var (void); // destructor
++
++ IR_Repository_var &operator= (IR_Repository_ptr);
++ IR_Repository_var &operator= (const IR_Repository_var &);
++ IR_Repository_ptr operator-> (void) const;
+
+- operator const Container_ptr &() const;
+- operator Container_ptr &();
++ operator const IR_Repository_ptr &() const;
++ operator IR_Repository_ptr &();
+ // in, inout, out, _retn
+- Container_ptr in (void) const;
+- Container_ptr &inout (void);
+- Container_ptr &out (void);
+- Container_ptr _retn (void);
+- Container_ptr ptr (void) const;
++ IR_Repository_ptr in (void) const;
++ IR_Repository_ptr &inout (void);
++ IR_Repository_ptr &out (void);
++ IR_Repository_ptr _retn (void);
++ IR_Repository_ptr ptr (void) const;
+
+ private:
+- Container_ptr ptr_;
++ IR_Repository_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- Container_var (const TAO_Base_var &rhs);
+- Container_var &operator= (const TAO_Base_var &rhs);
++ IR_Repository_var (const TAO_Base_var &rhs);
++ IR_Repository_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER___OUT_CH_)
+-#define _TAO_IR_CONTAINER___OUT_CH_
+-
+- class TAO_Export Container_out
++ class TAO_Export IR_Repository_out
+ {
+ public:
+- Container_out (Container_ptr &);
+- Container_out (Container_var &);
+- Container_out (const Container_out &);
+- Container_out &operator= (const Container_out &);
+- Container_out &operator= (const Container_var &);
+- Container_out &operator= (Container_ptr);
+- operator Container_ptr &();
+- Container_ptr &ptr (void);
+- Container_ptr operator-> (void);
++ IR_Repository_out (IR_Repository_ptr &);
++ IR_Repository_out (IR_Repository_var &);
++ IR_Repository_out (const IR_Repository_out &);
++ IR_Repository_out &operator= (const IR_Repository_out &);
++ IR_Repository_out &operator= (const IR_Repository_var &);
++ IR_Repository_out &operator= (IR_Repository_ptr);
++ operator IR_Repository_ptr &();
++ IR_Repository_ptr &ptr (void);
++ IR_Repository_ptr operator-> (void);
+
+ private:
+- Container_ptr &ptr_;
++ IR_Repository_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED___PTR_CH_)
+-#define _TAO_IR_CONTAINED___PTR_CH_
+-
+- class Contained;
+- typedef Contained *Contained_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED___VAR_CH_)
+-#define _TAO_IR_CONTAINED___VAR_CH_
+-
+- class TAO_Export Contained_var : public TAO_Base_var
++ class TAO_Export IR_Container_var : public TAO_Base_var
+ {
+ public:
+- Contained_var (void); // default constructor
+- Contained_var (Contained_ptr p) : ptr_ (p) {}
+- Contained_var (const Contained_var &); // copy constructor
+- ~Contained_var (void); // destructor
+-
+- Contained_var &operator= (Contained_ptr);
+- Contained_var &operator= (const Contained_var &);
+- Contained_ptr operator-> (void) const;
++ IR_Container_var (void); // default constructor
++ IR_Container_var (IR_Container_ptr p) : ptr_ (p) {}
++ IR_Container_var (const IR_Container_var &); // copy constructor
++ ~IR_Container_var (void); // destructor
++
++ IR_Container_var &operator= (IR_Container_ptr);
++ IR_Container_var &operator= (const IR_Container_var &);
++ IR_Container_ptr operator-> (void) const;
+
+- operator const Contained_ptr &() const;
+- operator Contained_ptr &();
++ operator const IR_Container_ptr &() const;
++ operator IR_Container_ptr &();
+ // in, inout, out, _retn
+- Contained_ptr in (void) const;
+- Contained_ptr &inout (void);
+- Contained_ptr &out (void);
+- Contained_ptr _retn (void);
+- Contained_ptr ptr (void) const;
++ IR_Container_ptr in (void) const;
++ IR_Container_ptr &inout (void);
++ IR_Container_ptr &out (void);
++ IR_Container_ptr _retn (void);
++ IR_Container_ptr ptr (void) const;
+
+ private:
+- Contained_ptr ptr_;
++ IR_Container_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- Contained_var (const TAO_Base_var &rhs);
+- Contained_var &operator= (const TAO_Base_var &rhs);
++ IR_Container_var (const TAO_Base_var &rhs);
++ IR_Container_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED___OUT_CH_)
+-#define _TAO_IR_CONTAINED___OUT_CH_
+-
+- class TAO_Export Contained_out
++ class TAO_Export IR_Container_out
+ {
+ public:
+- Contained_out (Contained_ptr &);
+- Contained_out (Contained_var &);
+- Contained_out (const Contained_out &);
+- Contained_out &operator= (const Contained_out &);
+- Contained_out &operator= (const Contained_var &);
+- Contained_out &operator= (Contained_ptr);
+- operator Contained_ptr &();
+- Contained_ptr &ptr (void);
+- Contained_ptr operator-> (void);
++ IR_Container_out (IR_Container_ptr &);
++ IR_Container_out (IR_Container_var &);
++ IR_Container_out (const IR_Container_out &);
++ IR_Container_out &operator= (const IR_Container_out &);
++ IR_Container_out &operator= (const IR_Container_var &);
++ IR_Container_out &operator= (IR_Container_ptr);
++ operator IR_Container_ptr &();
++ IR_Container_ptr &ptr (void);
++ IR_Container_ptr operator-> (void);
+
+ private:
+- Contained_ptr &ptr_;
++ IR_Container_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED_CH_)
+-#define _TAO_IR_CONTAINED_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_Contained_Proxy_Impl;
+ class _TAO_Contained_Remote_Proxy_Impl;
+ class _TAO_Contained_Proxy_Broker;
+ class _TAO_Contained_Remote_Proxy_Broker;
+
+- class TAO_Export Contained: public virtual CORBA::IRObject
++ class TAO_Export IR_Contained: public virtual CORBA_IRObject
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef Contained_ptr _ptr_type;
+- typedef Contained_var _var_type;
++ typedef IR_Contained_ptr _ptr_type;
++ typedef IR_Contained_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static Contained_ptr _duplicate (Contained_ptr obj);
+- static Contained_ptr _narrow (
++ static IR_Contained_ptr _duplicate (IR_Contained_ptr obj);
++ static IR_Contained_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static Contained_ptr _unchecked_narrow (
++ static IR_Contained_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static Contained_ptr _nil (void)
++ static IR_Contained_ptr _nil (void)
+ {
+- return (Contained_ptr)0;
++ return (IR_Contained_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -883,7 +585,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::Container_ptr defined_in (
++ virtual IR_Container_ptr defined_in (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -899,7 +601,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::Repository_ptr containing_repository (
++ virtual IR_Repository_ptr containing_repository (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -919,7 +621,7 @@
+
+ static void _tao_any_destructor (void*);
+
+- ACE_NESTED_CLASS (IR, DefinitionKind) kind;
++ IR_DefinitionKind kind;
+ CORBA::Any value;
+ };
+
+@@ -972,8 +674,8 @@
+
+ static CORBA::TypeCode_ptr _tc_Description;
+
+- virtual IR::Contained::Description * describe (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual IR_Contained::Description * describe (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+@@ -981,7 +683,7 @@
+ ));
+
+ virtual void move (
+- IR::Container_ptr new_container,
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -1004,554 +706,70 @@
+ _TAO_Contained_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
+
+ protected:
+- Contained (int collocated = 0);
++ IR_Contained (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++ protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- Contained (
++ IR_Contained (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+- virtual ~Contained (void);
+- private:
+- Contained (const Contained &);
+- void operator= (const Contained &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_Contained_id_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_Contained_id_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_Contained_id_get (const TAO_ClientRequestInfo_IR_Contained_id_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_id_get &);
+- void result (char * result);
+- // update the result
+- char * result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_Contained_id_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_Contained_id_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_Contained_id_set (const TAO_ClientRequestInfo_IR_Contained_id_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_id_set &);
+- const char * id_;
+-
+- };
+-
+- class TAO_ClientRequestInfo_IR_Contained_name_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::Contained;
+-
++
+ friend class _TAO_Contained_Remote_Proxy_Impl;
+ friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+ friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_Contained_name_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Contained_name_get (const TAO_ClientRequestInfo_IR_Contained_name_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_name_get &);
+- void result (char * result);
+- // update the result
+- char * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Contained_name_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
++
++ virtual ~IR_Contained (void);
++ private:
++ IR_Contained (const IR_Contained &);
++ void operator= (const IR_Contained &);
+
+-TAO_ClientRequestInfo_IR_Contained_name_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * name,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
++ };
+
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++// The Proxy Implementations are used by each interface to
++// perform a call. Each different implementation encapsulate
++// an invocation logics.
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+
+-private:
+- TAO_ClientRequestInfo_IR_Contained_name_set (const TAO_ClientRequestInfo_IR_Contained_name_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_name_set &);
+- const char * name_;
+-
+-};
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
+
+-class TAO_ClientRequestInfo_IR_Contained_version_get : public TAO_ClientRequestInfo
++class TAO_Export _TAO_Contained_Proxy_Impl :
++ public virtual _TAO_IRObject_Proxy_Impl
+ {
+ public:
+- friend class IR::Contained;
++ virtual ~_TAO_Contained_Proxy_Impl (void) { }
+
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Contained_version_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual char * id (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual void id (
++ CORBA_Object *_collocated_tao_target_,
++ const char * id,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-private:
+- TAO_ClientRequestInfo_IR_Contained_version_get (const TAO_ClientRequestInfo_IR_Contained_version_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_version_get &);
+- void result (char * result);
+- // update the result
+- char * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Contained_version_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Contained_version_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * version,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Contained_version_set (const TAO_ClientRequestInfo_IR_Contained_version_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_version_set &);
+- const char * version_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_Contained_defined_in_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Contained_defined_in_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Contained_defined_in_get (const TAO_ClientRequestInfo_IR_Contained_defined_in_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_defined_in_get &);
+- void result (IR::Container_ptr result);
+- // update the result
+- IR::Container_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Contained_absolute_name_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Contained_absolute_name_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Contained_absolute_name_get (const TAO_ClientRequestInfo_IR_Contained_absolute_name_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_absolute_name_get &);
+- void result (char * result);
+- // update the result
+- char * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Contained_containing_repository_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Contained_containing_repository_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Contained_containing_repository_get (const TAO_ClientRequestInfo_IR_Contained_containing_repository_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_containing_repository_get &);
+- void result (IR::Repository_ptr result);
+- // update the result
+- IR::Repository_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Contained_describe : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Contained_describe (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Contained_describe (const TAO_ClientRequestInfo_IR_Contained_describe &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_describe &);
+- void result (ACE_NESTED_CLASS (IR::Contained,Description) * result);
+- // update the result
+- ACE_NESTED_CLASS (IR::Contained,Description) * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Contained_move : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Contained;
+-
+- friend class _TAO_Contained_Remote_Proxy_Impl;
+- friend class _TAO_Contained_ThruPOA_Proxy_Impl;
+- friend class _TAO_Contained_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Contained_move (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::Container_ptr new_container,
+- const char * new_name,
+- const char * new_version,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Contained_move (const TAO_ClientRequestInfo_IR_Contained_move &);
+- void operator= (const TAO_ClientRequestInfo_IR_Contained_move &);
+- IR::Container_ptr new_container_;
+- const char * new_name_;
+- const char * new_version_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+-};
+-
+-
+-// The Proxy Implementations are used by each interface to
+-// perform a call. Each different implementation encapsulate
+-// an invocation logics.
+-
+-
+-///////////////////////////////////////////////////////////////////////
+-// Base Impl. Declaration
+-//
+-
+-class TAO_Export _TAO_Contained_Proxy_Impl :
+- public virtual CORBA::_TAO_IRObject_Proxy_Impl
+-{
+-public:
+- virtual ~_TAO_Contained_Proxy_Impl (void) { }
+-
+- virtual char * id (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void id (
+- CORBA_Object *_collocated_tao_target_,
+- const char * id,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual char * name (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
++ virtual char * name (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+ virtual void name (
+ CORBA_Object *_collocated_tao_target_,
+@@ -1579,7 +797,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::Container_ptr defined_in (
++ virtual IR_Container_ptr defined_in (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1595,7 +813,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::Repository_ptr containing_repository (
++ virtual IR_Repository_ptr containing_repository (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1603,7 +821,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::Contained::Description * describe (
++ virtual IR_Contained::Description * describe (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1613,7 +831,7 @@
+
+ virtual void move (
+ CORBA_Object *_collocated_tao_target_,
+- IR::Container_ptr new_container,
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -1624,8 +842,8 @@
+
+ protected:
+ _TAO_Contained_Proxy_Impl (void);
+-
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -1638,7 +856,7 @@
+ class TAO_Export _TAO_Contained_Remote_Proxy_Impl :
+ public virtual _TAO_Contained_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual CORBA::_TAO_IRObject_Remote_Proxy_Impl
++ public virtual _TAO_IRObject_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -1646,7 +864,7 @@
+
+ virtual ~_TAO_Contained_Remote_Proxy_Impl (void) { }
+
+- virtual char * id (
++ virtual char * id (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1697,7 +915,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::Container_ptr defined_in (
++ virtual IR_Container_ptr defined_in (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1713,7 +931,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::Repository_ptr containing_repository (
++ virtual IR_Repository_ptr containing_repository (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1721,7 +939,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::Contained::Description * describe (
++ virtual IR_Contained::Description * describe (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -1731,7 +949,7 @@
+
+ virtual void move (
+ CORBA_Object *_collocated_tao_target_,
+- IR::Container_ptr new_container,
++ IR_Container_ptr new_container,
+ const char * new_name,
+ const char * new_version,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -1739,7 +957,6 @@
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+-
+ };
+
+ //
+@@ -1762,8 +979,9 @@
+ {
+ public:
+ virtual ~_TAO_Contained_Proxy_Broker (void);
++
+ virtual _TAO_Contained_Proxy_Impl &select_proxy (
+- Contained *object,
++ IR_Contained *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -1788,9 +1006,9 @@
+ _TAO_Contained_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_Contained_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_Contained_Proxy_Impl &select_proxy (
+- Contained *object,
++ IR_Contained *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -1804,702 +1022,462 @@
+ static _TAO_Contained_Remote_Proxy_Broker *the_TAO_Contained_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Contained;
+-
+-class ModuleDef;
+-
+-#if !defined (_TAO_IR_MODULEDEF___PTR_CH_)
+-#define _TAO_IR_MODULEDEF___PTR_CH_
+-
+-typedef ModuleDef *ModuleDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_MODULEDEF___VAR_CH_)
+-#define _TAO_IR_MODULEDEF___VAR_CH_
+-
+-class TAO_Export ModuleDef_var : public TAO_Base_var
++class TAO_Export IR_ModuleDef_var : public TAO_Base_var
+ {
+ public:
+- ModuleDef_var (void); // default constructor
+- ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {}
+- ModuleDef_var (const ModuleDef_var &); // copy constructor
+- ~ModuleDef_var (void); // destructor
++ IR_ModuleDef_var (void); // default constructor
++ IR_ModuleDef_var (IR_ModuleDef_ptr p) : ptr_ (p) {}
++ IR_ModuleDef_var (const IR_ModuleDef_var &); // copy constructor
++ ~IR_ModuleDef_var (void); // destructor
+
+- ModuleDef_var &operator= (ModuleDef_ptr);
+- ModuleDef_var &operator= (const ModuleDef_var &);
+- ModuleDef_ptr operator-> (void) const;
++ IR_ModuleDef_var &operator= (IR_ModuleDef_ptr);
++ IR_ModuleDef_var &operator= (const IR_ModuleDef_var &);
++ IR_ModuleDef_ptr operator-> (void) const;
+
+- operator const ModuleDef_ptr &() const;
+- operator ModuleDef_ptr &();
++ operator const IR_ModuleDef_ptr &() const;
++ operator IR_ModuleDef_ptr &();
+ // in, inout, out, _retn
+- ModuleDef_ptr in (void) const;
+- ModuleDef_ptr &inout (void);
+- ModuleDef_ptr &out (void);
+- ModuleDef_ptr _retn (void);
+- ModuleDef_ptr ptr (void) const;
++ IR_ModuleDef_ptr in (void) const;
++ IR_ModuleDef_ptr &inout (void);
++ IR_ModuleDef_ptr &out (void);
++ IR_ModuleDef_ptr _retn (void);
++ IR_ModuleDef_ptr ptr (void) const;
+
+ private:
+- ModuleDef_ptr ptr_;
++ IR_ModuleDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ModuleDef_var (const TAO_Base_var &rhs);
+- ModuleDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ModuleDef_var (const TAO_Base_var &rhs);
++ IR_ModuleDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_MODULEDEF___OUT_CH_)
+-#define _TAO_IR_MODULEDEF___OUT_CH_
+-
+-class TAO_Export ModuleDef_out
++class TAO_Export IR_ModuleDef_out
+ {
+ public:
+- ModuleDef_out (ModuleDef_ptr &);
+- ModuleDef_out (ModuleDef_var &);
+- ModuleDef_out (const ModuleDef_out &);
+- ModuleDef_out &operator= (const ModuleDef_out &);
+- ModuleDef_out &operator= (const ModuleDef_var &);
+- ModuleDef_out &operator= (ModuleDef_ptr);
+- operator ModuleDef_ptr &();
+- ModuleDef_ptr &ptr (void);
+- ModuleDef_ptr operator-> (void);
++ IR_ModuleDef_out (IR_ModuleDef_ptr &);
++ IR_ModuleDef_out (IR_ModuleDef_var &);
++ IR_ModuleDef_out (const IR_ModuleDef_out &);
++ IR_ModuleDef_out &operator= (const IR_ModuleDef_out &);
++ IR_ModuleDef_out &operator= (const IR_ModuleDef_var &);
++ IR_ModuleDef_out &operator= (IR_ModuleDef_ptr);
++ operator IR_ModuleDef_ptr &();
++ IR_ModuleDef_ptr &ptr (void);
++ IR_ModuleDef_ptr operator-> (void);
+
+ private:
+- ModuleDef_ptr &ptr_;
++ IR_ModuleDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class ConstantDef;
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___PTR_CH_)
+-#define _TAO_IR_CONSTANTDEF___PTR_CH_
+-
+-typedef ConstantDef *ConstantDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___VAR_CH_)
+-#define _TAO_IR_CONSTANTDEF___VAR_CH_
+-
+-class TAO_Export ConstantDef_var : public TAO_Base_var
++class TAO_Export IR_ConstantDef_var : public TAO_Base_var
+ {
+ public:
+- ConstantDef_var (void); // default constructor
+- ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {}
+- ConstantDef_var (const ConstantDef_var &); // copy constructor
+- ~ConstantDef_var (void); // destructor
++ IR_ConstantDef_var (void); // default constructor
++ IR_ConstantDef_var (IR_ConstantDef_ptr p) : ptr_ (p) {}
++ IR_ConstantDef_var (const IR_ConstantDef_var &); // copy constructor
++ ~IR_ConstantDef_var (void); // destructor
+
+- ConstantDef_var &operator= (ConstantDef_ptr);
+- ConstantDef_var &operator= (const ConstantDef_var &);
+- ConstantDef_ptr operator-> (void) const;
++ IR_ConstantDef_var &operator= (IR_ConstantDef_ptr);
++ IR_ConstantDef_var &operator= (const IR_ConstantDef_var &);
++ IR_ConstantDef_ptr operator-> (void) const;
+
+- operator const ConstantDef_ptr &() const;
+- operator ConstantDef_ptr &();
++ operator const IR_ConstantDef_ptr &() const;
++ operator IR_ConstantDef_ptr &();
+ // in, inout, out, _retn
+- ConstantDef_ptr in (void) const;
+- ConstantDef_ptr &inout (void);
+- ConstantDef_ptr &out (void);
+- ConstantDef_ptr _retn (void);
+- ConstantDef_ptr ptr (void) const;
++ IR_ConstantDef_ptr in (void) const;
++ IR_ConstantDef_ptr &inout (void);
++ IR_ConstantDef_ptr &out (void);
++ IR_ConstantDef_ptr _retn (void);
++ IR_ConstantDef_ptr ptr (void) const;
+
+ private:
+- ConstantDef_ptr ptr_;
++ IR_ConstantDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ConstantDef_var (const TAO_Base_var &rhs);
+- ConstantDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ConstantDef_var (const TAO_Base_var &rhs);
++ IR_ConstantDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___OUT_CH_)
+-#define _TAO_IR_CONSTANTDEF___OUT_CH_
+-
+-class TAO_Export ConstantDef_out
++class TAO_Export IR_ConstantDef_out
+ {
+ public:
+- ConstantDef_out (ConstantDef_ptr &);
+- ConstantDef_out (ConstantDef_var &);
+- ConstantDef_out (const ConstantDef_out &);
+- ConstantDef_out &operator= (const ConstantDef_out &);
+- ConstantDef_out &operator= (const ConstantDef_var &);
+- ConstantDef_out &operator= (ConstantDef_ptr);
+- operator ConstantDef_ptr &();
+- ConstantDef_ptr &ptr (void);
+- ConstantDef_ptr operator-> (void);
++ IR_ConstantDef_out (IR_ConstantDef_ptr &);
++ IR_ConstantDef_out (IR_ConstantDef_var &);
++ IR_ConstantDef_out (const IR_ConstantDef_out &);
++ IR_ConstantDef_out &operator= (const IR_ConstantDef_out &);
++ IR_ConstantDef_out &operator= (const IR_ConstantDef_var &);
++ IR_ConstantDef_out &operator= (IR_ConstantDef_ptr);
++ operator IR_ConstantDef_ptr &();
++ IR_ConstantDef_ptr &ptr (void);
++ IR_ConstantDef_ptr operator-> (void);
+
+ private:
+- ConstantDef_ptr &ptr_;
++ IR_ConstantDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class IDLType;
+-
+-#if !defined (_TAO_IR_IDLTYPE___PTR_CH_)
+-#define _TAO_IR_IDLTYPE___PTR_CH_
+-
+-typedef IDLType *IDLType_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE___VAR_CH_)
+-#define _TAO_IR_IDLTYPE___VAR_CH_
+-
+-class TAO_Export IDLType_var : public TAO_Base_var
++class TAO_Export IR_IDLType_var : public TAO_Base_var
+ {
+ public:
+- IDLType_var (void); // default constructor
+- IDLType_var (IDLType_ptr p) : ptr_ (p) {}
+- IDLType_var (const IDLType_var &); // copy constructor
+- ~IDLType_var (void); // destructor
++ IR_IDLType_var (void); // default constructor
++ IR_IDLType_var (IR_IDLType_ptr p) : ptr_ (p) {}
++ IR_IDLType_var (const IR_IDLType_var &); // copy constructor
++ ~IR_IDLType_var (void); // destructor
+
+- IDLType_var &operator= (IDLType_ptr);
+- IDLType_var &operator= (const IDLType_var &);
+- IDLType_ptr operator-> (void) const;
++ IR_IDLType_var &operator= (IR_IDLType_ptr);
++ IR_IDLType_var &operator= (const IR_IDLType_var &);
++ IR_IDLType_ptr operator-> (void) const;
+
+- operator const IDLType_ptr &() const;
+- operator IDLType_ptr &();
++ operator const IR_IDLType_ptr &() const;
++ operator IR_IDLType_ptr &();
+ // in, inout, out, _retn
+- IDLType_ptr in (void) const;
+- IDLType_ptr &inout (void);
+- IDLType_ptr &out (void);
+- IDLType_ptr _retn (void);
+- IDLType_ptr ptr (void) const;
++ IR_IDLType_ptr in (void) const;
++ IR_IDLType_ptr &inout (void);
++ IR_IDLType_ptr &out (void);
++ IR_IDLType_ptr _retn (void);
++ IR_IDLType_ptr ptr (void) const;
+
+ private:
+- IDLType_ptr ptr_;
++ IR_IDLType_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- IDLType_var (const TAO_Base_var &rhs);
+- IDLType_var &operator= (const TAO_Base_var &rhs);
++ IR_IDLType_var (const TAO_Base_var &rhs);
++ IR_IDLType_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE___OUT_CH_)
+-#define _TAO_IR_IDLTYPE___OUT_CH_
+-
+-class TAO_Export IDLType_out
++class TAO_Export IR_IDLType_out
+ {
+ public:
+- IDLType_out (IDLType_ptr &);
+- IDLType_out (IDLType_var &);
+- IDLType_out (const IDLType_out &);
+- IDLType_out &operator= (const IDLType_out &);
+- IDLType_out &operator= (const IDLType_var &);
+- IDLType_out &operator= (IDLType_ptr);
+- operator IDLType_ptr &();
+- IDLType_ptr &ptr (void);
+- IDLType_ptr operator-> (void);
++ IR_IDLType_out (IR_IDLType_ptr &);
++ IR_IDLType_out (IR_IDLType_var &);
++ IR_IDLType_out (const IR_IDLType_out &);
++ IR_IDLType_out &operator= (const IR_IDLType_out &);
++ IR_IDLType_out &operator= (const IR_IDLType_var &);
++ IR_IDLType_out &operator= (IR_IDLType_ptr);
++ operator IR_IDLType_ptr &();
++ IR_IDLType_ptr &ptr (void);
++ IR_IDLType_ptr operator-> (void);
+
+ private:
+- IDLType_ptr &ptr_;
++ IR_IDLType_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class StructDef;
+-
+-#if !defined (_TAO_IR_STRUCTDEF___PTR_CH_)
+-#define _TAO_IR_STRUCTDEF___PTR_CH_
+-
+-typedef StructDef *StructDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF___VAR_CH_)
+-#define _TAO_IR_STRUCTDEF___VAR_CH_
+-
+-class TAO_Export StructDef_var : public TAO_Base_var
++class TAO_Export IR_StructDef_var : public TAO_Base_var
+ {
+ public:
+- StructDef_var (void); // default constructor
+- StructDef_var (StructDef_ptr p) : ptr_ (p) {}
+- StructDef_var (const StructDef_var &); // copy constructor
+- ~StructDef_var (void); // destructor
++ IR_StructDef_var (void); // default constructor
++ IR_StructDef_var (IR_StructDef_ptr p) : ptr_ (p) {}
++ IR_StructDef_var (const IR_StructDef_var &); // copy constructor
++ ~IR_StructDef_var (void); // destructor
+
+- StructDef_var &operator= (StructDef_ptr);
+- StructDef_var &operator= (const StructDef_var &);
+- StructDef_ptr operator-> (void) const;
++ IR_StructDef_var &operator= (IR_StructDef_ptr);
++ IR_StructDef_var &operator= (const IR_StructDef_var &);
++ IR_StructDef_ptr operator-> (void) const;
+
+- operator const StructDef_ptr &() const;
+- operator StructDef_ptr &();
++ operator const IR_StructDef_ptr &() const;
++ operator IR_StructDef_ptr &();
+ // in, inout, out, _retn
+- StructDef_ptr in (void) const;
+- StructDef_ptr &inout (void);
+- StructDef_ptr &out (void);
+- StructDef_ptr _retn (void);
+- StructDef_ptr ptr (void) const;
++ IR_StructDef_ptr in (void) const;
++ IR_StructDef_ptr &inout (void);
++ IR_StructDef_ptr &out (void);
++ IR_StructDef_ptr _retn (void);
++ IR_StructDef_ptr ptr (void) const;
+
+ private:
+- StructDef_ptr ptr_;
++ IR_StructDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- StructDef_var (const TAO_Base_var &rhs);
+- StructDef_var &operator= (const TAO_Base_var &rhs);
++ IR_StructDef_var (const TAO_Base_var &rhs);
++ IR_StructDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF___OUT_CH_)
+-#define _TAO_IR_STRUCTDEF___OUT_CH_
+-
+-class TAO_Export StructDef_out
++class TAO_Export IR_StructDef_out
+ {
+ public:
+- StructDef_out (StructDef_ptr &);
+- StructDef_out (StructDef_var &);
+- StructDef_out (const StructDef_out &);
+- StructDef_out &operator= (const StructDef_out &);
+- StructDef_out &operator= (const StructDef_var &);
+- StructDef_out &operator= (StructDef_ptr);
+- operator StructDef_ptr &();
+- StructDef_ptr &ptr (void);
+- StructDef_ptr operator-> (void);
++ IR_StructDef_out (IR_StructDef_ptr &);
++ IR_StructDef_out (IR_StructDef_var &);
++ IR_StructDef_out (const IR_StructDef_out &);
++ IR_StructDef_out &operator= (const IR_StructDef_out &);
++ IR_StructDef_out &operator= (const IR_StructDef_var &);
++ IR_StructDef_out &operator= (IR_StructDef_ptr);
++ operator IR_StructDef_ptr &();
++ IR_StructDef_ptr &ptr (void);
++ IR_StructDef_ptr operator-> (void);
+
+ private:
+- StructDef_ptr &ptr_;
++ IR_StructDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class UnionDef;
+-
+-#if !defined (_TAO_IR_UNIONDEF___PTR_CH_)
+-#define _TAO_IR_UNIONDEF___PTR_CH_
+-
+-typedef UnionDef *UnionDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF___VAR_CH_)
+-#define _TAO_IR_UNIONDEF___VAR_CH_
+-
+-class TAO_Export UnionDef_var : public TAO_Base_var
++class TAO_Export IR_UnionDef_var : public TAO_Base_var
+ {
+ public:
+- UnionDef_var (void); // default constructor
+- UnionDef_var (UnionDef_ptr p) : ptr_ (p) {}
+- UnionDef_var (const UnionDef_var &); // copy constructor
+- ~UnionDef_var (void); // destructor
++ IR_UnionDef_var (void); // default constructor
++ IR_UnionDef_var (IR_UnionDef_ptr p) : ptr_ (p) {}
++ IR_UnionDef_var (const IR_UnionDef_var &); // copy constructor
++ ~IR_UnionDef_var (void); // destructor
+
+- UnionDef_var &operator= (UnionDef_ptr);
+- UnionDef_var &operator= (const UnionDef_var &);
+- UnionDef_ptr operator-> (void) const;
++ IR_UnionDef_var &operator= (IR_UnionDef_ptr);
++ IR_UnionDef_var &operator= (const IR_UnionDef_var &);
++ IR_UnionDef_ptr operator-> (void) const;
+
+- operator const UnionDef_ptr &() const;
+- operator UnionDef_ptr &();
++ operator const IR_UnionDef_ptr &() const;
++ operator IR_UnionDef_ptr &();
+ // in, inout, out, _retn
+- UnionDef_ptr in (void) const;
+- UnionDef_ptr &inout (void);
+- UnionDef_ptr &out (void);
+- UnionDef_ptr _retn (void);
+- UnionDef_ptr ptr (void) const;
++ IR_UnionDef_ptr in (void) const;
++ IR_UnionDef_ptr &inout (void);
++ IR_UnionDef_ptr &out (void);
++ IR_UnionDef_ptr _retn (void);
++ IR_UnionDef_ptr ptr (void) const;
+
+ private:
+- UnionDef_ptr ptr_;
++ IR_UnionDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- UnionDef_var (const TAO_Base_var &rhs);
+- UnionDef_var &operator= (const TAO_Base_var &rhs);
++ IR_UnionDef_var (const TAO_Base_var &rhs);
++ IR_UnionDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF___OUT_CH_)
+-#define _TAO_IR_UNIONDEF___OUT_CH_
+-
+-class TAO_Export UnionDef_out
++class TAO_Export IR_UnionDef_out
+ {
+ public:
+- UnionDef_out (UnionDef_ptr &);
+- UnionDef_out (UnionDef_var &);
+- UnionDef_out (const UnionDef_out &);
+- UnionDef_out &operator= (const UnionDef_out &);
+- UnionDef_out &operator= (const UnionDef_var &);
+- UnionDef_out &operator= (UnionDef_ptr);
+- operator UnionDef_ptr &();
+- UnionDef_ptr &ptr (void);
+- UnionDef_ptr operator-> (void);
++ IR_UnionDef_out (IR_UnionDef_ptr &);
++ IR_UnionDef_out (IR_UnionDef_var &);
++ IR_UnionDef_out (const IR_UnionDef_out &);
++ IR_UnionDef_out &operator= (const IR_UnionDef_out &);
++ IR_UnionDef_out &operator= (const IR_UnionDef_var &);
++ IR_UnionDef_out &operator= (IR_UnionDef_ptr);
++ operator IR_UnionDef_ptr &();
++ IR_UnionDef_ptr &ptr (void);
++ IR_UnionDef_ptr operator-> (void);
+
+ private:
+- UnionDef_ptr &ptr_;
++ IR_UnionDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class EnumDef;
+-
+-#if !defined (_TAO_IR_ENUMDEF___PTR_CH_)
+-#define _TAO_IR_ENUMDEF___PTR_CH_
+-
+-typedef EnumDef *EnumDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF___VAR_CH_)
+-#define _TAO_IR_ENUMDEF___VAR_CH_
+-
+-class TAO_Export EnumDef_var : public TAO_Base_var
++class TAO_Export IR_EnumDef_var : public TAO_Base_var
+ {
+ public:
+- EnumDef_var (void); // default constructor
+- EnumDef_var (EnumDef_ptr p) : ptr_ (p) {}
+- EnumDef_var (const EnumDef_var &); // copy constructor
+- ~EnumDef_var (void); // destructor
++ IR_EnumDef_var (void); // default constructor
++ IR_EnumDef_var (IR_EnumDef_ptr p) : ptr_ (p) {}
++ IR_EnumDef_var (const IR_EnumDef_var &); // copy constructor
++ ~IR_EnumDef_var (void); // destructor
+
+- EnumDef_var &operator= (EnumDef_ptr);
+- EnumDef_var &operator= (const EnumDef_var &);
+- EnumDef_ptr operator-> (void) const;
++ IR_EnumDef_var &operator= (IR_EnumDef_ptr);
++ IR_EnumDef_var &operator= (const IR_EnumDef_var &);
++ IR_EnumDef_ptr operator-> (void) const;
+
+- operator const EnumDef_ptr &() const;
+- operator EnumDef_ptr &();
++ operator const IR_EnumDef_ptr &() const;
++ operator IR_EnumDef_ptr &();
+ // in, inout, out, _retn
+- EnumDef_ptr in (void) const;
+- EnumDef_ptr &inout (void);
+- EnumDef_ptr &out (void);
+- EnumDef_ptr _retn (void);
+- EnumDef_ptr ptr (void) const;
++ IR_EnumDef_ptr in (void) const;
++ IR_EnumDef_ptr &inout (void);
++ IR_EnumDef_ptr &out (void);
++ IR_EnumDef_ptr _retn (void);
++ IR_EnumDef_ptr ptr (void) const;
+
+ private:
+- EnumDef_ptr ptr_;
++ IR_EnumDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- EnumDef_var (const TAO_Base_var &rhs);
+- EnumDef_var &operator= (const TAO_Base_var &rhs);
++ IR_EnumDef_var (const TAO_Base_var &rhs);
++ IR_EnumDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF___OUT_CH_)
+-#define _TAO_IR_ENUMDEF___OUT_CH_
+-
+-class TAO_Export EnumDef_out
++class TAO_Export IR_EnumDef_out
+ {
+ public:
+- EnumDef_out (EnumDef_ptr &);
+- EnumDef_out (EnumDef_var &);
+- EnumDef_out (const EnumDef_out &);
+- EnumDef_out &operator= (const EnumDef_out &);
+- EnumDef_out &operator= (const EnumDef_var &);
+- EnumDef_out &operator= (EnumDef_ptr);
+- operator EnumDef_ptr &();
+- EnumDef_ptr &ptr (void);
+- EnumDef_ptr operator-> (void);
++ IR_EnumDef_out (IR_EnumDef_ptr &);
++ IR_EnumDef_out (IR_EnumDef_var &);
++ IR_EnumDef_out (const IR_EnumDef_out &);
++ IR_EnumDef_out &operator= (const IR_EnumDef_out &);
++ IR_EnumDef_out &operator= (const IR_EnumDef_var &);
++ IR_EnumDef_out &operator= (IR_EnumDef_ptr);
++ operator IR_EnumDef_ptr &();
++ IR_EnumDef_ptr &ptr (void);
++ IR_EnumDef_ptr operator-> (void);
+
+ private:
+- EnumDef_ptr &ptr_;
++ IR_EnumDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class AliasDef;
+-
+-#if !defined (_TAO_IR_ALIASDEF___PTR_CH_)
+-#define _TAO_IR_ALIASDEF___PTR_CH_
+-
+-typedef AliasDef *AliasDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF___VAR_CH_)
+-#define _TAO_IR_ALIASDEF___VAR_CH_
+-
+-class TAO_Export AliasDef_var : public TAO_Base_var
++class TAO_Export IR_AliasDef_var : public TAO_Base_var
+ {
+ public:
+- AliasDef_var (void); // default constructor
+- AliasDef_var (AliasDef_ptr p) : ptr_ (p) {}
+- AliasDef_var (const AliasDef_var &); // copy constructor
+- ~AliasDef_var (void); // destructor
++ IR_AliasDef_var (void); // default constructor
++ IR_AliasDef_var (IR_AliasDef_ptr p) : ptr_ (p) {}
++ IR_AliasDef_var (const IR_AliasDef_var &); // copy constructor
++ ~IR_AliasDef_var (void); // destructor
+
+- AliasDef_var &operator= (AliasDef_ptr);
+- AliasDef_var &operator= (const AliasDef_var &);
+- AliasDef_ptr operator-> (void) const;
++ IR_AliasDef_var &operator= (IR_AliasDef_ptr);
++ IR_AliasDef_var &operator= (const IR_AliasDef_var &);
++ IR_AliasDef_ptr operator-> (void) const;
+
+- operator const AliasDef_ptr &() const;
+- operator AliasDef_ptr &();
++ operator const IR_AliasDef_ptr &() const;
++ operator IR_AliasDef_ptr &();
+ // in, inout, out, _retn
+- AliasDef_ptr in (void) const;
+- AliasDef_ptr &inout (void);
+- AliasDef_ptr &out (void);
+- AliasDef_ptr _retn (void);
+- AliasDef_ptr ptr (void) const;
++ IR_AliasDef_ptr in (void) const;
++ IR_AliasDef_ptr &inout (void);
++ IR_AliasDef_ptr &out (void);
++ IR_AliasDef_ptr _retn (void);
++ IR_AliasDef_ptr ptr (void) const;
+
+ private:
+- AliasDef_ptr ptr_;
++ IR_AliasDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- AliasDef_var (const TAO_Base_var &rhs);
+- AliasDef_var &operator= (const TAO_Base_var &rhs);
++ IR_AliasDef_var (const TAO_Base_var &rhs);
++ IR_AliasDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF___OUT_CH_)
+-#define _TAO_IR_ALIASDEF___OUT_CH_
+-
+-class TAO_Export AliasDef_out
++class TAO_Export IR_AliasDef_out
+ {
+ public:
+- AliasDef_out (AliasDef_ptr &);
+- AliasDef_out (AliasDef_var &);
+- AliasDef_out (const AliasDef_out &);
+- AliasDef_out &operator= (const AliasDef_out &);
+- AliasDef_out &operator= (const AliasDef_var &);
+- AliasDef_out &operator= (AliasDef_ptr);
+- operator AliasDef_ptr &();
+- AliasDef_ptr &ptr (void);
+- AliasDef_ptr operator-> (void);
++ IR_AliasDef_out (IR_AliasDef_ptr &);
++ IR_AliasDef_out (IR_AliasDef_var &);
++ IR_AliasDef_out (const IR_AliasDef_out &);
++ IR_AliasDef_out &operator= (const IR_AliasDef_out &);
++ IR_AliasDef_out &operator= (const IR_AliasDef_var &);
++ IR_AliasDef_out &operator= (IR_AliasDef_ptr);
++ operator IR_AliasDef_ptr &();
++ IR_AliasDef_ptr &ptr (void);
++ IR_AliasDef_ptr operator-> (void);
+
+ private:
+- AliasDef_ptr &ptr_;
++ IR_AliasDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class InterfaceDef;
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___PTR_CH_)
+-#define _TAO_IR_INTERFACEDEF___PTR_CH_
+-
+-typedef InterfaceDef *InterfaceDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___VAR_CH_)
+-#define _TAO_IR_INTERFACEDEF___VAR_CH_
+-
+-class TAO_Export InterfaceDef_var : public TAO_Base_var
++class TAO_Export IR_InterfaceDef_var : public TAO_Base_var
+ {
+ public:
+- InterfaceDef_var (void); // default constructor
+- InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {}
+- InterfaceDef_var (const InterfaceDef_var &); // copy constructor
+- ~InterfaceDef_var (void); // destructor
++ IR_InterfaceDef_var (void); // default constructor
++ IR_InterfaceDef_var (IR_InterfaceDef_ptr p) : ptr_ (p) {}
++ IR_InterfaceDef_var (const IR_InterfaceDef_var &); // copy constructor
++ ~IR_InterfaceDef_var (void); // destructor
+
+- InterfaceDef_var &operator= (InterfaceDef_ptr);
+- InterfaceDef_var &operator= (const InterfaceDef_var &);
+- InterfaceDef_ptr operator-> (void) const;
++ IR_InterfaceDef_var &operator= (IR_InterfaceDef_ptr);
++ IR_InterfaceDef_var &operator= (const IR_InterfaceDef_var &);
++ IR_InterfaceDef_ptr operator-> (void) const;
+
+- operator const InterfaceDef_ptr &() const;
+- operator InterfaceDef_ptr &();
++ operator const IR_InterfaceDef_ptr &() const;
++ operator IR_InterfaceDef_ptr &();
+ // in, inout, out, _retn
+- InterfaceDef_ptr in (void) const;
+- InterfaceDef_ptr &inout (void);
+- InterfaceDef_ptr &out (void);
+- InterfaceDef_ptr _retn (void);
+- InterfaceDef_ptr ptr (void) const;
++ IR_InterfaceDef_ptr in (void) const;
++ IR_InterfaceDef_ptr &inout (void);
++ IR_InterfaceDef_ptr &out (void);
++ IR_InterfaceDef_ptr _retn (void);
++ IR_InterfaceDef_ptr ptr (void) const;
+
+ private:
+- InterfaceDef_ptr ptr_;
++ IR_InterfaceDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- InterfaceDef_var (const TAO_Base_var &rhs);
+- InterfaceDef_var &operator= (const TAO_Base_var &rhs);
++ IR_InterfaceDef_var (const TAO_Base_var &rhs);
++ IR_InterfaceDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___OUT_CH_)
+-#define _TAO_IR_INTERFACEDEF___OUT_CH_
+-
+-class TAO_Export InterfaceDef_out
++class TAO_Export IR_InterfaceDef_out
+ {
+ public:
+- InterfaceDef_out (InterfaceDef_ptr &);
+- InterfaceDef_out (InterfaceDef_var &);
+- InterfaceDef_out (const InterfaceDef_out &);
+- InterfaceDef_out &operator= (const InterfaceDef_out &);
+- InterfaceDef_out &operator= (const InterfaceDef_var &);
+- InterfaceDef_out &operator= (InterfaceDef_ptr);
+- operator InterfaceDef_ptr &();
+- InterfaceDef_ptr &ptr (void);
+- InterfaceDef_ptr operator-> (void);
++ IR_InterfaceDef_out (IR_InterfaceDef_ptr &);
++ IR_InterfaceDef_out (IR_InterfaceDef_var &);
++ IR_InterfaceDef_out (const IR_InterfaceDef_out &);
++ IR_InterfaceDef_out &operator= (const IR_InterfaceDef_out &);
++ IR_InterfaceDef_out &operator= (const IR_InterfaceDef_var &);
++ IR_InterfaceDef_out &operator= (IR_InterfaceDef_ptr);
++ operator IR_InterfaceDef_ptr &();
++ IR_InterfaceDef_ptr &ptr (void);
++ IR_InterfaceDef_ptr operator-> (void);
+
+ private:
+- InterfaceDef_ptr &ptr_;
++ IR_InterfaceDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class ExceptionDef;
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___PTR_CH_)
+-#define _TAO_IR_EXCEPTIONDEF___PTR_CH_
+-
+-typedef ExceptionDef *ExceptionDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___VAR_CH_)
+-#define _TAO_IR_EXCEPTIONDEF___VAR_CH_
+-
+-class TAO_Export ExceptionDef_var : public TAO_Base_var
++class TAO_Export IR_ExceptionDef_var : public TAO_Base_var
+ {
+ public:
+- ExceptionDef_var (void); // default constructor
+- ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {}
+- ExceptionDef_var (const ExceptionDef_var &); // copy constructor
+- ~ExceptionDef_var (void); // destructor
++ IR_ExceptionDef_var (void); // default constructor
++ IR_ExceptionDef_var (IR_ExceptionDef_ptr p) : ptr_ (p) {}
++ IR_ExceptionDef_var (const IR_ExceptionDef_var &); // copy constructor
++ ~IR_ExceptionDef_var (void); // destructor
+
+- ExceptionDef_var &operator= (ExceptionDef_ptr);
+- ExceptionDef_var &operator= (const ExceptionDef_var &);
+- ExceptionDef_ptr operator-> (void) const;
++ IR_ExceptionDef_var &operator= (IR_ExceptionDef_ptr);
++ IR_ExceptionDef_var &operator= (const IR_ExceptionDef_var &);
++ IR_ExceptionDef_ptr operator-> (void) const;
+
+- operator const ExceptionDef_ptr &() const;
+- operator ExceptionDef_ptr &();
++ operator const IR_ExceptionDef_ptr &() const;
++ operator IR_ExceptionDef_ptr &();
+ // in, inout, out, _retn
+- ExceptionDef_ptr in (void) const;
+- ExceptionDef_ptr &inout (void);
+- ExceptionDef_ptr &out (void);
+- ExceptionDef_ptr _retn (void);
+- ExceptionDef_ptr ptr (void) const;
++ IR_ExceptionDef_ptr in (void) const;
++ IR_ExceptionDef_ptr &inout (void);
++ IR_ExceptionDef_ptr &out (void);
++ IR_ExceptionDef_ptr _retn (void);
++ IR_ExceptionDef_ptr ptr (void) const;
+
+ private:
+- ExceptionDef_ptr ptr_;
++ IR_ExceptionDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ExceptionDef_var (const TAO_Base_var &rhs);
+- ExceptionDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ExceptionDef_var (const TAO_Base_var &rhs);
++ IR_ExceptionDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___OUT_CH_)
+-#define _TAO_IR_EXCEPTIONDEF___OUT_CH_
+-
+-class TAO_Export ExceptionDef_out
++class TAO_Export IR_ExceptionDef_out
+ {
+ public:
+- ExceptionDef_out (ExceptionDef_ptr &);
+- ExceptionDef_out (ExceptionDef_var &);
+- ExceptionDef_out (const ExceptionDef_out &);
+- ExceptionDef_out &operator= (const ExceptionDef_out &);
+- ExceptionDef_out &operator= (const ExceptionDef_var &);
+- ExceptionDef_out &operator= (ExceptionDef_ptr);
+- operator ExceptionDef_ptr &();
+- ExceptionDef_ptr &ptr (void);
+- ExceptionDef_ptr operator-> (void);
++ IR_ExceptionDef_out (IR_ExceptionDef_ptr &);
++ IR_ExceptionDef_out (IR_ExceptionDef_var &);
++ IR_ExceptionDef_out (const IR_ExceptionDef_out &);
++ IR_ExceptionDef_out &operator= (const IR_ExceptionDef_out &);
++ IR_ExceptionDef_out &operator= (const IR_ExceptionDef_var &);
++ IR_ExceptionDef_out &operator= (IR_ExceptionDef_ptr);
++ operator IR_ExceptionDef_ptr &();
++ IR_ExceptionDef_ptr &ptr (void);
++ IR_ExceptionDef_ptr operator-> (void);
+
+ private:
+- ExceptionDef_ptr &ptr_;
++ IR_ExceptionDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class NativeDef;
+-
+-#if !defined (_TAO_IR_NATIVEDEF___PTR_CH_)
+-#define _TAO_IR_NATIVEDEF___PTR_CH_
+-
+-typedef NativeDef *NativeDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF___VAR_CH_)
+-#define _TAO_IR_NATIVEDEF___VAR_CH_
+-
+-class TAO_Export NativeDef_var : public TAO_Base_var
++class TAO_Export IR_NativeDef_var : public TAO_Base_var
+ {
+ public:
+- NativeDef_var (void); // default constructor
+- NativeDef_var (NativeDef_ptr p) : ptr_ (p) {}
+- NativeDef_var (const NativeDef_var &); // copy constructor
+- ~NativeDef_var (void); // destructor
++ IR_NativeDef_var (void); // default constructor
++ IR_NativeDef_var (IR_NativeDef_ptr p) : ptr_ (p) {}
++ IR_NativeDef_var (const IR_NativeDef_var &); // copy constructor
++ ~IR_NativeDef_var (void); // destructor
+
+- NativeDef_var &operator= (NativeDef_ptr);
+- NativeDef_var &operator= (const NativeDef_var &);
+- NativeDef_ptr operator-> (void) const;
++ IR_NativeDef_var &operator= (IR_NativeDef_ptr);
++ IR_NativeDef_var &operator= (const IR_NativeDef_var &);
++ IR_NativeDef_ptr operator-> (void) const;
+
+- operator const NativeDef_ptr &() const;
+- operator NativeDef_ptr &();
++ operator const IR_NativeDef_ptr &() const;
++ operator IR_NativeDef_ptr &();
+ // in, inout, out, _retn
+- NativeDef_ptr in (void) const;
+- NativeDef_ptr &inout (void);
+- NativeDef_ptr &out (void);
+- NativeDef_ptr _retn (void);
+- NativeDef_ptr ptr (void) const;
++ IR_NativeDef_ptr in (void) const;
++ IR_NativeDef_ptr &inout (void);
++ IR_NativeDef_ptr &out (void);
++ IR_NativeDef_ptr _retn (void);
++ IR_NativeDef_ptr ptr (void) const;
+
+ private:
+- NativeDef_ptr ptr_;
++ IR_NativeDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- NativeDef_var (const TAO_Base_var &rhs);
+- NativeDef_var &operator= (const TAO_Base_var &rhs);
++ IR_NativeDef_var (const TAO_Base_var &rhs);
++ IR_NativeDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF___OUT_CH_)
+-#define _TAO_IR_NATIVEDEF___OUT_CH_
+-
+-class TAO_Export NativeDef_out
++class TAO_Export IR_NativeDef_out
+ {
+ public:
+- NativeDef_out (NativeDef_ptr &);
+- NativeDef_out (NativeDef_var &);
+- NativeDef_out (const NativeDef_out &);
+- NativeDef_out &operator= (const NativeDef_out &);
+- NativeDef_out &operator= (const NativeDef_var &);
+- NativeDef_out &operator= (NativeDef_ptr);
+- operator NativeDef_ptr &();
+- NativeDef_ptr &ptr (void);
+- NativeDef_ptr operator-> (void);
++ IR_NativeDef_out (IR_NativeDef_ptr &);
++ IR_NativeDef_out (IR_NativeDef_var &);
++ IR_NativeDef_out (const IR_NativeDef_out &);
++ IR_NativeDef_out &operator= (const IR_NativeDef_out &);
++ IR_NativeDef_out &operator= (const IR_NativeDef_var &);
++ IR_NativeDef_out &operator= (IR_NativeDef_ptr);
++ operator IR_NativeDef_ptr &();
++ IR_NativeDef_ptr &ptr (void);
++ IR_NativeDef_ptr operator-> (void);
+
+ private:
+- NativeDef_ptr &ptr_;
++ IR_NativeDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -2509,19 +1487,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- InterfaceDef* *value,
++ IR_InterfaceDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs);
+- TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var> operator[] (CORBA::ULong index) const;
+- static InterfaceDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (InterfaceDef **buffer);
++ TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var> operator[] (CORBA::ULong index) const;
++ static IR_InterfaceDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_InterfaceDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const InterfaceDef* *get_buffer (void) const;
++ IR_InterfaceDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_InterfaceDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -2533,193 +1511,139 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_INTERFACEDEFSEQ_CH_)
+-#define _TAO_IR_INTERFACEDEFSEQ_CH_
+-
+-class InterfaceDefSeq;
+-class InterfaceDefSeq_var;
+-
+ // *************************************************************
+-// InterfaceDefSeq
++// IR_InterfaceDefSeq
+ // *************************************************************
+
+-class TAO_Export InterfaceDefSeq : public
++class TAO_Export IR_InterfaceDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<InterfaceDef,InterfaceDef_var>
++ TAO_Unbounded_Object_Sequence<IR_InterfaceDef,IR_InterfaceDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- InterfaceDefSeq (void); // default ctor
+- InterfaceDefSeq (CORBA::ULong max); // uses max size
+- InterfaceDefSeq (
++ IR_InterfaceDefSeq (void); // default ctor
++ IR_InterfaceDefSeq (CORBA::ULong max); // uses max size
++ IR_InterfaceDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- InterfaceDef_ptr *buffer,
++ IR_InterfaceDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- InterfaceDefSeq (const InterfaceDefSeq &); // copy ctor
+- ~InterfaceDefSeq (void);
++ IR_InterfaceDefSeq (const IR_InterfaceDefSeq &); // copy ctor
++ ~IR_InterfaceDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef InterfaceDefSeq_var _var_type;
++ typedef IR_InterfaceDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
++// *************************************************************
++// class IR_InterfaceDefSeq_var
++// *************************************************************
+
+-
+-#if !defined (_TAO_IR_INTERFACEDEFSEQ___VAR_CH_)
+-#define _TAO_IR_INTERFACEDEFSEQ___VAR_CH_
+-
+-// *************************************************************
+-// class IR::InterfaceDefSeq_var
+-// *************************************************************
+-
+-class TAO_Export InterfaceDefSeq_var
++class TAO_Export IR_InterfaceDefSeq_var
+ {
+ public:
+- InterfaceDefSeq_var (void); // default constructor
+- InterfaceDefSeq_var (InterfaceDefSeq *);
+- InterfaceDefSeq_var (const InterfaceDefSeq_var &); // copy constructor
+- ~InterfaceDefSeq_var (void); // destructor
++ IR_InterfaceDefSeq_var (void); // default constructor
++ IR_InterfaceDefSeq_var (IR_InterfaceDefSeq *);
++ IR_InterfaceDefSeq_var (const IR_InterfaceDefSeq_var &); // copy constructor
++ ~IR_InterfaceDefSeq_var (void); // destructor
+
+- InterfaceDefSeq_var &operator= (InterfaceDefSeq *);
+- InterfaceDefSeq_var &operator= (const InterfaceDefSeq_var &);
+- InterfaceDefSeq *operator-> (void);
+- const InterfaceDefSeq *operator-> (void) const;
++ IR_InterfaceDefSeq_var &operator= (IR_InterfaceDefSeq *);
++ IR_InterfaceDefSeq_var &operator= (const IR_InterfaceDefSeq_var &);
++ IR_InterfaceDefSeq *operator-> (void);
++ const IR_InterfaceDefSeq *operator-> (void) const;
+
+- operator const InterfaceDefSeq &() const;
+- operator InterfaceDefSeq &();
+- operator InterfaceDefSeq &() const;
+- operator InterfaceDefSeq *&(); // variable-size base types only
++ operator const IR_InterfaceDefSeq &() const;
++ operator IR_InterfaceDefSeq &();
++ operator IR_InterfaceDefSeq &() const;
++ operator IR_InterfaceDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const InterfaceDefSeq &in (void) const;
+- InterfaceDefSeq &inout (void);
+- InterfaceDefSeq *&out (void);
+- InterfaceDefSeq *_retn (void);
+- InterfaceDefSeq *ptr (void) const;
++ const IR_InterfaceDefSeq &in (void) const;
++ IR_InterfaceDefSeq &inout (void);
++ IR_InterfaceDefSeq *&out (void);
++ IR_InterfaceDefSeq *_retn (void);
++ IR_InterfaceDefSeq *ptr (void) const;
+
+ private:
+- InterfaceDefSeq *ptr_;
++ IR_InterfaceDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEFSEQ___OUT_CH_)
+-#define _TAO_IR_INTERFACEDEFSEQ___OUT_CH_
+-
+-class TAO_Export InterfaceDefSeq_out
++class TAO_Export IR_InterfaceDefSeq_out
+ {
+ public:
+- InterfaceDefSeq_out (InterfaceDefSeq *&);
+- InterfaceDefSeq_out (InterfaceDefSeq_var &);
+- InterfaceDefSeq_out (const InterfaceDefSeq_out &);
+- InterfaceDefSeq_out &operator= (const InterfaceDefSeq_out &);
+- InterfaceDefSeq_out &operator= (InterfaceDefSeq *);
+- operator InterfaceDefSeq *&();
+- InterfaceDefSeq *&ptr (void);
+- InterfaceDefSeq *operator-> (void);
+- TAO_Object_Manager<InterfaceDef, InterfaceDef_var> operator[] (CORBA::ULong index);
++ IR_InterfaceDefSeq_out (IR_InterfaceDefSeq *&);
++ IR_InterfaceDefSeq_out (IR_InterfaceDefSeq_var &);
++ IR_InterfaceDefSeq_out (const IR_InterfaceDefSeq_out &);
++ IR_InterfaceDefSeq_out &operator= (const IR_InterfaceDefSeq_out &);
++ IR_InterfaceDefSeq_out &operator= (IR_InterfaceDefSeq *);
++ operator IR_InterfaceDefSeq *&();
++ IR_InterfaceDefSeq *&ptr (void);
++ IR_InterfaceDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- InterfaceDefSeq *&ptr_;
++ IR_InterfaceDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const InterfaceDefSeq_var &);
++ void operator= (const IR_InterfaceDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
+-
+-class ValueDef;
+-
+-#if !defined (_TAO_IR_VALUEDEF___PTR_CH_)
+-#define _TAO_IR_VALUEDEF___PTR_CH_
+-
+-typedef ValueDef *ValueDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF___VAR_CH_)
+-#define _TAO_IR_VALUEDEF___VAR_CH_
+-
+-class TAO_Export ValueDef_var : public TAO_Base_var
++class TAO_Export IR_ValueDef_var : public TAO_Base_var
+ {
+ public:
+- ValueDef_var (void); // default constructor
+- ValueDef_var (ValueDef_ptr p) : ptr_ (p) {}
+- ValueDef_var (const ValueDef_var &); // copy constructor
+- ~ValueDef_var (void); // destructor
++ IR_ValueDef_var (void); // default constructor
++ IR_ValueDef_var (IR_ValueDef_ptr p) : ptr_ (p) {}
++ IR_ValueDef_var (const IR_ValueDef_var &); // copy constructor
++ ~IR_ValueDef_var (void); // destructor
+
+- ValueDef_var &operator= (ValueDef_ptr);
+- ValueDef_var &operator= (const ValueDef_var &);
+- ValueDef_ptr operator-> (void) const;
++ IR_ValueDef_var &operator= (IR_ValueDef_ptr);
++ IR_ValueDef_var &operator= (const IR_ValueDef_var &);
++ IR_ValueDef_ptr operator-> (void) const;
+
+- operator const ValueDef_ptr &() const;
+- operator ValueDef_ptr &();
++ operator const IR_ValueDef_ptr &() const;
++ operator IR_ValueDef_ptr &();
+ // in, inout, out, _retn
+- ValueDef_ptr in (void) const;
+- ValueDef_ptr &inout (void);
+- ValueDef_ptr &out (void);
+- ValueDef_ptr _retn (void);
+- ValueDef_ptr ptr (void) const;
++ IR_ValueDef_ptr in (void) const;
++ IR_ValueDef_ptr &inout (void);
++ IR_ValueDef_ptr &out (void);
++ IR_ValueDef_ptr _retn (void);
++ IR_ValueDef_ptr ptr (void) const;
+
+ private:
+- ValueDef_ptr ptr_;
++ IR_ValueDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ValueDef_var (const TAO_Base_var &rhs);
+- ValueDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ValueDef_var (const TAO_Base_var &rhs);
++ IR_ValueDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF___OUT_CH_)
+-#define _TAO_IR_VALUEDEF___OUT_CH_
+-
+-class TAO_Export ValueDef_out
++class TAO_Export IR_ValueDef_out
+ {
+ public:
+- ValueDef_out (ValueDef_ptr &);
+- ValueDef_out (ValueDef_var &);
+- ValueDef_out (const ValueDef_out &);
+- ValueDef_out &operator= (const ValueDef_out &);
+- ValueDef_out &operator= (const ValueDef_var &);
+- ValueDef_out &operator= (ValueDef_ptr);
+- operator ValueDef_ptr &();
+- ValueDef_ptr &ptr (void);
+- ValueDef_ptr operator-> (void);
++ IR_ValueDef_out (IR_ValueDef_ptr &);
++ IR_ValueDef_out (IR_ValueDef_var &);
++ IR_ValueDef_out (const IR_ValueDef_out &);
++ IR_ValueDef_out &operator= (const IR_ValueDef_out &);
++ IR_ValueDef_out &operator= (const IR_ValueDef_var &);
++ IR_ValueDef_out &operator= (IR_ValueDef_ptr);
++ operator IR_ValueDef_ptr &();
++ IR_ValueDef_ptr &ptr (void);
++ IR_ValueDef_ptr operator-> (void);
+
+ private:
+- ValueDef_ptr &ptr_;
++ IR_ValueDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -2729,19 +1653,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ValueDef* *value,
++ IR_ValueDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs);
+- TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var> operator[] (CORBA::ULong index) const;
+- static ValueDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (ValueDef **buffer);
++ TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var> operator[] (CORBA::ULong index) const;
++ static IR_ValueDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_ValueDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const ValueDef* *get_buffer (void) const;
++ IR_ValueDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ValueDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -2753,261 +1677,184 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_VALUEDEFSEQ_CH_)
+-#define _TAO_IR_VALUEDEFSEQ_CH_
+-
+-class ValueDefSeq;
+-class ValueDefSeq_var;
+-
+ // *************************************************************
+-// ValueDefSeq
++// IR_ValueDefSeq
+ // *************************************************************
+
+-class TAO_Export ValueDefSeq : public
++class TAO_Export IR_ValueDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<ValueDef,ValueDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ValueDef,IR_ValueDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ValueDefSeq (void); // default ctor
+- ValueDefSeq (CORBA::ULong max); // uses max size
+- ValueDefSeq (
++ IR_ValueDefSeq (void); // default ctor
++ IR_ValueDefSeq (CORBA::ULong max); // uses max size
++ IR_ValueDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ValueDef_ptr *buffer,
++ IR_ValueDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- ValueDefSeq (const ValueDefSeq &); // copy ctor
+- ~ValueDefSeq (void);
++ IR_ValueDefSeq (const IR_ValueDefSeq &); // copy ctor
++ ~IR_ValueDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ValueDefSeq_var _var_type;
++ typedef IR_ValueDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEFSEQ___VAR_CH_)
+-#define _TAO_IR_VALUEDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ValueDefSeq_var
++// class IR_ValueDefSeq_var
+ // *************************************************************
+
+-class TAO_Export ValueDefSeq_var
++class TAO_Export IR_ValueDefSeq_var
+ {
+ public:
+- ValueDefSeq_var (void); // default constructor
+- ValueDefSeq_var (ValueDefSeq *);
+- ValueDefSeq_var (const ValueDefSeq_var &); // copy constructor
+- ~ValueDefSeq_var (void); // destructor
++ IR_ValueDefSeq_var (void); // default constructor
++ IR_ValueDefSeq_var (IR_ValueDefSeq *);
++ IR_ValueDefSeq_var (const IR_ValueDefSeq_var &); // copy constructor
++ ~IR_ValueDefSeq_var (void); // destructor
+
+- ValueDefSeq_var &operator= (ValueDefSeq *);
+- ValueDefSeq_var &operator= (const ValueDefSeq_var &);
+- ValueDefSeq *operator-> (void);
+- const ValueDefSeq *operator-> (void) const;
++ IR_ValueDefSeq_var &operator= (IR_ValueDefSeq *);
++ IR_ValueDefSeq_var &operator= (const IR_ValueDefSeq_var &);
++ IR_ValueDefSeq *operator-> (void);
++ const IR_ValueDefSeq *operator-> (void) const;
+
+- operator const ValueDefSeq &() const;
+- operator ValueDefSeq &();
+- operator ValueDefSeq &() const;
+- operator ValueDefSeq *&(); // variable-size base types only
++ operator const IR_ValueDefSeq &() const;
++ operator IR_ValueDefSeq &();
++ operator IR_ValueDefSeq &() const;
++ operator IR_ValueDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const ValueDefSeq &in (void) const;
+- ValueDefSeq &inout (void);
+- ValueDefSeq *&out (void);
+- ValueDefSeq *_retn (void);
+- ValueDefSeq *ptr (void) const;
++ const IR_ValueDefSeq &in (void) const;
++ IR_ValueDefSeq &inout (void);
++ IR_ValueDefSeq *&out (void);
++ IR_ValueDefSeq *_retn (void);
++ IR_ValueDefSeq *ptr (void) const;
+
+ private:
+- ValueDefSeq *ptr_;
++ IR_ValueDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEFSEQ___OUT_CH_)
+-#define _TAO_IR_VALUEDEFSEQ___OUT_CH_
+-
+-class TAO_Export ValueDefSeq_out
++class TAO_Export IR_ValueDefSeq_out
+ {
+ public:
+- ValueDefSeq_out (ValueDefSeq *&);
+- ValueDefSeq_out (ValueDefSeq_var &);
+- ValueDefSeq_out (const ValueDefSeq_out &);
+- ValueDefSeq_out &operator= (const ValueDefSeq_out &);
+- ValueDefSeq_out &operator= (ValueDefSeq *);
+- operator ValueDefSeq *&();
+- ValueDefSeq *&ptr (void);
+- ValueDefSeq *operator-> (void);
+- TAO_Object_Manager<ValueDef, ValueDef_var> operator[] (CORBA::ULong index);
++ IR_ValueDefSeq_out (IR_ValueDefSeq *&);
++ IR_ValueDefSeq_out (IR_ValueDefSeq_var &);
++ IR_ValueDefSeq_out (const IR_ValueDefSeq_out &);
++ IR_ValueDefSeq_out &operator= (const IR_ValueDefSeq_out &);
++ IR_ValueDefSeq_out &operator= (IR_ValueDefSeq *);
++ operator IR_ValueDefSeq *&();
++ IR_ValueDefSeq *&ptr (void);
++ IR_ValueDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- ValueDefSeq *&ptr_;
++ IR_ValueDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ValueDefSeq_var &);
++ void operator= (const IR_ValueDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDefSeq;
+-
+-class ValueBoxDef;
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___PTR_CH_)
+-#define _TAO_IR_VALUEBOXDEF___PTR_CH_
+-
+-typedef ValueBoxDef *ValueBoxDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___VAR_CH_)
+-#define _TAO_IR_VALUEBOXDEF___VAR_CH_
+-
+-class TAO_Export ValueBoxDef_var : public TAO_Base_var
++class TAO_Export IR_ValueBoxDef_var : public TAO_Base_var
+ {
+ public:
+- ValueBoxDef_var (void); // default constructor
+- ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {}
+- ValueBoxDef_var (const ValueBoxDef_var &); // copy constructor
+- ~ValueBoxDef_var (void); // destructor
++ IR_ValueBoxDef_var (void); // default constructor
++ IR_ValueBoxDef_var (IR_ValueBoxDef_ptr p) : ptr_ (p) {}
++ IR_ValueBoxDef_var (const IR_ValueBoxDef_var &); // copy constructor
++ ~IR_ValueBoxDef_var (void); // destructor
+
+- ValueBoxDef_var &operator= (ValueBoxDef_ptr);
+- ValueBoxDef_var &operator= (const ValueBoxDef_var &);
+- ValueBoxDef_ptr operator-> (void) const;
++ IR_ValueBoxDef_var &operator= (IR_ValueBoxDef_ptr);
++ IR_ValueBoxDef_var &operator= (const IR_ValueBoxDef_var &);
++ IR_ValueBoxDef_ptr operator-> (void) const;
+
+- operator const ValueBoxDef_ptr &() const;
+- operator ValueBoxDef_ptr &();
++ operator const IR_ValueBoxDef_ptr &() const;
++ operator IR_ValueBoxDef_ptr &();
+ // in, inout, out, _retn
+- ValueBoxDef_ptr in (void) const;
+- ValueBoxDef_ptr &inout (void);
+- ValueBoxDef_ptr &out (void);
+- ValueBoxDef_ptr _retn (void);
+- ValueBoxDef_ptr ptr (void) const;
++ IR_ValueBoxDef_ptr in (void) const;
++ IR_ValueBoxDef_ptr &inout (void);
++ IR_ValueBoxDef_ptr &out (void);
++ IR_ValueBoxDef_ptr _retn (void);
++ IR_ValueBoxDef_ptr ptr (void) const;
+
+ private:
+- ValueBoxDef_ptr ptr_;
++ IR_ValueBoxDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ValueBoxDef_var (const TAO_Base_var &rhs);
+- ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ValueBoxDef_var (const TAO_Base_var &rhs);
++ IR_ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___OUT_CH_)
+-#define _TAO_IR_VALUEBOXDEF___OUT_CH_
+-
+-class TAO_Export ValueBoxDef_out
++class TAO_Export IR_ValueBoxDef_out
+ {
+ public:
+- ValueBoxDef_out (ValueBoxDef_ptr &);
+- ValueBoxDef_out (ValueBoxDef_var &);
+- ValueBoxDef_out (const ValueBoxDef_out &);
+- ValueBoxDef_out &operator= (const ValueBoxDef_out &);
+- ValueBoxDef_out &operator= (const ValueBoxDef_var &);
+- ValueBoxDef_out &operator= (ValueBoxDef_ptr);
+- operator ValueBoxDef_ptr &();
+- ValueBoxDef_ptr &ptr (void);
+- ValueBoxDef_ptr operator-> (void);
++ IR_ValueBoxDef_out (IR_ValueBoxDef_ptr &);
++ IR_ValueBoxDef_out (IR_ValueBoxDef_var &);
++ IR_ValueBoxDef_out (const IR_ValueBoxDef_out &);
++ IR_ValueBoxDef_out &operator= (const IR_ValueBoxDef_out &);
++ IR_ValueBoxDef_out &operator= (const IR_ValueBoxDef_var &);
++ IR_ValueBoxDef_out &operator= (IR_ValueBoxDef_ptr);
++ operator IR_ValueBoxDef_ptr &();
++ IR_ValueBoxDef_ptr &ptr (void);
++ IR_ValueBoxDef_ptr operator-> (void);
+
+ private:
+- ValueBoxDef_ptr &ptr_;
++ IR_ValueBoxDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class ComponentDef;
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___PTR_CH_)
+-#define _TAO_IR_COMPONENTDEF___PTR_CH_
+-
+-typedef ComponentDef *ComponentDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___VAR_CH_)
+-#define _TAO_IR_COMPONENTDEF___VAR_CH_
+-
+-class TAO_Export ComponentDef_var : public TAO_Base_var
++class TAO_Export IR_ComponentDef_var : public TAO_Base_var
+ {
+ public:
+- ComponentDef_var (void); // default constructor
+- ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {}
+- ComponentDef_var (const ComponentDef_var &); // copy constructor
+- ~ComponentDef_var (void); // destructor
++ IR_ComponentDef_var (void); // default constructor
++ IR_ComponentDef_var (IR_ComponentDef_ptr p) : ptr_ (p) {}
++ IR_ComponentDef_var (const IR_ComponentDef_var &); // copy constructor
++ ~IR_ComponentDef_var (void); // destructor
+
+- ComponentDef_var &operator= (ComponentDef_ptr);
+- ComponentDef_var &operator= (const ComponentDef_var &);
+- ComponentDef_ptr operator-> (void) const;
++ IR_ComponentDef_var &operator= (IR_ComponentDef_ptr);
++ IR_ComponentDef_var &operator= (const IR_ComponentDef_var &);
++ IR_ComponentDef_ptr operator-> (void) const;
+
+- operator const ComponentDef_ptr &() const;
+- operator ComponentDef_ptr &();
++ operator const IR_ComponentDef_ptr &() const;
++ operator IR_ComponentDef_ptr &();
+ // in, inout, out, _retn
+- ComponentDef_ptr in (void) const;
+- ComponentDef_ptr &inout (void);
+- ComponentDef_ptr &out (void);
+- ComponentDef_ptr _retn (void);
+- ComponentDef_ptr ptr (void) const;
++ IR_ComponentDef_ptr in (void) const;
++ IR_ComponentDef_ptr &inout (void);
++ IR_ComponentDef_ptr &out (void);
++ IR_ComponentDef_ptr _retn (void);
++ IR_ComponentDef_ptr ptr (void) const;
+
+ private:
+- ComponentDef_ptr ptr_;
++ IR_ComponentDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ComponentDef_var (const TAO_Base_var &rhs);
+- ComponentDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ComponentDef_var (const TAO_Base_var &rhs);
++ IR_ComponentDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___OUT_CH_)
+-#define _TAO_IR_COMPONENTDEF___OUT_CH_
+-
+-class TAO_Export ComponentDef_out
++class TAO_Export IR_ComponentDef_out
+ {
+ public:
+- ComponentDef_out (ComponentDef_ptr &);
+- ComponentDef_out (ComponentDef_var &);
+- ComponentDef_out (const ComponentDef_out &);
+- ComponentDef_out &operator= (const ComponentDef_out &);
+- ComponentDef_out &operator= (const ComponentDef_var &);
+- ComponentDef_out &operator= (ComponentDef_ptr);
+- operator ComponentDef_ptr &();
+- ComponentDef_ptr &ptr (void);
+- ComponentDef_ptr operator-> (void);
++ IR_ComponentDef_out (IR_ComponentDef_ptr &);
++ IR_ComponentDef_out (IR_ComponentDef_var &);
++ IR_ComponentDef_out (const IR_ComponentDef_out &);
++ IR_ComponentDef_out &operator= (const IR_ComponentDef_out &);
++ IR_ComponentDef_out &operator= (const IR_ComponentDef_var &);
++ IR_ComponentDef_out &operator= (IR_ComponentDef_ptr);
++ operator IR_ComponentDef_ptr &();
++ IR_ComponentDef_ptr &ptr (void);
++ IR_ComponentDef_ptr operator-> (void);
+
+ private:
+- ComponentDef_ptr &ptr_;
++ IR_ComponentDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -3017,19 +1864,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ComponentDef* *value,
++ IR_ComponentDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs);
+- TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> operator[] (CORBA::ULong index) const;
+- static ComponentDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (ComponentDef **buffer);
++ TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var> operator[] (CORBA::ULong index) const;
++ static IR_ComponentDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_ComponentDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- ComponentDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const ComponentDef* *get_buffer (void) const;
++ IR_ComponentDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ComponentDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -3041,193 +1888,139 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_COMPONENTDEFSEQ_CH_)
+-#define _TAO_IR_COMPONENTDEFSEQ_CH_
+-
+-class ComponentDefSeq;
+-class ComponentDefSeq_var;
+-
+ // *************************************************************
+-// ComponentDefSeq
++// IR_ComponentDefSeq
+ // *************************************************************
+
+-class TAO_Export ComponentDefSeq : public
++class TAO_Export IR_ComponentDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<ComponentDef,ComponentDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ComponentDef,IR_ComponentDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ComponentDefSeq (void); // default ctor
+- ComponentDefSeq (CORBA::ULong max); // uses max size
+- ComponentDefSeq (
++ IR_ComponentDefSeq (void); // default ctor
++ IR_ComponentDefSeq (CORBA::ULong max); // uses max size
++ IR_ComponentDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ComponentDef_ptr *buffer,
++ IR_ComponentDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- ComponentDefSeq (const ComponentDefSeq &); // copy ctor
+- ~ComponentDefSeq (void);
++ IR_ComponentDefSeq (const IR_ComponentDefSeq &); // copy ctor
++ ~IR_ComponentDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ComponentDefSeq_var _var_type;
++ typedef IR_ComponentDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEFSEQ___VAR_CH_)
+-#define _TAO_IR_COMPONENTDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ComponentDefSeq_var
++// class IR_ComponentDefSeq_var
+ // *************************************************************
+
+-class TAO_Export ComponentDefSeq_var
++class TAO_Export IR_ComponentDefSeq_var
+ {
+ public:
+- ComponentDefSeq_var (void); // default constructor
+- ComponentDefSeq_var (ComponentDefSeq *);
+- ComponentDefSeq_var (const ComponentDefSeq_var &); // copy constructor
+- ~ComponentDefSeq_var (void); // destructor
++ IR_ComponentDefSeq_var (void); // default constructor
++ IR_ComponentDefSeq_var (IR_ComponentDefSeq *);
++ IR_ComponentDefSeq_var (const IR_ComponentDefSeq_var &); // copy constructor
++ ~IR_ComponentDefSeq_var (void); // destructor
+
+- ComponentDefSeq_var &operator= (ComponentDefSeq *);
+- ComponentDefSeq_var &operator= (const ComponentDefSeq_var &);
+- ComponentDefSeq *operator-> (void);
+- const ComponentDefSeq *operator-> (void) const;
++ IR_ComponentDefSeq_var &operator= (IR_ComponentDefSeq *);
++ IR_ComponentDefSeq_var &operator= (const IR_ComponentDefSeq_var &);
++ IR_ComponentDefSeq *operator-> (void);
++ const IR_ComponentDefSeq *operator-> (void) const;
+
+- operator const ComponentDefSeq &() const;
+- operator ComponentDefSeq &();
+- operator ComponentDefSeq &() const;
+- operator ComponentDefSeq *&(); // variable-size base types only
++ operator const IR_ComponentDefSeq &() const;
++ operator IR_ComponentDefSeq &();
++ operator IR_ComponentDefSeq &() const;
++ operator IR_ComponentDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const ComponentDefSeq &in (void) const;
+- ComponentDefSeq &inout (void);
+- ComponentDefSeq *&out (void);
+- ComponentDefSeq *_retn (void);
+- ComponentDefSeq *ptr (void) const;
++ const IR_ComponentDefSeq &in (void) const;
++ IR_ComponentDefSeq &inout (void);
++ IR_ComponentDefSeq *&out (void);
++ IR_ComponentDefSeq *_retn (void);
++ IR_ComponentDefSeq *ptr (void) const;
+
+ private:
+- ComponentDefSeq *ptr_;
++ IR_ComponentDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEFSEQ___OUT_CH_)
+-#define _TAO_IR_COMPONENTDEFSEQ___OUT_CH_
+-
+-class TAO_Export ComponentDefSeq_out
++class TAO_Export IR_ComponentDefSeq_out
+ {
+ public:
+- ComponentDefSeq_out (ComponentDefSeq *&);
+- ComponentDefSeq_out (ComponentDefSeq_var &);
+- ComponentDefSeq_out (const ComponentDefSeq_out &);
+- ComponentDefSeq_out &operator= (const ComponentDefSeq_out &);
+- ComponentDefSeq_out &operator= (ComponentDefSeq *);
+- operator ComponentDefSeq *&();
+- ComponentDefSeq *&ptr (void);
+- ComponentDefSeq *operator-> (void);
+- TAO_Object_Manager<ComponentDef, ComponentDef_var> operator[] (CORBA::ULong index);
++ IR_ComponentDefSeq_out (IR_ComponentDefSeq *&);
++ IR_ComponentDefSeq_out (IR_ComponentDefSeq_var &);
++ IR_ComponentDefSeq_out (const IR_ComponentDefSeq_out &);
++ IR_ComponentDefSeq_out &operator= (const IR_ComponentDefSeq_out &);
++ IR_ComponentDefSeq_out &operator= (IR_ComponentDefSeq *);
++ operator IR_ComponentDefSeq *&();
++ IR_ComponentDefSeq *&ptr (void);
++ IR_ComponentDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- ComponentDefSeq *&ptr_;
++ IR_ComponentDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ComponentDefSeq_var &);
++ void operator= (const IR_ComponentDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDefSeq;
+-
+-class ProvidesDef;
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___PTR_CH_)
+-#define _TAO_IR_PROVIDESDEF___PTR_CH_
+-
+-typedef ProvidesDef *ProvidesDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___VAR_CH_)
+-#define _TAO_IR_PROVIDESDEF___VAR_CH_
+-
+-class TAO_Export ProvidesDef_var : public TAO_Base_var
++class TAO_Export IR_ProvidesDef_var : public TAO_Base_var
+ {
+ public:
+- ProvidesDef_var (void); // default constructor
+- ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {}
+- ProvidesDef_var (const ProvidesDef_var &); // copy constructor
+- ~ProvidesDef_var (void); // destructor
++ IR_ProvidesDef_var (void); // default constructor
++ IR_ProvidesDef_var (IR_ProvidesDef_ptr p) : ptr_ (p) {}
++ IR_ProvidesDef_var (const IR_ProvidesDef_var &); // copy constructor
++ ~IR_ProvidesDef_var (void); // destructor
+
+- ProvidesDef_var &operator= (ProvidesDef_ptr);
+- ProvidesDef_var &operator= (const ProvidesDef_var &);
+- ProvidesDef_ptr operator-> (void) const;
++ IR_ProvidesDef_var &operator= (IR_ProvidesDef_ptr);
++ IR_ProvidesDef_var &operator= (const IR_ProvidesDef_var &);
++ IR_ProvidesDef_ptr operator-> (void) const;
+
+- operator const ProvidesDef_ptr &() const;
+- operator ProvidesDef_ptr &();
++ operator const IR_ProvidesDef_ptr &() const;
++ operator IR_ProvidesDef_ptr &();
+ // in, inout, out, _retn
+- ProvidesDef_ptr in (void) const;
+- ProvidesDef_ptr &inout (void);
+- ProvidesDef_ptr &out (void);
+- ProvidesDef_ptr _retn (void);
+- ProvidesDef_ptr ptr (void) const;
++ IR_ProvidesDef_ptr in (void) const;
++ IR_ProvidesDef_ptr &inout (void);
++ IR_ProvidesDef_ptr &out (void);
++ IR_ProvidesDef_ptr _retn (void);
++ IR_ProvidesDef_ptr ptr (void) const;
+
+ private:
+- ProvidesDef_ptr ptr_;
++ IR_ProvidesDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ProvidesDef_var (const TAO_Base_var &rhs);
+- ProvidesDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ProvidesDef_var (const TAO_Base_var &rhs);
++ IR_ProvidesDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___OUT_CH_)
+-#define _TAO_IR_PROVIDESDEF___OUT_CH_
+-
+-class TAO_Export ProvidesDef_out
++class TAO_Export IR_ProvidesDef_out
+ {
+ public:
+- ProvidesDef_out (ProvidesDef_ptr &);
+- ProvidesDef_out (ProvidesDef_var &);
+- ProvidesDef_out (const ProvidesDef_out &);
+- ProvidesDef_out &operator= (const ProvidesDef_out &);
+- ProvidesDef_out &operator= (const ProvidesDef_var &);
+- ProvidesDef_out &operator= (ProvidesDef_ptr);
+- operator ProvidesDef_ptr &();
+- ProvidesDef_ptr &ptr (void);
+- ProvidesDef_ptr operator-> (void);
++ IR_ProvidesDef_out (IR_ProvidesDef_ptr &);
++ IR_ProvidesDef_out (IR_ProvidesDef_var &);
++ IR_ProvidesDef_out (const IR_ProvidesDef_out &);
++ IR_ProvidesDef_out &operator= (const IR_ProvidesDef_out &);
++ IR_ProvidesDef_out &operator= (const IR_ProvidesDef_var &);
++ IR_ProvidesDef_out &operator= (IR_ProvidesDef_ptr);
++ operator IR_ProvidesDef_ptr &();
++ IR_ProvidesDef_ptr &ptr (void);
++ IR_ProvidesDef_ptr operator-> (void);
+
+ private:
+- ProvidesDef_ptr &ptr_;
++ IR_ProvidesDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -3237,19 +2030,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ProvidesDef* *value,
++ IR_ProvidesDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs);
+- TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> operator[] (CORBA::ULong index) const;
+- static ProvidesDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (ProvidesDef **buffer);
++ TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var> operator[] (CORBA::ULong index) const;
++ static IR_ProvidesDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_ProvidesDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- ProvidesDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const ProvidesDef* *get_buffer (void) const;
++ IR_ProvidesDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ProvidesDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -3261,193 +2054,139 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PROVIDESDEFSEQ_CH_)
+-#define _TAO_IR_PROVIDESDEFSEQ_CH_
+-
+-class ProvidesDefSeq;
+-class ProvidesDefSeq_var;
+-
+ // *************************************************************
+-// ProvidesDefSeq
++// IR_ProvidesDefSeq
+ // *************************************************************
+
+-class TAO_Export ProvidesDefSeq : public
++class TAO_Export IR_ProvidesDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<ProvidesDef,ProvidesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ProvidesDef,IR_ProvidesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ProvidesDefSeq (void); // default ctor
+- ProvidesDefSeq (CORBA::ULong max); // uses max size
+- ProvidesDefSeq (
++ IR_ProvidesDefSeq (void); // default ctor
++ IR_ProvidesDefSeq (CORBA::ULong max); // uses max size
++ IR_ProvidesDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ProvidesDef_ptr *buffer,
++ IR_ProvidesDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- ProvidesDefSeq (const ProvidesDefSeq &); // copy ctor
+- ~ProvidesDefSeq (void);
++ IR_ProvidesDefSeq (const IR_ProvidesDefSeq &); // copy ctor
++ ~IR_ProvidesDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ProvidesDefSeq_var _var_type;
++ typedef IR_ProvidesDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEFSEQ___VAR_CH_)
+-#define _TAO_IR_PROVIDESDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ProvidesDefSeq_var
++// class IR_ProvidesDefSeq_var
+ // *************************************************************
+
+-class TAO_Export ProvidesDefSeq_var
++class TAO_Export IR_ProvidesDefSeq_var
+ {
+ public:
+- ProvidesDefSeq_var (void); // default constructor
+- ProvidesDefSeq_var (ProvidesDefSeq *);
+- ProvidesDefSeq_var (const ProvidesDefSeq_var &); // copy constructor
+- ~ProvidesDefSeq_var (void); // destructor
++ IR_ProvidesDefSeq_var (void); // default constructor
++ IR_ProvidesDefSeq_var (IR_ProvidesDefSeq *);
++ IR_ProvidesDefSeq_var (const IR_ProvidesDefSeq_var &); // copy constructor
++ ~IR_ProvidesDefSeq_var (void); // destructor
+
+- ProvidesDefSeq_var &operator= (ProvidesDefSeq *);
+- ProvidesDefSeq_var &operator= (const ProvidesDefSeq_var &);
+- ProvidesDefSeq *operator-> (void);
+- const ProvidesDefSeq *operator-> (void) const;
++ IR_ProvidesDefSeq_var &operator= (IR_ProvidesDefSeq *);
++ IR_ProvidesDefSeq_var &operator= (const IR_ProvidesDefSeq_var &);
++ IR_ProvidesDefSeq *operator-> (void);
++ const IR_ProvidesDefSeq *operator-> (void) const;
+
+- operator const ProvidesDefSeq &() const;
+- operator ProvidesDefSeq &();
+- operator ProvidesDefSeq &() const;
+- operator ProvidesDefSeq *&(); // variable-size base types only
++ operator const IR_ProvidesDefSeq &() const;
++ operator IR_ProvidesDefSeq &();
++ operator IR_ProvidesDefSeq &() const;
++ operator IR_ProvidesDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const ProvidesDefSeq &in (void) const;
+- ProvidesDefSeq &inout (void);
+- ProvidesDefSeq *&out (void);
+- ProvidesDefSeq *_retn (void);
+- ProvidesDefSeq *ptr (void) const;
++ const IR_ProvidesDefSeq &in (void) const;
++ IR_ProvidesDefSeq &inout (void);
++ IR_ProvidesDefSeq *&out (void);
++ IR_ProvidesDefSeq *_retn (void);
++ IR_ProvidesDefSeq *ptr (void) const;
+
+ private:
+- ProvidesDefSeq *ptr_;
++ IR_ProvidesDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEFSEQ___OUT_CH_)
+-#define _TAO_IR_PROVIDESDEFSEQ___OUT_CH_
+-
+-class TAO_Export ProvidesDefSeq_out
++class TAO_Export IR_ProvidesDefSeq_out
+ {
+ public:
+- ProvidesDefSeq_out (ProvidesDefSeq *&);
+- ProvidesDefSeq_out (ProvidesDefSeq_var &);
+- ProvidesDefSeq_out (const ProvidesDefSeq_out &);
+- ProvidesDefSeq_out &operator= (const ProvidesDefSeq_out &);
+- ProvidesDefSeq_out &operator= (ProvidesDefSeq *);
+- operator ProvidesDefSeq *&();
+- ProvidesDefSeq *&ptr (void);
+- ProvidesDefSeq *operator-> (void);
+- TAO_Object_Manager<ProvidesDef, ProvidesDef_var> operator[] (CORBA::ULong index);
++ IR_ProvidesDefSeq_out (IR_ProvidesDefSeq *&);
++ IR_ProvidesDefSeq_out (IR_ProvidesDefSeq_var &);
++ IR_ProvidesDefSeq_out (const IR_ProvidesDefSeq_out &);
++ IR_ProvidesDefSeq_out &operator= (const IR_ProvidesDefSeq_out &);
++ IR_ProvidesDefSeq_out &operator= (IR_ProvidesDefSeq *);
++ operator IR_ProvidesDefSeq *&();
++ IR_ProvidesDefSeq *&ptr (void);
++ IR_ProvidesDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- ProvidesDefSeq *&ptr_;
++ IR_ProvidesDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ProvidesDefSeq_var &);
++ void operator= (const IR_ProvidesDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDefSeq;
+-
+-class UsesDef;
+-
+-#if !defined (_TAO_IR_USESDEF___PTR_CH_)
+-#define _TAO_IR_USESDEF___PTR_CH_
+-
+-typedef UsesDef *UsesDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEF___VAR_CH_)
+-#define _TAO_IR_USESDEF___VAR_CH_
+-
+-class TAO_Export UsesDef_var : public TAO_Base_var
++class TAO_Export IR_UsesDef_var : public TAO_Base_var
+ {
+ public:
+- UsesDef_var (void); // default constructor
+- UsesDef_var (UsesDef_ptr p) : ptr_ (p) {}
+- UsesDef_var (const UsesDef_var &); // copy constructor
+- ~UsesDef_var (void); // destructor
++ IR_UsesDef_var (void); // default constructor
++ IR_UsesDef_var (IR_UsesDef_ptr p) : ptr_ (p) {}
++ IR_UsesDef_var (const IR_UsesDef_var &); // copy constructor
++ ~IR_UsesDef_var (void); // destructor
+
+- UsesDef_var &operator= (UsesDef_ptr);
+- UsesDef_var &operator= (const UsesDef_var &);
+- UsesDef_ptr operator-> (void) const;
++ IR_UsesDef_var &operator= (IR_UsesDef_ptr);
++ IR_UsesDef_var &operator= (const IR_UsesDef_var &);
++ IR_UsesDef_ptr operator-> (void) const;
+
+- operator const UsesDef_ptr &() const;
+- operator UsesDef_ptr &();
++ operator const IR_UsesDef_ptr &() const;
++ operator IR_UsesDef_ptr &();
+ // in, inout, out, _retn
+- UsesDef_ptr in (void) const;
+- UsesDef_ptr &inout (void);
+- UsesDef_ptr &out (void);
+- UsesDef_ptr _retn (void);
+- UsesDef_ptr ptr (void) const;
++ IR_UsesDef_ptr in (void) const;
++ IR_UsesDef_ptr &inout (void);
++ IR_UsesDef_ptr &out (void);
++ IR_UsesDef_ptr _retn (void);
++ IR_UsesDef_ptr ptr (void) const;
+
+ private:
+- UsesDef_ptr ptr_;
++ IR_UsesDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- UsesDef_var (const TAO_Base_var &rhs);
+- UsesDef_var &operator= (const TAO_Base_var &rhs);
++ IR_UsesDef_var (const TAO_Base_var &rhs);
++ IR_UsesDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEF___OUT_CH_)
+-#define _TAO_IR_USESDEF___OUT_CH_
+-
+-class TAO_Export UsesDef_out
++class TAO_Export IR_UsesDef_out
+ {
+ public:
+- UsesDef_out (UsesDef_ptr &);
+- UsesDef_out (UsesDef_var &);
+- UsesDef_out (const UsesDef_out &);
+- UsesDef_out &operator= (const UsesDef_out &);
+- UsesDef_out &operator= (const UsesDef_var &);
+- UsesDef_out &operator= (UsesDef_ptr);
+- operator UsesDef_ptr &();
+- UsesDef_ptr &ptr (void);
+- UsesDef_ptr operator-> (void);
++ IR_UsesDef_out (IR_UsesDef_ptr &);
++ IR_UsesDef_out (IR_UsesDef_var &);
++ IR_UsesDef_out (const IR_UsesDef_out &);
++ IR_UsesDef_out &operator= (const IR_UsesDef_out &);
++ IR_UsesDef_out &operator= (const IR_UsesDef_var &);
++ IR_UsesDef_out &operator= (IR_UsesDef_ptr);
++ operator IR_UsesDef_ptr &();
++ IR_UsesDef_ptr &ptr (void);
++ IR_UsesDef_ptr operator-> (void);
+
+ private:
+- UsesDef_ptr &ptr_;
++ IR_UsesDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -3457,19 +2196,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- UsesDef* *value,
++ IR_UsesDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs);
+- TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> operator[] (CORBA::ULong index) const;
+- static UsesDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (UsesDef **buffer);
++ TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var> operator[] (CORBA::ULong index) const;
++ static IR_UsesDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_UsesDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- UsesDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const UsesDef* *get_buffer (void) const;
++ IR_UsesDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_UsesDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -3481,193 +2220,140 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_USESDEFSEQ_CH_)
+-#define _TAO_IR_USESDEFSEQ_CH_
+-
+-class UsesDefSeq;
+-class UsesDefSeq_var;
+-
+ // *************************************************************
+-// UsesDefSeq
++// IR_UsesDefSeq
+ // *************************************************************
+
+-class TAO_Export UsesDefSeq : public
++class TAO_Export IR_UsesDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<UsesDef,UsesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_UsesDef,IR_UsesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- UsesDefSeq (void); // default ctor
+- UsesDefSeq (CORBA::ULong max); // uses max size
+- UsesDefSeq (
++ IR_UsesDefSeq (void); // default ctor
++ IR_UsesDefSeq (CORBA::ULong max); // uses max size
++ IR_UsesDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- UsesDef_ptr *buffer,
++ IR_UsesDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- UsesDefSeq (const UsesDefSeq &); // copy ctor
+- ~UsesDefSeq (void);
++ IR_UsesDefSeq (const IR_UsesDefSeq &); // copy ctor
++ ~IR_UsesDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef UsesDefSeq_var _var_type;
++ typedef IR_UsesDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEFSEQ___VAR_CH_)
+-#define _TAO_IR_USESDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::UsesDefSeq_var
++// class IR_UsesDefSeq_var
+ // *************************************************************
+
+-class TAO_Export UsesDefSeq_var
++class TAO_Export IR_UsesDefSeq_var
+ {
+ public:
+- UsesDefSeq_var (void); // default constructor
+- UsesDefSeq_var (UsesDefSeq *);
+- UsesDefSeq_var (const UsesDefSeq_var &); // copy constructor
+- ~UsesDefSeq_var (void); // destructor
++ IR_UsesDefSeq_var (void); // default constructor
++ IR_UsesDefSeq_var (IR_UsesDefSeq *);
++ IR_UsesDefSeq_var (const IR_UsesDefSeq_var &); // copy constructor
++ ~IR_UsesDefSeq_var (void); // destructor
+
+- UsesDefSeq_var &operator= (UsesDefSeq *);
+- UsesDefSeq_var &operator= (const UsesDefSeq_var &);
+- UsesDefSeq *operator-> (void);
+- const UsesDefSeq *operator-> (void) const;
++ IR_UsesDefSeq_var &operator= (IR_UsesDefSeq *);
++ IR_UsesDefSeq_var &operator= (const IR_UsesDefSeq_var &);
++ IR_UsesDefSeq *operator-> (void);
++ const IR_UsesDefSeq *operator-> (void) const;
+
+- operator const UsesDefSeq &() const;
+- operator UsesDefSeq &();
+- operator UsesDefSeq &() const;
+- operator UsesDefSeq *&(); // variable-size base types only
++ operator const IR_UsesDefSeq &() const;
++ operator IR_UsesDefSeq &();
++ operator IR_UsesDefSeq &() const;
++ operator IR_UsesDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const UsesDefSeq &in (void) const;
+- UsesDefSeq &inout (void);
+- UsesDefSeq *&out (void);
+- UsesDefSeq *_retn (void);
+- UsesDefSeq *ptr (void) const;
++ const IR_UsesDefSeq &in (void) const;
++ IR_UsesDefSeq &inout (void);
++ IR_UsesDefSeq *&out (void);
++ IR_UsesDefSeq *_retn (void);
++ IR_UsesDefSeq *ptr (void) const;
+
+ private:
+- UsesDefSeq *ptr_;
++ IR_UsesDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEFSEQ___OUT_CH_)
+-#define _TAO_IR_USESDEFSEQ___OUT_CH_
+-
+-class TAO_Export UsesDefSeq_out
++class TAO_Export IR_UsesDefSeq_out
+ {
+ public:
+- UsesDefSeq_out (UsesDefSeq *&);
+- UsesDefSeq_out (UsesDefSeq_var &);
+- UsesDefSeq_out (const UsesDefSeq_out &);
+- UsesDefSeq_out &operator= (const UsesDefSeq_out &);
+- UsesDefSeq_out &operator= (UsesDefSeq *);
+- operator UsesDefSeq *&();
+- UsesDefSeq *&ptr (void);
+- UsesDefSeq *operator-> (void);
+- TAO_Object_Manager<UsesDef, UsesDef_var> operator[] (CORBA::ULong index);
++ IR_UsesDefSeq_out (IR_UsesDefSeq *&);
++ IR_UsesDefSeq_out (IR_UsesDefSeq_var &);
++ IR_UsesDefSeq_out (const IR_UsesDefSeq_out &);
++ IR_UsesDefSeq_out &operator= (const IR_UsesDefSeq_out &);
++ IR_UsesDefSeq_out &operator= (IR_UsesDefSeq *);
++ operator IR_UsesDefSeq *&();
++ IR_UsesDefSeq *&ptr (void);
++ IR_UsesDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- UsesDefSeq *&ptr_;
++ IR_UsesDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const UsesDefSeq_var &);
++ void operator= (const IR_UsesDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDefSeq;
+-
+-class HomeDef;
+-
+-#if !defined (_TAO_IR_HOMEDEF___PTR_CH_)
+-#define _TAO_IR_HOMEDEF___PTR_CH_
+-
+-typedef HomeDef *HomeDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_HOMEDEF___VAR_CH_)
+-#define _TAO_IR_HOMEDEF___VAR_CH_
+-
+-class TAO_Export HomeDef_var : public TAO_Base_var
++class TAO_Export IR_HomeDef_var : public TAO_Base_var
+ {
+ public:
+- HomeDef_var (void); // default constructor
+- HomeDef_var (HomeDef_ptr p) : ptr_ (p) {}
+- HomeDef_var (const HomeDef_var &); // copy constructor
+- ~HomeDef_var (void); // destructor
++ IR_HomeDef_var (void); // default constructor
++ IR_HomeDef_var (IR_HomeDef_ptr p) : ptr_ (p) {}
++ IR_HomeDef_var (const IR_HomeDef_var &); // copy constructor
++ ~IR_HomeDef_var (void); // destructor
+
+- HomeDef_var &operator= (HomeDef_ptr);
+- HomeDef_var &operator= (const HomeDef_var &);
+- HomeDef_ptr operator-> (void) const;
++ IR_HomeDef_var &operator= (IR_HomeDef_ptr);
++ IR_HomeDef_var &operator= (const IR_HomeDef_var &);
++ IR_HomeDef_ptr operator-> (void) const;
+
+- operator const HomeDef_ptr &() const;
+- operator HomeDef_ptr &();
++ operator const IR_HomeDef_ptr &() const;
++ operator IR_HomeDef_ptr &();
+ // in, inout, out, _retn
+- HomeDef_ptr in (void) const;
+- HomeDef_ptr &inout (void);
+- HomeDef_ptr &out (void);
+- HomeDef_ptr _retn (void);
+- HomeDef_ptr ptr (void) const;
++ IR_HomeDef_ptr in (void) const;
++ IR_HomeDef_ptr &inout (void);
++ IR_HomeDef_ptr &out (void);
++ IR_HomeDef_ptr _retn (void);
++ IR_HomeDef_ptr ptr (void) const;
+
+ private:
+- HomeDef_ptr ptr_;
++ IR_HomeDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- HomeDef_var (const TAO_Base_var &rhs);
+- HomeDef_var &operator= (const TAO_Base_var &rhs);
++ IR_HomeDef_var (const TAO_Base_var &rhs);
++ IR_HomeDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_HOMEDEF___OUT_CH_)
+-#define _TAO_IR_HOMEDEF___OUT_CH_
+-
+-class TAO_Export HomeDef_out
++class TAO_Export IR_HomeDef_out
+ {
+ public:
+- HomeDef_out (HomeDef_ptr &);
+- HomeDef_out (HomeDef_var &);
+- HomeDef_out (const HomeDef_out &);
+- HomeDef_out &operator= (const HomeDef_out &);
+- HomeDef_out &operator= (const HomeDef_var &);
+- HomeDef_out &operator= (HomeDef_ptr);
+- operator HomeDef_ptr &();
+- HomeDef_ptr &ptr (void);
+- HomeDef_ptr operator-> (void);
++ IR_HomeDef_out (IR_HomeDef_ptr &);
++ IR_HomeDef_out (IR_HomeDef_var &);
++ IR_HomeDef_out (const IR_HomeDef_out &);
++ IR_HomeDef_out &operator= (const IR_HomeDef_out &);
++ IR_HomeDef_out &operator= (const IR_HomeDef_var &);
++ IR_HomeDef_out &operator= (IR_HomeDef_ptr);
++ operator IR_HomeDef_ptr &();
++ IR_HomeDef_ptr &ptr (void);
++ IR_HomeDef_ptr operator-> (void);
+
+ private:
+- HomeDef_ptr &ptr_;
++ IR_HomeDef_ptr &ptr_;
+ };
+
+
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -3677,19 +2363,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- HomeDef* *value,
++ IR_HomeDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs);
+- TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> operator[] (CORBA::ULong index) const;
+- static HomeDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (HomeDef **buffer);
++ TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var> operator[] (CORBA::ULong index) const;
++ static IR_HomeDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_HomeDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- HomeDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const HomeDef* *get_buffer (void) const;
++ IR_HomeDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_HomeDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -3701,261 +2387,184 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_HOMEDEFSEQ_CH_)
+-#define _TAO_IR_HOMEDEFSEQ_CH_
+-
+-class HomeDefSeq;
+-class HomeDefSeq_var;
+-
+ // *************************************************************
+-// HomeDefSeq
++// IR_HomeDefSeq
+ // *************************************************************
+
+-class TAO_Export HomeDefSeq : public
++class TAO_Export IR_HomeDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<HomeDef,HomeDef_var>
++ TAO_Unbounded_Object_Sequence<IR_HomeDef,IR_HomeDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- HomeDefSeq (void); // default ctor
+- HomeDefSeq (CORBA::ULong max); // uses max size
+- HomeDefSeq (
++ IR_HomeDefSeq (void); // default ctor
++ IR_HomeDefSeq (CORBA::ULong max); // uses max size
++ IR_HomeDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- HomeDef_ptr *buffer,
++ IR_HomeDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- HomeDefSeq (const HomeDefSeq &); // copy ctor
+- ~HomeDefSeq (void);
++ IR_HomeDefSeq (const IR_HomeDefSeq &); // copy ctor
++ ~IR_HomeDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef HomeDefSeq_var _var_type;
++ typedef IR_HomeDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_HOMEDEFSEQ___VAR_CH_)
+-#define _TAO_IR_HOMEDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::HomeDefSeq_var
++// class IR_HomeDefSeq_var
+ // *************************************************************
+
+-class TAO_Export HomeDefSeq_var
++class TAO_Export IR_HomeDefSeq_var
+ {
+ public:
+- HomeDefSeq_var (void); // default constructor
+- HomeDefSeq_var (HomeDefSeq *);
+- HomeDefSeq_var (const HomeDefSeq_var &); // copy constructor
+- ~HomeDefSeq_var (void); // destructor
++ IR_HomeDefSeq_var (void); // default constructor
++ IR_HomeDefSeq_var (IR_HomeDefSeq *);
++ IR_HomeDefSeq_var (const IR_HomeDefSeq_var &); // copy constructor
++ ~IR_HomeDefSeq_var (void); // destructor
+
+- HomeDefSeq_var &operator= (HomeDefSeq *);
+- HomeDefSeq_var &operator= (const HomeDefSeq_var &);
+- HomeDefSeq *operator-> (void);
+- const HomeDefSeq *operator-> (void) const;
++ IR_HomeDefSeq_var &operator= (IR_HomeDefSeq *);
++ IR_HomeDefSeq_var &operator= (const IR_HomeDefSeq_var &);
++ IR_HomeDefSeq *operator-> (void);
++ const IR_HomeDefSeq *operator-> (void) const;
+
+- operator const HomeDefSeq &() const;
+- operator HomeDefSeq &();
+- operator HomeDefSeq &() const;
+- operator HomeDefSeq *&(); // variable-size base types only
++ operator const IR_HomeDefSeq &() const;
++ operator IR_HomeDefSeq &();
++ operator IR_HomeDefSeq &() const;
++ operator IR_HomeDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const HomeDefSeq &in (void) const;
+- HomeDefSeq &inout (void);
+- HomeDefSeq *&out (void);
+- HomeDefSeq *_retn (void);
+- HomeDefSeq *ptr (void) const;
++ const IR_HomeDefSeq &in (void) const;
++ IR_HomeDefSeq &inout (void);
++ IR_HomeDefSeq *&out (void);
++ IR_HomeDefSeq *_retn (void);
++ IR_HomeDefSeq *ptr (void) const;
+
+ private:
+- HomeDefSeq *ptr_;
++ IR_HomeDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_HOMEDEFSEQ___OUT_CH_)
+-#define _TAO_IR_HOMEDEFSEQ___OUT_CH_
+-
+-class TAO_Export HomeDefSeq_out
++class TAO_Export IR_HomeDefSeq_out
+ {
+ public:
+- HomeDefSeq_out (HomeDefSeq *&);
+- HomeDefSeq_out (HomeDefSeq_var &);
+- HomeDefSeq_out (const HomeDefSeq_out &);
+- HomeDefSeq_out &operator= (const HomeDefSeq_out &);
+- HomeDefSeq_out &operator= (HomeDefSeq *);
+- operator HomeDefSeq *&();
+- HomeDefSeq *&ptr (void);
+- HomeDefSeq *operator-> (void);
+- TAO_Object_Manager<HomeDef, HomeDef_var> operator[] (CORBA::ULong index);
++ IR_HomeDefSeq_out (IR_HomeDefSeq *&);
++ IR_HomeDefSeq_out (IR_HomeDefSeq_var &);
++ IR_HomeDefSeq_out (const IR_HomeDefSeq_out &);
++ IR_HomeDefSeq_out &operator= (const IR_HomeDefSeq_out &);
++ IR_HomeDefSeq_out &operator= (IR_HomeDefSeq *);
++ operator IR_HomeDefSeq *&();
++ IR_HomeDefSeq *&ptr (void);
++ IR_HomeDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- HomeDefSeq *&ptr_;
++ IR_HomeDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const HomeDefSeq_var &);
++ void operator= (const IR_HomeDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDefSeq;
+-
+-class EventDef;
+-
+-#if !defined (_TAO_IR_EVENTDEF___PTR_CH_)
+-#define _TAO_IR_EVENTDEF___PTR_CH_
+-
+-typedef EventDef *EventDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF___VAR_CH_)
+-#define _TAO_IR_EVENTDEF___VAR_CH_
+-
+-class TAO_Export EventDef_var : public TAO_Base_var
++class TAO_Export IR_EventDef_var : public TAO_Base_var
+ {
+ public:
+- EventDef_var (void); // default constructor
+- EventDef_var (EventDef_ptr p) : ptr_ (p) {}
+- EventDef_var (const EventDef_var &); // copy constructor
+- ~EventDef_var (void); // destructor
++ IR_EventDef_var (void); // default constructor
++ IR_EventDef_var (IR_EventDef_ptr p) : ptr_ (p) {}
++ IR_EventDef_var (const IR_EventDef_var &); // copy constructor
++ ~IR_EventDef_var (void); // destructor
+
+- EventDef_var &operator= (EventDef_ptr);
+- EventDef_var &operator= (const EventDef_var &);
+- EventDef_ptr operator-> (void) const;
++ IR_EventDef_var &operator= (IR_EventDef_ptr);
++ IR_EventDef_var &operator= (const IR_EventDef_var &);
++ IR_EventDef_ptr operator-> (void) const;
+
+- operator const EventDef_ptr &() const;
+- operator EventDef_ptr &();
++ operator const IR_EventDef_ptr &() const;
++ operator IR_EventDef_ptr &();
+ // in, inout, out, _retn
+- EventDef_ptr in (void) const;
+- EventDef_ptr &inout (void);
+- EventDef_ptr &out (void);
+- EventDef_ptr _retn (void);
+- EventDef_ptr ptr (void) const;
++ IR_EventDef_ptr in (void) const;
++ IR_EventDef_ptr &inout (void);
++ IR_EventDef_ptr &out (void);
++ IR_EventDef_ptr _retn (void);
++ IR_EventDef_ptr ptr (void) const;
+
+ private:
+- EventDef_ptr ptr_;
++ IR_EventDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- EventDef_var (const TAO_Base_var &rhs);
+- EventDef_var &operator= (const TAO_Base_var &rhs);
++ IR_EventDef_var (const TAO_Base_var &rhs);
++ IR_EventDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF___OUT_CH_)
+-#define _TAO_IR_EVENTDEF___OUT_CH_
+-
+-class TAO_Export EventDef_out
++class TAO_Export IR_EventDef_out
+ {
+ public:
+- EventDef_out (EventDef_ptr &);
+- EventDef_out (EventDef_var &);
+- EventDef_out (const EventDef_out &);
+- EventDef_out &operator= (const EventDef_out &);
+- EventDef_out &operator= (const EventDef_var &);
+- EventDef_out &operator= (EventDef_ptr);
+- operator EventDef_ptr &();
+- EventDef_ptr &ptr (void);
+- EventDef_ptr operator-> (void);
++ IR_EventDef_out (IR_EventDef_ptr &);
++ IR_EventDef_out (IR_EventDef_var &);
++ IR_EventDef_out (const IR_EventDef_out &);
++ IR_EventDef_out &operator= (const IR_EventDef_out &);
++ IR_EventDef_out &operator= (const IR_EventDef_var &);
++ IR_EventDef_out &operator= (IR_EventDef_ptr);
++ operator IR_EventDef_ptr &();
++ IR_EventDef_ptr &ptr (void);
++ IR_EventDef_ptr operator-> (void);
+
+ private:
+- EventDef_ptr &ptr_;
++ IR_EventDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class EmitsDef;
+-
+-#if !defined (_TAO_IR_EMITSDEF___PTR_CH_)
+-#define _TAO_IR_EMITSDEF___PTR_CH_
+-
+-typedef EmitsDef *EmitsDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF___VAR_CH_)
+-#define _TAO_IR_EMITSDEF___VAR_CH_
+-
+-class TAO_Export EmitsDef_var : public TAO_Base_var
++class TAO_Export IR_EmitsDef_var : public TAO_Base_var
+ {
+ public:
+- EmitsDef_var (void); // default constructor
+- EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {}
+- EmitsDef_var (const EmitsDef_var &); // copy constructor
+- ~EmitsDef_var (void); // destructor
++ IR_EmitsDef_var (void); // default constructor
++ IR_EmitsDef_var (IR_EmitsDef_ptr p) : ptr_ (p) {}
++ IR_EmitsDef_var (const IR_EmitsDef_var &); // copy constructor
++ ~IR_EmitsDef_var (void); // destructor
+
+- EmitsDef_var &operator= (EmitsDef_ptr);
+- EmitsDef_var &operator= (const EmitsDef_var &);
+- EmitsDef_ptr operator-> (void) const;
++ IR_EmitsDef_var &operator= (IR_EmitsDef_ptr);
++ IR_EmitsDef_var &operator= (const IR_EmitsDef_var &);
++ IR_EmitsDef_ptr operator-> (void) const;
+
+- operator const EmitsDef_ptr &() const;
+- operator EmitsDef_ptr &();
++ operator const IR_EmitsDef_ptr &() const;
++ operator IR_EmitsDef_ptr &();
+ // in, inout, out, _retn
+- EmitsDef_ptr in (void) const;
+- EmitsDef_ptr &inout (void);
+- EmitsDef_ptr &out (void);
+- EmitsDef_ptr _retn (void);
+- EmitsDef_ptr ptr (void) const;
++ IR_EmitsDef_ptr in (void) const;
++ IR_EmitsDef_ptr &inout (void);
++ IR_EmitsDef_ptr &out (void);
++ IR_EmitsDef_ptr _retn (void);
++ IR_EmitsDef_ptr ptr (void) const;
+
+ private:
+- EmitsDef_ptr ptr_;
++ IR_EmitsDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- EmitsDef_var (const TAO_Base_var &rhs);
+- EmitsDef_var &operator= (const TAO_Base_var &rhs);
++ IR_EmitsDef_var (const TAO_Base_var &rhs);
++ IR_EmitsDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF___OUT_CH_)
+-#define _TAO_IR_EMITSDEF___OUT_CH_
+-
+-class TAO_Export EmitsDef_out
++class TAO_Export IR_EmitsDef_out
+ {
+ public:
+- EmitsDef_out (EmitsDef_ptr &);
+- EmitsDef_out (EmitsDef_var &);
+- EmitsDef_out (const EmitsDef_out &);
+- EmitsDef_out &operator= (const EmitsDef_out &);
+- EmitsDef_out &operator= (const EmitsDef_var &);
+- EmitsDef_out &operator= (EmitsDef_ptr);
+- operator EmitsDef_ptr &();
+- EmitsDef_ptr &ptr (void);
+- EmitsDef_ptr operator-> (void);
++ IR_EmitsDef_out (IR_EmitsDef_ptr &);
++ IR_EmitsDef_out (IR_EmitsDef_var &);
++ IR_EmitsDef_out (const IR_EmitsDef_out &);
++ IR_EmitsDef_out &operator= (const IR_EmitsDef_out &);
++ IR_EmitsDef_out &operator= (const IR_EmitsDef_var &);
++ IR_EmitsDef_out &operator= (IR_EmitsDef_ptr);
++ operator IR_EmitsDef_ptr &();
++ IR_EmitsDef_ptr &ptr (void);
++ IR_EmitsDef_ptr operator-> (void);
+
+ private:
+- EmitsDef_ptr &ptr_;
++ IR_EmitsDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -3965,19 +2574,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- EmitsDef* *value,
++ IR_EmitsDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs);
+- TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> operator[] (CORBA::ULong index) const;
+- static EmitsDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (EmitsDef **buffer);
++ TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var> operator[] (CORBA::ULong index) const;
++ static IR_EmitsDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_EmitsDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- EmitsDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const EmitsDef* *get_buffer (void) const;
++ IR_EmitsDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_EmitsDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -3989,193 +2598,139 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EMITSDEFSEQ_CH_)
+-#define _TAO_IR_EMITSDEFSEQ_CH_
+-
+-class EmitsDefSeq;
+-class EmitsDefSeq_var;
+-
+ // *************************************************************
+-// EmitsDefSeq
++// IR_EmitsDefSeq
+ // *************************************************************
+
+-class TAO_Export EmitsDefSeq : public
++class TAO_Export IR_EmitsDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<EmitsDef,EmitsDef_var>
++ TAO_Unbounded_Object_Sequence<IR_EmitsDef,IR_EmitsDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- EmitsDefSeq (void); // default ctor
+- EmitsDefSeq (CORBA::ULong max); // uses max size
+- EmitsDefSeq (
++ IR_EmitsDefSeq (void); // default ctor
++ IR_EmitsDefSeq (CORBA::ULong max); // uses max size
++ IR_EmitsDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- EmitsDef_ptr *buffer,
++ IR_EmitsDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- EmitsDefSeq (const EmitsDefSeq &); // copy ctor
+- ~EmitsDefSeq (void);
++ IR_EmitsDefSeq (const IR_EmitsDefSeq &); // copy ctor
++ ~IR_EmitsDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef EmitsDefSeq_var _var_type;
++ typedef IR_EmitsDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEFSEQ___VAR_CH_)
+-#define _TAO_IR_EMITSDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::EmitsDefSeq_var
++// class IR_EmitsDefSeq_var
+ // *************************************************************
+
+-class TAO_Export EmitsDefSeq_var
++class TAO_Export IR_EmitsDefSeq_var
+ {
+ public:
+- EmitsDefSeq_var (void); // default constructor
+- EmitsDefSeq_var (EmitsDefSeq *);
+- EmitsDefSeq_var (const EmitsDefSeq_var &); // copy constructor
+- ~EmitsDefSeq_var (void); // destructor
++ IR_EmitsDefSeq_var (void); // default constructor
++ IR_EmitsDefSeq_var (IR_EmitsDefSeq *);
++ IR_EmitsDefSeq_var (const IR_EmitsDefSeq_var &); // copy constructor
++ ~IR_EmitsDefSeq_var (void); // destructor
+
+- EmitsDefSeq_var &operator= (EmitsDefSeq *);
+- EmitsDefSeq_var &operator= (const EmitsDefSeq_var &);
+- EmitsDefSeq *operator-> (void);
+- const EmitsDefSeq *operator-> (void) const;
++ IR_EmitsDefSeq_var &operator= (IR_EmitsDefSeq *);
++ IR_EmitsDefSeq_var &operator= (const IR_EmitsDefSeq_var &);
++ IR_EmitsDefSeq *operator-> (void);
++ const IR_EmitsDefSeq *operator-> (void) const;
+
+- operator const EmitsDefSeq &() const;
+- operator EmitsDefSeq &();
+- operator EmitsDefSeq &() const;
+- operator EmitsDefSeq *&(); // variable-size base types only
++ operator const IR_EmitsDefSeq &() const;
++ operator IR_EmitsDefSeq &();
++ operator IR_EmitsDefSeq &() const;
++ operator IR_EmitsDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const EmitsDefSeq &in (void) const;
+- EmitsDefSeq &inout (void);
+- EmitsDefSeq *&out (void);
+- EmitsDefSeq *_retn (void);
+- EmitsDefSeq *ptr (void) const;
++ const IR_EmitsDefSeq &in (void) const;
++ IR_EmitsDefSeq &inout (void);
++ IR_EmitsDefSeq *&out (void);
++ IR_EmitsDefSeq *_retn (void);
++ IR_EmitsDefSeq *ptr (void) const;
+
+ private:
+- EmitsDefSeq *ptr_;
++ IR_EmitsDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEFSEQ___OUT_CH_)
+-#define _TAO_IR_EMITSDEFSEQ___OUT_CH_
+-
+-class TAO_Export EmitsDefSeq_out
++class TAO_Export IR_EmitsDefSeq_out
+ {
+ public:
+- EmitsDefSeq_out (EmitsDefSeq *&);
+- EmitsDefSeq_out (EmitsDefSeq_var &);
+- EmitsDefSeq_out (const EmitsDefSeq_out &);
+- EmitsDefSeq_out &operator= (const EmitsDefSeq_out &);
+- EmitsDefSeq_out &operator= (EmitsDefSeq *);
+- operator EmitsDefSeq *&();
+- EmitsDefSeq *&ptr (void);
+- EmitsDefSeq *operator-> (void);
+- TAO_Object_Manager<EmitsDef, EmitsDef_var> operator[] (CORBA::ULong index);
++ IR_EmitsDefSeq_out (IR_EmitsDefSeq *&);
++ IR_EmitsDefSeq_out (IR_EmitsDefSeq_var &);
++ IR_EmitsDefSeq_out (const IR_EmitsDefSeq_out &);
++ IR_EmitsDefSeq_out &operator= (const IR_EmitsDefSeq_out &);
++ IR_EmitsDefSeq_out &operator= (IR_EmitsDefSeq *);
++ operator IR_EmitsDefSeq *&();
++ IR_EmitsDefSeq *&ptr (void);
++ IR_EmitsDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- EmitsDefSeq *&ptr_;
++ IR_EmitsDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const EmitsDefSeq_var &);
++ void operator= (const IR_EmitsDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDefSeq;
+-
+-class PublishesDef;
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___PTR_CH_)
+-#define _TAO_IR_PUBLISHESDEF___PTR_CH_
+-
+-typedef PublishesDef *PublishesDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___VAR_CH_)
+-#define _TAO_IR_PUBLISHESDEF___VAR_CH_
+-
+-class TAO_Export PublishesDef_var : public TAO_Base_var
++class TAO_Export IR_PublishesDef_var : public TAO_Base_var
+ {
+ public:
+- PublishesDef_var (void); // default constructor
+- PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {}
+- PublishesDef_var (const PublishesDef_var &); // copy constructor
+- ~PublishesDef_var (void); // destructor
++ IR_PublishesDef_var (void); // default constructor
++ IR_PublishesDef_var (IR_PublishesDef_ptr p) : ptr_ (p) {}
++ IR_PublishesDef_var (const IR_PublishesDef_var &); // copy constructor
++ ~IR_PublishesDef_var (void); // destructor
+
+- PublishesDef_var &operator= (PublishesDef_ptr);
+- PublishesDef_var &operator= (const PublishesDef_var &);
+- PublishesDef_ptr operator-> (void) const;
++ IR_PublishesDef_var &operator= (IR_PublishesDef_ptr);
++ IR_PublishesDef_var &operator= (const IR_PublishesDef_var &);
++ IR_PublishesDef_ptr operator-> (void) const;
+
+- operator const PublishesDef_ptr &() const;
+- operator PublishesDef_ptr &();
++ operator const IR_PublishesDef_ptr &() const;
++ operator IR_PublishesDef_ptr &();
+ // in, inout, out, _retn
+- PublishesDef_ptr in (void) const;
+- PublishesDef_ptr &inout (void);
+- PublishesDef_ptr &out (void);
+- PublishesDef_ptr _retn (void);
+- PublishesDef_ptr ptr (void) const;
++ IR_PublishesDef_ptr in (void) const;
++ IR_PublishesDef_ptr &inout (void);
++ IR_PublishesDef_ptr &out (void);
++ IR_PublishesDef_ptr _retn (void);
++ IR_PublishesDef_ptr ptr (void) const;
+
+ private:
+- PublishesDef_ptr ptr_;
++ IR_PublishesDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- PublishesDef_var (const TAO_Base_var &rhs);
+- PublishesDef_var &operator= (const TAO_Base_var &rhs);
++ IR_PublishesDef_var (const TAO_Base_var &rhs);
++ IR_PublishesDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___OUT_CH_)
+-#define _TAO_IR_PUBLISHESDEF___OUT_CH_
+-
+-class TAO_Export PublishesDef_out
++class TAO_Export IR_PublishesDef_out
+ {
+ public:
+- PublishesDef_out (PublishesDef_ptr &);
+- PublishesDef_out (PublishesDef_var &);
+- PublishesDef_out (const PublishesDef_out &);
+- PublishesDef_out &operator= (const PublishesDef_out &);
+- PublishesDef_out &operator= (const PublishesDef_var &);
+- PublishesDef_out &operator= (PublishesDef_ptr);
+- operator PublishesDef_ptr &();
+- PublishesDef_ptr &ptr (void);
+- PublishesDef_ptr operator-> (void);
++ IR_PublishesDef_out (IR_PublishesDef_ptr &);
++ IR_PublishesDef_out (IR_PublishesDef_var &);
++ IR_PublishesDef_out (const IR_PublishesDef_out &);
++ IR_PublishesDef_out &operator= (const IR_PublishesDef_out &);
++ IR_PublishesDef_out &operator= (const IR_PublishesDef_var &);
++ IR_PublishesDef_out &operator= (IR_PublishesDef_ptr);
++ operator IR_PublishesDef_ptr &();
++ IR_PublishesDef_ptr &ptr (void);
++ IR_PublishesDef_ptr operator-> (void);
+
+ private:
+- PublishesDef_ptr &ptr_;
++ IR_PublishesDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -4185,19 +2740,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- PublishesDef* *value,
++ IR_PublishesDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs);
+- TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> operator[] (CORBA::ULong index) const;
+- static PublishesDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (PublishesDef **buffer);
++ TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var> operator[] (CORBA::ULong index) const;
++ static IR_PublishesDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_PublishesDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- PublishesDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const PublishesDef* *get_buffer (void) const;
++ IR_PublishesDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_PublishesDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -4209,193 +2764,139 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PUBLISHESDEFSEQ_CH_)
+-#define _TAO_IR_PUBLISHESDEFSEQ_CH_
+-
+-class PublishesDefSeq;
+-class PublishesDefSeq_var;
+-
+ // *************************************************************
+-// PublishesDefSeq
++// IR_PublishesDefSeq
+ // *************************************************************
+
+-class TAO_Export PublishesDefSeq : public
++class TAO_Export IR_PublishesDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<PublishesDef,PublishesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_PublishesDef,IR_PublishesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- PublishesDefSeq (void); // default ctor
+- PublishesDefSeq (CORBA::ULong max); // uses max size
+- PublishesDefSeq (
++ IR_PublishesDefSeq (void); // default ctor
++ IR_PublishesDefSeq (CORBA::ULong max); // uses max size
++ IR_PublishesDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- PublishesDef_ptr *buffer,
++ IR_PublishesDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- PublishesDefSeq (const PublishesDefSeq &); // copy ctor
+- ~PublishesDefSeq (void);
++ IR_PublishesDefSeq (const IR_PublishesDefSeq &); // copy ctor
++ ~IR_PublishesDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef PublishesDefSeq_var _var_type;
++ typedef IR_PublishesDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEFSEQ___VAR_CH_)
+-#define _TAO_IR_PUBLISHESDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::PublishesDefSeq_var
++// class IR_PublishesDefSeq_var
+ // *************************************************************
+
+-class TAO_Export PublishesDefSeq_var
++class TAO_Export IR_PublishesDefSeq_var
+ {
+ public:
+- PublishesDefSeq_var (void); // default constructor
+- PublishesDefSeq_var (PublishesDefSeq *);
+- PublishesDefSeq_var (const PublishesDefSeq_var &); // copy constructor
+- ~PublishesDefSeq_var (void); // destructor
++ IR_PublishesDefSeq_var (void); // default constructor
++ IR_PublishesDefSeq_var (IR_PublishesDefSeq *);
++ IR_PublishesDefSeq_var (const IR_PublishesDefSeq_var &); // copy constructor
++ ~IR_PublishesDefSeq_var (void); // destructor
+
+- PublishesDefSeq_var &operator= (PublishesDefSeq *);
+- PublishesDefSeq_var &operator= (const PublishesDefSeq_var &);
+- PublishesDefSeq *operator-> (void);
+- const PublishesDefSeq *operator-> (void) const;
++ IR_PublishesDefSeq_var &operator= (IR_PublishesDefSeq *);
++ IR_PublishesDefSeq_var &operator= (const IR_PublishesDefSeq_var &);
++ IR_PublishesDefSeq *operator-> (void);
++ const IR_PublishesDefSeq *operator-> (void) const;
+
+- operator const PublishesDefSeq &() const;
+- operator PublishesDefSeq &();
+- operator PublishesDefSeq &() const;
+- operator PublishesDefSeq *&(); // variable-size base types only
++ operator const IR_PublishesDefSeq &() const;
++ operator IR_PublishesDefSeq &();
++ operator IR_PublishesDefSeq &() const;
++ operator IR_PublishesDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const PublishesDefSeq &in (void) const;
+- PublishesDefSeq &inout (void);
+- PublishesDefSeq *&out (void);
+- PublishesDefSeq *_retn (void);
+- PublishesDefSeq *ptr (void) const;
++ const IR_PublishesDefSeq &in (void) const;
++ IR_PublishesDefSeq &inout (void);
++ IR_PublishesDefSeq *&out (void);
++ IR_PublishesDefSeq *_retn (void);
++ IR_PublishesDefSeq *ptr (void) const;
+
+ private:
+- PublishesDefSeq *ptr_;
++ IR_PublishesDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEFSEQ___OUT_CH_)
+-#define _TAO_IR_PUBLISHESDEFSEQ___OUT_CH_
+-
+-class TAO_Export PublishesDefSeq_out
++class TAO_Export IR_PublishesDefSeq_out
+ {
+ public:
+- PublishesDefSeq_out (PublishesDefSeq *&);
+- PublishesDefSeq_out (PublishesDefSeq_var &);
+- PublishesDefSeq_out (const PublishesDefSeq_out &);
+- PublishesDefSeq_out &operator= (const PublishesDefSeq_out &);
+- PublishesDefSeq_out &operator= (PublishesDefSeq *);
+- operator PublishesDefSeq *&();
+- PublishesDefSeq *&ptr (void);
+- PublishesDefSeq *operator-> (void);
+- TAO_Object_Manager<PublishesDef, PublishesDef_var> operator[] (CORBA::ULong index);
++ IR_PublishesDefSeq_out (IR_PublishesDefSeq *&);
++ IR_PublishesDefSeq_out (IR_PublishesDefSeq_var &);
++ IR_PublishesDefSeq_out (const IR_PublishesDefSeq_out &);
++ IR_PublishesDefSeq_out &operator= (const IR_PublishesDefSeq_out &);
++ IR_PublishesDefSeq_out &operator= (IR_PublishesDefSeq *);
++ operator IR_PublishesDefSeq *&();
++ IR_PublishesDefSeq *&ptr (void);
++ IR_PublishesDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- PublishesDefSeq *&ptr_;
++ IR_PublishesDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const PublishesDefSeq_var &);
++ void operator= (const IR_PublishesDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDefSeq;
+-
+-class ConsumesDef;
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___PTR_CH_)
+-#define _TAO_IR_CONSUMESDEF___PTR_CH_
+-
+-typedef ConsumesDef *ConsumesDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___VAR_CH_)
+-#define _TAO_IR_CONSUMESDEF___VAR_CH_
+-
+-class TAO_Export ConsumesDef_var : public TAO_Base_var
++class TAO_Export IR_ConsumesDef_var : public TAO_Base_var
+ {
+ public:
+- ConsumesDef_var (void); // default constructor
+- ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {}
+- ConsumesDef_var (const ConsumesDef_var &); // copy constructor
+- ~ConsumesDef_var (void); // destructor
++ IR_ConsumesDef_var (void); // default constructor
++ IR_ConsumesDef_var (IR_ConsumesDef_ptr p) : ptr_ (p) {}
++ IR_ConsumesDef_var (const IR_ConsumesDef_var &); // copy constructor
++ ~IR_ConsumesDef_var (void); // destructor
+
+- ConsumesDef_var &operator= (ConsumesDef_ptr);
+- ConsumesDef_var &operator= (const ConsumesDef_var &);
+- ConsumesDef_ptr operator-> (void) const;
++ IR_ConsumesDef_var &operator= (IR_ConsumesDef_ptr);
++ IR_ConsumesDef_var &operator= (const IR_ConsumesDef_var &);
++ IR_ConsumesDef_ptr operator-> (void) const;
+
+- operator const ConsumesDef_ptr &() const;
+- operator ConsumesDef_ptr &();
++ operator const IR_ConsumesDef_ptr &() const;
++ operator IR_ConsumesDef_ptr &();
+ // in, inout, out, _retn
+- ConsumesDef_ptr in (void) const;
+- ConsumesDef_ptr &inout (void);
+- ConsumesDef_ptr &out (void);
+- ConsumesDef_ptr _retn (void);
+- ConsumesDef_ptr ptr (void) const;
++ IR_ConsumesDef_ptr in (void) const;
++ IR_ConsumesDef_ptr &inout (void);
++ IR_ConsumesDef_ptr &out (void);
++ IR_ConsumesDef_ptr _retn (void);
++ IR_ConsumesDef_ptr ptr (void) const;
+
+ private:
+- ConsumesDef_ptr ptr_;
++ IR_ConsumesDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ConsumesDef_var (const TAO_Base_var &rhs);
+- ConsumesDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ConsumesDef_var (const TAO_Base_var &rhs);
++ IR_ConsumesDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___OUT_CH_)
+-#define _TAO_IR_CONSUMESDEF___OUT_CH_
+-
+-class TAO_Export ConsumesDef_out
++class TAO_Export IR_ConsumesDef_out
+ {
+ public:
+- ConsumesDef_out (ConsumesDef_ptr &);
+- ConsumesDef_out (ConsumesDef_var &);
+- ConsumesDef_out (const ConsumesDef_out &);
+- ConsumesDef_out &operator= (const ConsumesDef_out &);
+- ConsumesDef_out &operator= (const ConsumesDef_var &);
+- ConsumesDef_out &operator= (ConsumesDef_ptr);
+- operator ConsumesDef_ptr &();
+- ConsumesDef_ptr &ptr (void);
+- ConsumesDef_ptr operator-> (void);
++ IR_ConsumesDef_out (IR_ConsumesDef_ptr &);
++ IR_ConsumesDef_out (IR_ConsumesDef_var &);
++ IR_ConsumesDef_out (const IR_ConsumesDef_out &);
++ IR_ConsumesDef_out &operator= (const IR_ConsumesDef_out &);
++ IR_ConsumesDef_out &operator= (const IR_ConsumesDef_var &);
++ IR_ConsumesDef_out &operator= (IR_ConsumesDef_ptr);
++ operator IR_ConsumesDef_ptr &();
++ IR_ConsumesDef_ptr &ptr (void);
++ IR_ConsumesDef_ptr operator-> (void);
+
+ private:
+- ConsumesDef_ptr &ptr_;
++ IR_ConsumesDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -4405,19 +2906,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ConsumesDef* *value,
++ IR_ConsumesDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs);
+- TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> operator[] (CORBA::ULong index) const;
+- static ConsumesDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (ConsumesDef **buffer);
++ TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var> operator[] (CORBA::ULong index) const;
++ static IR_ConsumesDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_ConsumesDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- ConsumesDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const ConsumesDef* *get_buffer (void) const;
++ IR_ConsumesDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ConsumesDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -4429,193 +2930,139 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONSUMESDEFSEQ_CH_)
+-#define _TAO_IR_CONSUMESDEFSEQ_CH_
+-
+-class ConsumesDefSeq;
+-class ConsumesDefSeq_var;
+-
+ // *************************************************************
+-// ConsumesDefSeq
++// IR_ConsumesDefSeq
+ // *************************************************************
+
+-class TAO_Export ConsumesDefSeq : public
++class TAO_Export IR_ConsumesDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<ConsumesDef,ConsumesDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ConsumesDef,IR_ConsumesDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ConsumesDefSeq (void); // default ctor
+- ConsumesDefSeq (CORBA::ULong max); // uses max size
+- ConsumesDefSeq (
++ IR_ConsumesDefSeq (void); // default ctor
++ IR_ConsumesDefSeq (CORBA::ULong max); // uses max size
++ IR_ConsumesDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ConsumesDef_ptr *buffer,
++ IR_ConsumesDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- ConsumesDefSeq (const ConsumesDefSeq &); // copy ctor
+- ~ConsumesDefSeq (void);
++ IR_ConsumesDefSeq (const IR_ConsumesDefSeq &); // copy ctor
++ ~IR_ConsumesDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ConsumesDefSeq_var _var_type;
++ typedef IR_ConsumesDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEFSEQ___VAR_CH_)
+-#define _TAO_IR_CONSUMESDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ConsumesDefSeq_var
++// class IR_ConsumesDefSeq_var
+ // *************************************************************
+
+-class TAO_Export ConsumesDefSeq_var
++class TAO_Export IR_ConsumesDefSeq_var
+ {
+ public:
+- ConsumesDefSeq_var (void); // default constructor
+- ConsumesDefSeq_var (ConsumesDefSeq *);
+- ConsumesDefSeq_var (const ConsumesDefSeq_var &); // copy constructor
+- ~ConsumesDefSeq_var (void); // destructor
++ IR_ConsumesDefSeq_var (void); // default constructor
++ IR_ConsumesDefSeq_var (IR_ConsumesDefSeq *);
++ IR_ConsumesDefSeq_var (const IR_ConsumesDefSeq_var &); // copy constructor
++ ~IR_ConsumesDefSeq_var (void); // destructor
+
+- ConsumesDefSeq_var &operator= (ConsumesDefSeq *);
+- ConsumesDefSeq_var &operator= (const ConsumesDefSeq_var &);
+- ConsumesDefSeq *operator-> (void);
+- const ConsumesDefSeq *operator-> (void) const;
++ IR_ConsumesDefSeq_var &operator= (IR_ConsumesDefSeq *);
++ IR_ConsumesDefSeq_var &operator= (const IR_ConsumesDefSeq_var &);
++ IR_ConsumesDefSeq *operator-> (void);
++ const IR_ConsumesDefSeq *operator-> (void) const;
+
+- operator const ConsumesDefSeq &() const;
+- operator ConsumesDefSeq &();
+- operator ConsumesDefSeq &() const;
+- operator ConsumesDefSeq *&(); // variable-size base types only
++ operator const IR_ConsumesDefSeq &() const;
++ operator IR_ConsumesDefSeq &();
++ operator IR_ConsumesDefSeq &() const;
++ operator IR_ConsumesDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const ConsumesDefSeq &in (void) const;
+- ConsumesDefSeq &inout (void);
+- ConsumesDefSeq *&out (void);
+- ConsumesDefSeq *_retn (void);
+- ConsumesDefSeq *ptr (void) const;
++ const IR_ConsumesDefSeq &in (void) const;
++ IR_ConsumesDefSeq &inout (void);
++ IR_ConsumesDefSeq *&out (void);
++ IR_ConsumesDefSeq *_retn (void);
++ IR_ConsumesDefSeq *ptr (void) const;
+
+ private:
+- ConsumesDefSeq *ptr_;
++ IR_ConsumesDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEFSEQ___OUT_CH_)
+-#define _TAO_IR_CONSUMESDEFSEQ___OUT_CH_
+-
+-class TAO_Export ConsumesDefSeq_out
++class TAO_Export IR_ConsumesDefSeq_out
+ {
+ public:
+- ConsumesDefSeq_out (ConsumesDefSeq *&);
+- ConsumesDefSeq_out (ConsumesDefSeq_var &);
+- ConsumesDefSeq_out (const ConsumesDefSeq_out &);
+- ConsumesDefSeq_out &operator= (const ConsumesDefSeq_out &);
+- ConsumesDefSeq_out &operator= (ConsumesDefSeq *);
+- operator ConsumesDefSeq *&();
+- ConsumesDefSeq *&ptr (void);
+- ConsumesDefSeq *operator-> (void);
+- TAO_Object_Manager<ConsumesDef, ConsumesDef_var> operator[] (CORBA::ULong index);
++ IR_ConsumesDefSeq_out (IR_ConsumesDefSeq *&);
++ IR_ConsumesDefSeq_out (IR_ConsumesDefSeq_var &);
++ IR_ConsumesDefSeq_out (const IR_ConsumesDefSeq_out &);
++ IR_ConsumesDefSeq_out &operator= (const IR_ConsumesDefSeq_out &);
++ IR_ConsumesDefSeq_out &operator= (IR_ConsumesDefSeq *);
++ operator IR_ConsumesDefSeq *&();
++ IR_ConsumesDefSeq *&ptr (void);
++ IR_ConsumesDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- ConsumesDefSeq *&ptr_;
++ IR_ConsumesDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ConsumesDefSeq_var &);
++ void operator= (const IR_ConsumesDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDefSeq;
+-
+-class FactoryDef;
+-
+-#if !defined (_TAO_IR_FACTORYDEF___PTR_CH_)
+-#define _TAO_IR_FACTORYDEF___PTR_CH_
+-
+-typedef FactoryDef *FactoryDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF___VAR_CH_)
+-#define _TAO_IR_FACTORYDEF___VAR_CH_
+-
+-class TAO_Export FactoryDef_var : public TAO_Base_var
++class TAO_Export IR_FactoryDef_var : public TAO_Base_var
+ {
+ public:
+- FactoryDef_var (void); // default constructor
+- FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {}
+- FactoryDef_var (const FactoryDef_var &); // copy constructor
+- ~FactoryDef_var (void); // destructor
++ IR_FactoryDef_var (void); // default constructor
++ IR_FactoryDef_var (IR_FactoryDef_ptr p) : ptr_ (p) {}
++ IR_FactoryDef_var (const IR_FactoryDef_var &); // copy constructor
++ ~IR_FactoryDef_var (void); // destructor
+
+- FactoryDef_var &operator= (FactoryDef_ptr);
+- FactoryDef_var &operator= (const FactoryDef_var &);
+- FactoryDef_ptr operator-> (void) const;
++ IR_FactoryDef_var &operator= (IR_FactoryDef_ptr);
++ IR_FactoryDef_var &operator= (const IR_FactoryDef_var &);
++ IR_FactoryDef_ptr operator-> (void) const;
+
+- operator const FactoryDef_ptr &() const;
+- operator FactoryDef_ptr &();
++ operator const IR_FactoryDef_ptr &() const;
++ operator IR_FactoryDef_ptr &();
+ // in, inout, out, _retn
+- FactoryDef_ptr in (void) const;
+- FactoryDef_ptr &inout (void);
+- FactoryDef_ptr &out (void);
+- FactoryDef_ptr _retn (void);
+- FactoryDef_ptr ptr (void) const;
++ IR_FactoryDef_ptr in (void) const;
++ IR_FactoryDef_ptr &inout (void);
++ IR_FactoryDef_ptr &out (void);
++ IR_FactoryDef_ptr _retn (void);
++ IR_FactoryDef_ptr ptr (void) const;
+
+ private:
+- FactoryDef_ptr ptr_;
++ IR_FactoryDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- FactoryDef_var (const TAO_Base_var &rhs);
+- FactoryDef_var &operator= (const TAO_Base_var &rhs);
++ IR_FactoryDef_var (const TAO_Base_var &rhs);
++ IR_FactoryDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF___OUT_CH_)
+-#define _TAO_IR_FACTORYDEF___OUT_CH_
+-
+-class TAO_Export FactoryDef_out
++class TAO_Export IR_FactoryDef_out
+ {
+ public:
+- FactoryDef_out (FactoryDef_ptr &);
+- FactoryDef_out (FactoryDef_var &);
+- FactoryDef_out (const FactoryDef_out &);
+- FactoryDef_out &operator= (const FactoryDef_out &);
+- FactoryDef_out &operator= (const FactoryDef_var &);
+- FactoryDef_out &operator= (FactoryDef_ptr);
+- operator FactoryDef_ptr &();
+- FactoryDef_ptr &ptr (void);
+- FactoryDef_ptr operator-> (void);
++ IR_FactoryDef_out (IR_FactoryDef_ptr &);
++ IR_FactoryDef_out (IR_FactoryDef_var &);
++ IR_FactoryDef_out (const IR_FactoryDef_out &);
++ IR_FactoryDef_out &operator= (const IR_FactoryDef_out &);
++ IR_FactoryDef_out &operator= (const IR_FactoryDef_var &);
++ IR_FactoryDef_out &operator= (IR_FactoryDef_ptr);
++ operator IR_FactoryDef_ptr &();
++ IR_FactoryDef_ptr &ptr (void);
++ IR_FactoryDef_ptr operator-> (void);
+
+ private:
+- FactoryDef_ptr &ptr_;
++ IR_FactoryDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -4625,19 +3072,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- FactoryDef* *value,
++ IR_FactoryDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs);
+- TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> operator[] (CORBA::ULong index) const;
+- static FactoryDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (FactoryDef **buffer);
++ TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var> operator[] (CORBA::ULong index) const;
++ static IR_FactoryDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_FactoryDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- FactoryDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const FactoryDef* *get_buffer (void) const;
++ IR_FactoryDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_FactoryDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -4649,193 +3096,139 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_FACTORYDEFSEQ_CH_)
+-#define _TAO_IR_FACTORYDEFSEQ_CH_
+-
+-class FactoryDefSeq;
+-class FactoryDefSeq_var;
+-
+ // *************************************************************
+-// FactoryDefSeq
++// IR_FactoryDefSeq
+ // *************************************************************
+
+-class TAO_Export FactoryDefSeq : public
++class TAO_Export IR_FactoryDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<FactoryDef,FactoryDef_var>
++ TAO_Unbounded_Object_Sequence<IR_FactoryDef,IR_FactoryDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- FactoryDefSeq (void); // default ctor
+- FactoryDefSeq (CORBA::ULong max); // uses max size
+- FactoryDefSeq (
++ IR_FactoryDefSeq (void); // default ctor
++ IR_FactoryDefSeq (CORBA::ULong max); // uses max size
++ IR_FactoryDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- FactoryDef_ptr *buffer,
++ IR_FactoryDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- FactoryDefSeq (const FactoryDefSeq &); // copy ctor
+- ~FactoryDefSeq (void);
++ IR_FactoryDefSeq (const IR_FactoryDefSeq &); // copy ctor
++ ~IR_FactoryDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef FactoryDefSeq_var _var_type;
++ typedef IR_FactoryDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEFSEQ___VAR_CH_)
+-#define _TAO_IR_FACTORYDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::FactoryDefSeq_var
++// class IR_FactoryDefSeq_var
+ // *************************************************************
+
+-class TAO_Export FactoryDefSeq_var
++class TAO_Export IR_FactoryDefSeq_var
+ {
+ public:
+- FactoryDefSeq_var (void); // default constructor
+- FactoryDefSeq_var (FactoryDefSeq *);
+- FactoryDefSeq_var (const FactoryDefSeq_var &); // copy constructor
+- ~FactoryDefSeq_var (void); // destructor
++ IR_FactoryDefSeq_var (void); // default constructor
++ IR_FactoryDefSeq_var (IR_FactoryDefSeq *);
++ IR_FactoryDefSeq_var (const IR_FactoryDefSeq_var &); // copy constructor
++ ~IR_FactoryDefSeq_var (void); // destructor
+
+- FactoryDefSeq_var &operator= (FactoryDefSeq *);
+- FactoryDefSeq_var &operator= (const FactoryDefSeq_var &);
+- FactoryDefSeq *operator-> (void);
+- const FactoryDefSeq *operator-> (void) const;
++ IR_FactoryDefSeq_var &operator= (IR_FactoryDefSeq *);
++ IR_FactoryDefSeq_var &operator= (const IR_FactoryDefSeq_var &);
++ IR_FactoryDefSeq *operator-> (void);
++ const IR_FactoryDefSeq *operator-> (void) const;
+
+- operator const FactoryDefSeq &() const;
+- operator FactoryDefSeq &();
+- operator FactoryDefSeq &() const;
+- operator FactoryDefSeq *&(); // variable-size base types only
++ operator const IR_FactoryDefSeq &() const;
++ operator IR_FactoryDefSeq &();
++ operator IR_FactoryDefSeq &() const;
++ operator IR_FactoryDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const FactoryDefSeq &in (void) const;
+- FactoryDefSeq &inout (void);
+- FactoryDefSeq *&out (void);
+- FactoryDefSeq *_retn (void);
+- FactoryDefSeq *ptr (void) const;
++ const IR_FactoryDefSeq &in (void) const;
++ IR_FactoryDefSeq &inout (void);
++ IR_FactoryDefSeq *&out (void);
++ IR_FactoryDefSeq *_retn (void);
++ IR_FactoryDefSeq *ptr (void) const;
+
+ private:
+- FactoryDefSeq *ptr_;
++ IR_FactoryDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEFSEQ___OUT_CH_)
+-#define _TAO_IR_FACTORYDEFSEQ___OUT_CH_
+-
+-class TAO_Export FactoryDefSeq_out
++class TAO_Export IR_FactoryDefSeq_out
+ {
+ public:
+- FactoryDefSeq_out (FactoryDefSeq *&);
+- FactoryDefSeq_out (FactoryDefSeq_var &);
+- FactoryDefSeq_out (const FactoryDefSeq_out &);
+- FactoryDefSeq_out &operator= (const FactoryDefSeq_out &);
+- FactoryDefSeq_out &operator= (FactoryDefSeq *);
+- operator FactoryDefSeq *&();
+- FactoryDefSeq *&ptr (void);
+- FactoryDefSeq *operator-> (void);
+- TAO_Object_Manager<FactoryDef, FactoryDef_var> operator[] (CORBA::ULong index);
++ IR_FactoryDefSeq_out (IR_FactoryDefSeq *&);
++ IR_FactoryDefSeq_out (IR_FactoryDefSeq_var &);
++ IR_FactoryDefSeq_out (const IR_FactoryDefSeq_out &);
++ IR_FactoryDefSeq_out &operator= (const IR_FactoryDefSeq_out &);
++ IR_FactoryDefSeq_out &operator= (IR_FactoryDefSeq *);
++ operator IR_FactoryDefSeq *&();
++ IR_FactoryDefSeq *&ptr (void);
++ IR_FactoryDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- FactoryDefSeq *&ptr_;
++ IR_FactoryDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const FactoryDefSeq_var &);
++ void operator= (const IR_FactoryDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDefSeq;
+-
+-class FinderDef;
+-
+-#if !defined (_TAO_IR_FINDERDEF___PTR_CH_)
+-#define _TAO_IR_FINDERDEF___PTR_CH_
+-
+-typedef FinderDef *FinderDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF___VAR_CH_)
+-#define _TAO_IR_FINDERDEF___VAR_CH_
+-
+-class TAO_Export FinderDef_var : public TAO_Base_var
++class TAO_Export IR_FinderDef_var : public TAO_Base_var
+ {
+ public:
+- FinderDef_var (void); // default constructor
+- FinderDef_var (FinderDef_ptr p) : ptr_ (p) {}
+- FinderDef_var (const FinderDef_var &); // copy constructor
+- ~FinderDef_var (void); // destructor
++ IR_FinderDef_var (void); // default constructor
++ IR_FinderDef_var (IR_FinderDef_ptr p) : ptr_ (p) {}
++ IR_FinderDef_var (const IR_FinderDef_var &); // copy constructor
++ ~IR_FinderDef_var (void); // destructor
+
+- FinderDef_var &operator= (FinderDef_ptr);
+- FinderDef_var &operator= (const FinderDef_var &);
+- FinderDef_ptr operator-> (void) const;
++ IR_FinderDef_var &operator= (IR_FinderDef_ptr);
++ IR_FinderDef_var &operator= (const IR_FinderDef_var &);
++ IR_FinderDef_ptr operator-> (void) const;
+
+- operator const FinderDef_ptr &() const;
+- operator FinderDef_ptr &();
++ operator const IR_FinderDef_ptr &() const;
++ operator IR_FinderDef_ptr &();
+ // in, inout, out, _retn
+- FinderDef_ptr in (void) const;
+- FinderDef_ptr &inout (void);
+- FinderDef_ptr &out (void);
+- FinderDef_ptr _retn (void);
+- FinderDef_ptr ptr (void) const;
++ IR_FinderDef_ptr in (void) const;
++ IR_FinderDef_ptr &inout (void);
++ IR_FinderDef_ptr &out (void);
++ IR_FinderDef_ptr _retn (void);
++ IR_FinderDef_ptr ptr (void) const;
+
+ private:
+- FinderDef_ptr ptr_;
++ IR_FinderDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- FinderDef_var (const TAO_Base_var &rhs);
+- FinderDef_var &operator= (const TAO_Base_var &rhs);
++ IR_FinderDef_var (const TAO_Base_var &rhs);
++ IR_FinderDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF___OUT_CH_)
+-#define _TAO_IR_FINDERDEF___OUT_CH_
+-
+-class TAO_Export FinderDef_out
++class TAO_Export IR_FinderDef_out
+ {
+ public:
+- FinderDef_out (FinderDef_ptr &);
+- FinderDef_out (FinderDef_var &);
+- FinderDef_out (const FinderDef_out &);
+- FinderDef_out &operator= (const FinderDef_out &);
+- FinderDef_out &operator= (const FinderDef_var &);
+- FinderDef_out &operator= (FinderDef_ptr);
+- operator FinderDef_ptr &();
+- FinderDef_ptr &ptr (void);
+- FinderDef_ptr operator-> (void);
++ IR_FinderDef_out (IR_FinderDef_ptr &);
++ IR_FinderDef_out (IR_FinderDef_var &);
++ IR_FinderDef_out (const IR_FinderDef_out &);
++ IR_FinderDef_out &operator= (const IR_FinderDef_out &);
++ IR_FinderDef_out &operator= (const IR_FinderDef_var &);
++ IR_FinderDef_out &operator= (IR_FinderDef_ptr);
++ operator IR_FinderDef_ptr &();
++ IR_FinderDef_ptr &ptr (void);
++ IR_FinderDef_ptr operator-> (void);
+
+ private:
+- FinderDef_ptr &ptr_;
++ IR_FinderDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -4845,19 +3238,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- FinderDef* *value,
++ IR_FinderDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs);
+- TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> operator[] (CORBA::ULong index) const;
+- static FinderDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (FinderDef **buffer);
++ TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var> operator[] (CORBA::ULong index) const;
++ static IR_FinderDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_FinderDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- FinderDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const FinderDef* *get_buffer (void) const;
++ IR_FinderDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_FinderDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -4869,193 +3262,139 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_FINDERDEFSEQ_CH_)
+-#define _TAO_IR_FINDERDEFSEQ_CH_
+-
+-class FinderDefSeq;
+-class FinderDefSeq_var;
+-
+ // *************************************************************
+-// FinderDefSeq
++// IR_FinderDefSeq
+ // *************************************************************
+
+-class TAO_Export FinderDefSeq : public
++class TAO_Export IR_FinderDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<FinderDef,FinderDef_var>
++ TAO_Unbounded_Object_Sequence<IR_FinderDef,IR_FinderDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- FinderDefSeq (void); // default ctor
+- FinderDefSeq (CORBA::ULong max); // uses max size
+- FinderDefSeq (
++ IR_FinderDefSeq (void); // default ctor
++ IR_FinderDefSeq (CORBA::ULong max); // uses max size
++ IR_FinderDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- FinderDef_ptr *buffer,
++ IR_FinderDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- FinderDefSeq (const FinderDefSeq &); // copy ctor
+- ~FinderDefSeq (void);
++ IR_FinderDefSeq (const IR_FinderDefSeq &); // copy ctor
++ ~IR_FinderDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef FinderDefSeq_var _var_type;
++ typedef IR_FinderDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEFSEQ___VAR_CH_)
+-#define _TAO_IR_FINDERDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::FinderDefSeq_var
++// class IR_FinderDefSeq_var
+ // *************************************************************
+
+-class TAO_Export FinderDefSeq_var
++class TAO_Export IR_FinderDefSeq_var
+ {
+ public:
+- FinderDefSeq_var (void); // default constructor
+- FinderDefSeq_var (FinderDefSeq *);
+- FinderDefSeq_var (const FinderDefSeq_var &); // copy constructor
+- ~FinderDefSeq_var (void); // destructor
++ IR_FinderDefSeq_var (void); // default constructor
++ IR_FinderDefSeq_var (IR_FinderDefSeq *);
++ IR_FinderDefSeq_var (const IR_FinderDefSeq_var &); // copy constructor
++ ~IR_FinderDefSeq_var (void); // destructor
+
+- FinderDefSeq_var &operator= (FinderDefSeq *);
+- FinderDefSeq_var &operator= (const FinderDefSeq_var &);
+- FinderDefSeq *operator-> (void);
+- const FinderDefSeq *operator-> (void) const;
++ IR_FinderDefSeq_var &operator= (IR_FinderDefSeq *);
++ IR_FinderDefSeq_var &operator= (const IR_FinderDefSeq_var &);
++ IR_FinderDefSeq *operator-> (void);
++ const IR_FinderDefSeq *operator-> (void) const;
+
+- operator const FinderDefSeq &() const;
+- operator FinderDefSeq &();
+- operator FinderDefSeq &() const;
+- operator FinderDefSeq *&(); // variable-size base types only
++ operator const IR_FinderDefSeq &() const;
++ operator IR_FinderDefSeq &();
++ operator IR_FinderDefSeq &() const;
++ operator IR_FinderDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const FinderDefSeq &in (void) const;
+- FinderDefSeq &inout (void);
+- FinderDefSeq *&out (void);
+- FinderDefSeq *_retn (void);
+- FinderDefSeq *ptr (void) const;
++ const IR_FinderDefSeq &in (void) const;
++ IR_FinderDefSeq &inout (void);
++ IR_FinderDefSeq *&out (void);
++ IR_FinderDefSeq *_retn (void);
++ IR_FinderDefSeq *ptr (void) const;
+
+ private:
+- FinderDefSeq *ptr_;
++ IR_FinderDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEFSEQ___OUT_CH_)
+-#define _TAO_IR_FINDERDEFSEQ___OUT_CH_
+-
+-class TAO_Export FinderDefSeq_out
++class TAO_Export IR_FinderDefSeq_out
+ {
+ public:
+- FinderDefSeq_out (FinderDefSeq *&);
+- FinderDefSeq_out (FinderDefSeq_var &);
+- FinderDefSeq_out (const FinderDefSeq_out &);
+- FinderDefSeq_out &operator= (const FinderDefSeq_out &);
+- FinderDefSeq_out &operator= (FinderDefSeq *);
+- operator FinderDefSeq *&();
+- FinderDefSeq *&ptr (void);
+- FinderDefSeq *operator-> (void);
+- TAO_Object_Manager<FinderDef, FinderDef_var> operator[] (CORBA::ULong index);
++ IR_FinderDefSeq_out (IR_FinderDefSeq *&);
++ IR_FinderDefSeq_out (IR_FinderDefSeq_var &);
++ IR_FinderDefSeq_out (const IR_FinderDefSeq_out &);
++ IR_FinderDefSeq_out &operator= (const IR_FinderDefSeq_out &);
++ IR_FinderDefSeq_out &operator= (IR_FinderDefSeq *);
++ operator IR_FinderDefSeq *&();
++ IR_FinderDefSeq *&ptr (void);
++ IR_FinderDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- FinderDefSeq *&ptr_;
++ IR_FinderDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const FinderDefSeq_var &);
++ void operator= (const IR_FinderDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDefSeq;
+-
+-class PrimaryKeyDef;
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___PTR_CH_)
+-#define _TAO_IR_PRIMARYKEYDEF___PTR_CH_
+-
+-typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___VAR_CH_)
+-#define _TAO_IR_PRIMARYKEYDEF___VAR_CH_
+-
+-class TAO_Export PrimaryKeyDef_var : public TAO_Base_var
++class TAO_Export IR_PrimaryKeyDef_var : public TAO_Base_var
+ {
+ public:
+- PrimaryKeyDef_var (void); // default constructor
+- PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {}
+- PrimaryKeyDef_var (const PrimaryKeyDef_var &); // copy constructor
+- ~PrimaryKeyDef_var (void); // destructor
++ IR_PrimaryKeyDef_var (void); // default constructor
++ IR_PrimaryKeyDef_var (IR_PrimaryKeyDef_ptr p) : ptr_ (p) {}
++ IR_PrimaryKeyDef_var (const IR_PrimaryKeyDef_var &); // copy constructor
++ ~IR_PrimaryKeyDef_var (void); // destructor
+
+- PrimaryKeyDef_var &operator= (PrimaryKeyDef_ptr);
+- PrimaryKeyDef_var &operator= (const PrimaryKeyDef_var &);
+- PrimaryKeyDef_ptr operator-> (void) const;
++ IR_PrimaryKeyDef_var &operator= (IR_PrimaryKeyDef_ptr);
++ IR_PrimaryKeyDef_var &operator= (const IR_PrimaryKeyDef_var &);
++ IR_PrimaryKeyDef_ptr operator-> (void) const;
+
+- operator const PrimaryKeyDef_ptr &() const;
+- operator PrimaryKeyDef_ptr &();
++ operator const IR_PrimaryKeyDef_ptr &() const;
++ operator IR_PrimaryKeyDef_ptr &();
+ // in, inout, out, _retn
+- PrimaryKeyDef_ptr in (void) const;
+- PrimaryKeyDef_ptr &inout (void);
+- PrimaryKeyDef_ptr &out (void);
+- PrimaryKeyDef_ptr _retn (void);
+- PrimaryKeyDef_ptr ptr (void) const;
++ IR_PrimaryKeyDef_ptr in (void) const;
++ IR_PrimaryKeyDef_ptr &inout (void);
++ IR_PrimaryKeyDef_ptr &out (void);
++ IR_PrimaryKeyDef_ptr _retn (void);
++ IR_PrimaryKeyDef_ptr ptr (void) const;
+
+ private:
+- PrimaryKeyDef_ptr ptr_;
++ IR_PrimaryKeyDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- PrimaryKeyDef_var (const TAO_Base_var &rhs);
+- PrimaryKeyDef_var &operator= (const TAO_Base_var &rhs);
++ IR_PrimaryKeyDef_var (const TAO_Base_var &rhs);
++ IR_PrimaryKeyDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___OUT_CH_)
+-#define _TAO_IR_PRIMARYKEYDEF___OUT_CH_
+-
+-class TAO_Export PrimaryKeyDef_out
++class TAO_Export IR_PrimaryKeyDef_out
+ {
+ public:
+- PrimaryKeyDef_out (PrimaryKeyDef_ptr &);
+- PrimaryKeyDef_out (PrimaryKeyDef_var &);
+- PrimaryKeyDef_out (const PrimaryKeyDef_out &);
+- PrimaryKeyDef_out &operator= (const PrimaryKeyDef_out &);
+- PrimaryKeyDef_out &operator= (const PrimaryKeyDef_var &);
+- PrimaryKeyDef_out &operator= (PrimaryKeyDef_ptr);
+- operator PrimaryKeyDef_ptr &();
+- PrimaryKeyDef_ptr &ptr (void);
+- PrimaryKeyDef_ptr operator-> (void);
++ IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_ptr &);
++ IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_var &);
++ IR_PrimaryKeyDef_out (const IR_PrimaryKeyDef_out &);
++ IR_PrimaryKeyDef_out &operator= (const IR_PrimaryKeyDef_out &);
++ IR_PrimaryKeyDef_out &operator= (const IR_PrimaryKeyDef_var &);
++ IR_PrimaryKeyDef_out &operator= (IR_PrimaryKeyDef_ptr);
++ operator IR_PrimaryKeyDef_ptr &();
++ IR_PrimaryKeyDef_ptr &ptr (void);
++ IR_PrimaryKeyDef_ptr operator-> (void);
+
+ private:
+- PrimaryKeyDef_ptr &ptr_;
++ IR_PrimaryKeyDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_ContainedSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -5065,19 +3404,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- Contained* *value,
++ IR_Contained* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs);
+- TAO_Object_Manager<IR::Contained,IR::Contained_var> operator[] (CORBA::ULong index) const;
+- static Contained **allocbuf (CORBA::ULong nelems);
+- static void freebuf (Contained **buffer);
++ TAO_Object_Manager<IR_Contained,IR_Contained_var> operator[] (CORBA::ULong index) const;
++ static IR_Contained **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_Contained **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- Contained* *get_buffer (CORBA::Boolean orphan = 0);
+- const Contained* *get_buffer (void) const;
++ IR_Contained* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_Contained* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -5089,191 +3428,156 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONTAINEDSEQ_CH_)
+-#define _TAO_IR_CONTAINEDSEQ_CH_
+-
+-class ContainedSeq;
+-class ContainedSeq_var;
+-
+ // *************************************************************
+-// ContainedSeq
++// IR_ContainedSeq
+ // *************************************************************
+
+-class TAO_Export ContainedSeq : public
++class TAO_Export IR_ContainedSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ContainedSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<Contained,Contained_var>
++ TAO_Unbounded_Object_Sequence<IR_Contained,IR_Contained_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ContainedSeq (void); // default ctor
+- ContainedSeq (CORBA::ULong max); // uses max size
+- ContainedSeq (
++ IR_ContainedSeq (void); // default ctor
++ IR_ContainedSeq (CORBA::ULong max); // uses max size
++ IR_ContainedSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- Contained_ptr *buffer,
++ IR_Contained_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- ContainedSeq (const ContainedSeq &); // copy ctor
+- ~ContainedSeq (void);
++ IR_ContainedSeq (const IR_ContainedSeq &); // copy ctor
++ ~IR_ContainedSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ContainedSeq_var _var_type;
++ typedef IR_ContainedSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINEDSEQ___VAR_CH_)
+-#define _TAO_IR_CONTAINEDSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ContainedSeq_var
++// class IR_ContainedSeq_var
+ // *************************************************************
+
+-class TAO_Export ContainedSeq_var
++class TAO_Export IR_ContainedSeq_var
+ {
+ public:
+- ContainedSeq_var (void); // default constructor
+- ContainedSeq_var (ContainedSeq *);
+- ContainedSeq_var (const ContainedSeq_var &); // copy constructor
+- ~ContainedSeq_var (void); // destructor
++ IR_ContainedSeq_var (void); // default constructor
++ IR_ContainedSeq_var (IR_ContainedSeq *);
++ IR_ContainedSeq_var (const IR_ContainedSeq_var &); // copy constructor
++ ~IR_ContainedSeq_var (void); // destructor
+
+- ContainedSeq_var &operator= (ContainedSeq *);
+- ContainedSeq_var &operator= (const ContainedSeq_var &);
+- ContainedSeq *operator-> (void);
+- const ContainedSeq *operator-> (void) const;
++ IR_ContainedSeq_var &operator= (IR_ContainedSeq *);
++ IR_ContainedSeq_var &operator= (const IR_ContainedSeq_var &);
++ IR_ContainedSeq *operator-> (void);
++ const IR_ContainedSeq *operator-> (void) const;
+
+- operator const ContainedSeq &() const;
+- operator ContainedSeq &();
+- operator ContainedSeq &() const;
+- operator ContainedSeq *&(); // variable-size base types only
++ operator const IR_ContainedSeq &() const;
++ operator IR_ContainedSeq &();
++ operator IR_ContainedSeq &() const;
++ operator IR_ContainedSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_Contained, IR_Contained_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const ContainedSeq &in (void) const;
+- ContainedSeq &inout (void);
+- ContainedSeq *&out (void);
+- ContainedSeq *_retn (void);
+- ContainedSeq *ptr (void) const;
++ const IR_ContainedSeq &in (void) const;
++ IR_ContainedSeq &inout (void);
++ IR_ContainedSeq *&out (void);
++ IR_ContainedSeq *_retn (void);
++ IR_ContainedSeq *ptr (void) const;
+
+ private:
+- ContainedSeq *ptr_;
++ IR_ContainedSeq *ptr_;
+ };
+
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINEDSEQ___OUT_CH_)
+-#define _TAO_IR_CONTAINEDSEQ___OUT_CH_
+-
+-class TAO_Export ContainedSeq_out
++class TAO_Export IR_ContainedSeq_out
+ {
+ public:
+- ContainedSeq_out (ContainedSeq *&);
+- ContainedSeq_out (ContainedSeq_var &);
+- ContainedSeq_out (const ContainedSeq_out &);
+- ContainedSeq_out &operator= (const ContainedSeq_out &);
+- ContainedSeq_out &operator= (ContainedSeq *);
+- operator ContainedSeq *&();
+- ContainedSeq *&ptr (void);
+- ContainedSeq *operator-> (void);
+- TAO_Object_Manager<Contained, Contained_var> operator[] (CORBA::ULong index);
++ IR_ContainedSeq_out (IR_ContainedSeq *&);
++ IR_ContainedSeq_out (IR_ContainedSeq_var &);
++ IR_ContainedSeq_out (const IR_ContainedSeq_out &);
++ IR_ContainedSeq_out &operator= (const IR_ContainedSeq_out &);
++ IR_ContainedSeq_out &operator= (IR_ContainedSeq *);
++ operator IR_ContainedSeq *&();
++ IR_ContainedSeq *&ptr (void);
++ IR_ContainedSeq *operator-> (void);
++ TAO_Object_Manager<IR_Contained, IR_Contained_var> operator[] (CORBA::ULong index);
+
+ private:
+- ContainedSeq *&ptr_;
++ IR_ContainedSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ContainedSeq_var &);
++ void operator= (const IR_ContainedSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContainedSeq;
+-
+-struct StructMember;
+-class StructMember_var;
+-
+-struct TAO_Export StructMember
++struct TAO_Export IR_StructMember
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef StructMember_var _var_type;
++ typedef IR_StructMember_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+
+ TAO_String_Manager name;
+ CORBA::TypeCode_var type;
+- ACE_NESTED_CLASS (IR, IDLType_var) type_def;
++ IR_IDLType_var type_def;
+ };
+
+-class TAO_Export StructMember_var
++class TAO_Export IR_StructMember_var
+ {
+ public:
+- StructMember_var (void); // default constructor
+- StructMember_var (StructMember *);
+- StructMember_var (const StructMember_var &); // copy constructor
+- ~StructMember_var (void); // destructor
++ IR_StructMember_var (void); // default constructor
++ IR_StructMember_var (IR_StructMember *);
++ IR_StructMember_var (const IR_StructMember_var &); // copy constructor
++ ~IR_StructMember_var (void); // destructor
+
+- StructMember_var &operator= (StructMember *);
+- StructMember_var &operator= (const StructMember_var &);
+- StructMember *operator-> (void);
+- const StructMember *operator-> (void) const;
++ IR_StructMember_var &operator= (IR_StructMember *);
++ IR_StructMember_var &operator= (const IR_StructMember_var &);
++ IR_StructMember *operator-> (void);
++ const IR_StructMember *operator-> (void) const;
+
+- operator const StructMember &() const;
+- operator StructMember &();
+- operator StructMember &() const;
+- operator StructMember *&(); // variable-size types only
++ operator const IR_StructMember &() const;
++ operator IR_StructMember &();
++ operator IR_StructMember &() const;
++ operator IR_StructMember *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const StructMember &in (void) const;
+- StructMember &inout (void);
+- StructMember *&out (void);
+- StructMember *_retn (void);
+- StructMember *ptr (void) const;
++ const IR_StructMember &in (void) const;
++ IR_StructMember &inout (void);
++ IR_StructMember *&out (void);
++ IR_StructMember *_retn (void);
++ IR_StructMember *ptr (void) const;
+
+ private:
+- StructMember *ptr_;
++ IR_StructMember *ptr_;
+ };
+
+-class TAO_Export StructMember_out
++class TAO_Export IR_StructMember_out
+ {
+ public:
+- StructMember_out (StructMember *&);
+- StructMember_out (StructMember_var &);
+- StructMember_out (const StructMember_out &);
+- StructMember_out &operator= (const StructMember_out &);
+- StructMember_out &operator= (StructMember *);
+- operator StructMember *&();
+- StructMember *&ptr (void);
+- StructMember *operator-> (void);
++ IR_StructMember_out (IR_StructMember *&);
++ IR_StructMember_out (IR_StructMember_var &);
++ IR_StructMember_out (const IR_StructMember_out &);
++ IR_StructMember_out &operator= (const IR_StructMember_out &);
++ IR_StructMember_out &operator= (IR_StructMember *);
++ operator IR_StructMember *&();
++ IR_StructMember *&ptr (void);
++ IR_StructMember *operator-> (void);
+
+ private:
+- StructMember *&ptr_;
++ IR_StructMember *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const StructMember_var &);
++ void operator= (const IR_StructMember_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMember;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_StructMemberSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -5283,214 +3587,178 @@
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- StructMember *data,
++ IR_StructMember *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq &operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_StructMemberSeq (void); // Dtor.
+ // = Accessors.
+- StructMember &operator[] (CORBA::ULong i);
+- const StructMember &operator[] (CORBA::ULong i) const;
++ IR_StructMember &operator[] (CORBA::ULong i);
++ const IR_StructMember &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static StructMember *allocbuf (CORBA::ULong size);
+- static void freebuf (StructMember *buffer);
++ static IR_StructMember *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_StructMember *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- StructMember *get_buffer (CORBA::Boolean orphan = 0);
+- const StructMember *get_buffer (void) const;
++ IR_StructMember *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_StructMember *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- StructMember *data,
++ IR_StructMember *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_STRUCTMEMBERSEQ_CH_)
+-#define _TAO_IR_STRUCTMEMBERSEQ_CH_
+-
+-class StructMemberSeq;
+-class StructMemberSeq_var;
+-
+ // *************************************************************
+-// StructMemberSeq
++// IR_StructMemberSeq
+ // *************************************************************
+
+-class TAO_Export StructMemberSeq : public
++class TAO_Export IR_StructMemberSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<StructMember>
++ TAO_Unbounded_Sequence<IR_StructMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- StructMemberSeq (void); // default ctor
+- StructMemberSeq (CORBA::ULong max); // uses max size
+- StructMemberSeq (
++ IR_StructMemberSeq (void); // default ctor
++ IR_StructMemberSeq (CORBA::ULong max); // uses max size
++ IR_StructMemberSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- StructMember *buffer,
++ IR_StructMember *buffer,
+ CORBA::Boolean release = 0
+ );
+- StructMemberSeq (const StructMemberSeq &); // copy ctor
+- ~StructMemberSeq (void);
++ IR_StructMemberSeq (const IR_StructMemberSeq &); // copy ctor
++ ~IR_StructMemberSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef StructMemberSeq_var _var_type;
++ typedef IR_StructMemberSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTMEMBERSEQ___VAR_CH_)
+-#define _TAO_IR_STRUCTMEMBERSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::StructMemberSeq_var
++// class IR_StructMemberSeq_var
+ // *************************************************************
+
+-class TAO_Export StructMemberSeq_var
++class TAO_Export IR_StructMemberSeq_var
+ {
+ public:
+- StructMemberSeq_var (void); // default constructor
+- StructMemberSeq_var (StructMemberSeq *);
+- StructMemberSeq_var (const StructMemberSeq_var &); // copy constructor
+- ~StructMemberSeq_var (void); // destructor
++ IR_StructMemberSeq_var (void); // default constructor
++ IR_StructMemberSeq_var (IR_StructMemberSeq *);
++ IR_StructMemberSeq_var (const IR_StructMemberSeq_var &); // copy constructor
++ ~IR_StructMemberSeq_var (void); // destructor
+
+- StructMemberSeq_var &operator= (StructMemberSeq *);
+- StructMemberSeq_var &operator= (const StructMemberSeq_var &);
+- StructMemberSeq *operator-> (void);
+- const StructMemberSeq *operator-> (void) const;
++ IR_StructMemberSeq_var &operator= (IR_StructMemberSeq *);
++ IR_StructMemberSeq_var &operator= (const IR_StructMemberSeq_var &);
++ IR_StructMemberSeq *operator-> (void);
++ const IR_StructMemberSeq *operator-> (void) const;
+
+- operator const StructMemberSeq &() const;
+- operator StructMemberSeq &();
+- operator StructMemberSeq &() const;
+- operator StructMemberSeq *&(); // variable-size base types only
++ operator const IR_StructMemberSeq &() const;
++ operator IR_StructMemberSeq &();
++ operator IR_StructMemberSeq &() const;
++ operator IR_StructMemberSeq *&(); // variable-size base types only
+
+- StructMember & operator[] (CORBA::ULong index);
+- const StructMember & operator[] (CORBA::ULong index) const;
++ IR_StructMember & operator[] (CORBA::ULong index);
++ const IR_StructMember & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const StructMemberSeq &in (void) const;
+- StructMemberSeq &inout (void);
+- StructMemberSeq *&out (void);
+- StructMemberSeq *_retn (void);
+- StructMemberSeq *ptr (void) const;
++ const IR_StructMemberSeq &in (void) const;
++ IR_StructMemberSeq &inout (void);
++ IR_StructMemberSeq *&out (void);
++ IR_StructMemberSeq *_retn (void);
++ IR_StructMemberSeq *ptr (void) const;
+
+ private:
+- StructMemberSeq *ptr_;
++ IR_StructMemberSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTMEMBERSEQ___OUT_CH_)
+-#define _TAO_IR_STRUCTMEMBERSEQ___OUT_CH_
+-
+-class TAO_Export StructMemberSeq_out
++class TAO_Export IR_StructMemberSeq_out
+ {
+ public:
+- StructMemberSeq_out (StructMemberSeq *&);
+- StructMemberSeq_out (StructMemberSeq_var &);
+- StructMemberSeq_out (const StructMemberSeq_out &);
+- StructMemberSeq_out &operator= (const StructMemberSeq_out &);
+- StructMemberSeq_out &operator= (StructMemberSeq *);
+- operator StructMemberSeq *&();
+- StructMemberSeq *&ptr (void);
+- StructMemberSeq *operator-> (void);
+- StructMember & operator[] (CORBA::ULong index);
++ IR_StructMemberSeq_out (IR_StructMemberSeq *&);
++ IR_StructMemberSeq_out (IR_StructMemberSeq_var &);
++ IR_StructMemberSeq_out (const IR_StructMemberSeq_out &);
++ IR_StructMemberSeq_out &operator= (const IR_StructMemberSeq_out &);
++ IR_StructMemberSeq_out &operator= (IR_StructMemberSeq *);
++ operator IR_StructMemberSeq *&();
++ IR_StructMemberSeq *&ptr (void);
++ IR_StructMemberSeq *operator-> (void);
++ IR_StructMember & operator[] (CORBA::ULong index);
+
+ private:
+- StructMemberSeq *&ptr_;
++ IR_StructMemberSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const StructMemberSeq_var &);
++ void operator= (const IR_StructMemberSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMemberSeq;
+-
+-struct Initializer;
+-class Initializer_var;
+-
+-struct TAO_Export Initializer
++struct TAO_Export IR_Initializer
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef Initializer_var _var_type;
++ typedef IR_Initializer_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+
+- ACE_NESTED_CLASS (IR, StructMemberSeq) members;
++ IR_StructMemberSeq members;
+ TAO_String_Manager name;
+ };
+
+-class TAO_Export Initializer_var
++class TAO_Export IR_Initializer_var
+ {
+ public:
+- Initializer_var (void); // default constructor
+- Initializer_var (Initializer *);
+- Initializer_var (const Initializer_var &); // copy constructor
+- ~Initializer_var (void); // destructor
+-
+- Initializer_var &operator= (Initializer *);
+- Initializer_var &operator= (const Initializer_var &);
+- Initializer *operator-> (void);
+- const Initializer *operator-> (void) const;
+-
+- operator const Initializer &() const;
+- operator Initializer &();
+- operator Initializer &() const;
+- operator Initializer *&(); // variable-size types only
++ IR_Initializer_var (void); // default constructor
++ IR_Initializer_var (IR_Initializer *);
++ IR_Initializer_var (const IR_Initializer_var &); // copy constructor
++ ~IR_Initializer_var (void); // destructor
++
++ IR_Initializer_var &operator= (IR_Initializer *);
++ IR_Initializer_var &operator= (const IR_Initializer_var &);
++ IR_Initializer *operator-> (void);
++ const IR_Initializer *operator-> (void) const;
++
++ operator const IR_Initializer &() const;
++ operator IR_Initializer &();
++ operator IR_Initializer &() const;
++ operator IR_Initializer *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const Initializer &in (void) const;
+- Initializer &inout (void);
+- Initializer *&out (void);
+- Initializer *_retn (void);
+- Initializer *ptr (void) const;
++ const IR_Initializer &in (void) const;
++ IR_Initializer &inout (void);
++ IR_Initializer *&out (void);
++ IR_Initializer *_retn (void);
++ IR_Initializer *ptr (void) const;
+
+ private:
+- Initializer *ptr_;
++ IR_Initializer *ptr_;
+ };
+
+-class TAO_Export Initializer_out
++class TAO_Export IR_Initializer_out
+ {
+ public:
+- Initializer_out (Initializer *&);
+- Initializer_out (Initializer_var &);
+- Initializer_out (const Initializer_out &);
+- Initializer_out &operator= (const Initializer_out &);
+- Initializer_out &operator= (Initializer *);
+- operator Initializer *&();
+- Initializer *&ptr (void);
+- Initializer *operator-> (void);
++ IR_Initializer_out (IR_Initializer *&);
++ IR_Initializer_out (IR_Initializer_var &);
++ IR_Initializer_out (const IR_Initializer_out &);
++ IR_Initializer_out &operator= (const IR_Initializer_out &);
++ IR_Initializer_out &operator= (IR_Initializer *);
++ operator IR_Initializer *&();
++ IR_Initializer *&ptr (void);
++ IR_Initializer *operator-> (void);
+
+ private:
+- Initializer *&ptr_;
++ IR_Initializer *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const Initializer_var &);
++ void operator= (const IR_Initializer_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Initializer;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_InitializerSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -5500,151 +3768,121 @@
+ _TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- Initializer *data,
++ IR_Initializer *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_InitializerSeq &operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_InitializerSeq (void); // Dtor.
+ // = Accessors.
+- Initializer &operator[] (CORBA::ULong i);
+- const Initializer &operator[] (CORBA::ULong i) const;
++ IR_Initializer &operator[] (CORBA::ULong i);
++ const IR_Initializer &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static Initializer *allocbuf (CORBA::ULong size);
+- static void freebuf (Initializer *buffer);
++ static IR_Initializer *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_Initializer *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- Initializer *get_buffer (CORBA::Boolean orphan = 0);
+- const Initializer *get_buffer (void) const;
++ IR_Initializer *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_Initializer *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- Initializer *data,
++ IR_Initializer *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_INITIALIZERSEQ_CH_)
+-#define _TAO_IR_INITIALIZERSEQ_CH_
+-
+-class InitializerSeq;
+-class InitializerSeq_var;
+-
+ // *************************************************************
+-// InitializerSeq
++// IR_InitializerSeq
+ // *************************************************************
+
+-class TAO_Export InitializerSeq : public
++class TAO_Export IR_InitializerSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_InitializerSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<Initializer>
++ TAO_Unbounded_Sequence<IR_Initializer>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- InitializerSeq (void); // default ctor
+- InitializerSeq (CORBA::ULong max); // uses max size
+- InitializerSeq (
++ IR_InitializerSeq (void); // default ctor
++ IR_InitializerSeq (CORBA::ULong max); // uses max size
++ IR_InitializerSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- Initializer *buffer,
++ IR_Initializer *buffer,
+ CORBA::Boolean release = 0
+ );
+- InitializerSeq (const InitializerSeq &); // copy ctor
+- ~InitializerSeq (void);
++ IR_InitializerSeq (const IR_InitializerSeq &); // copy ctor
++ ~IR_InitializerSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef InitializerSeq_var _var_type;
++ typedef IR_InitializerSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INITIALIZERSEQ___VAR_CH_)
+-#define _TAO_IR_INITIALIZERSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::InitializerSeq_var
++// class IR_InitializerSeq_var
+ // *************************************************************
+
+-class TAO_Export InitializerSeq_var
++class TAO_Export IR_InitializerSeq_var
+ {
+ public:
+- InitializerSeq_var (void); // default constructor
+- InitializerSeq_var (InitializerSeq *);
+- InitializerSeq_var (const InitializerSeq_var &); // copy constructor
+- ~InitializerSeq_var (void); // destructor
++ IR_InitializerSeq_var (void); // default constructor
++ IR_InitializerSeq_var (IR_InitializerSeq *);
++ IR_InitializerSeq_var (const IR_InitializerSeq_var &); // copy constructor
++ ~IR_InitializerSeq_var (void); // destructor
+
+- InitializerSeq_var &operator= (InitializerSeq *);
+- InitializerSeq_var &operator= (const InitializerSeq_var &);
+- InitializerSeq *operator-> (void);
+- const InitializerSeq *operator-> (void) const;
++ IR_InitializerSeq_var &operator= (IR_InitializerSeq *);
++ IR_InitializerSeq_var &operator= (const IR_InitializerSeq_var &);
++ IR_InitializerSeq *operator-> (void);
++ const IR_InitializerSeq *operator-> (void) const;
+
+- operator const InitializerSeq &() const;
+- operator InitializerSeq &();
+- operator InitializerSeq &() const;
+- operator InitializerSeq *&(); // variable-size base types only
++ operator const IR_InitializerSeq &() const;
++ operator IR_InitializerSeq &();
++ operator IR_InitializerSeq &() const;
++ operator IR_InitializerSeq *&(); // variable-size base types only
+
+- Initializer & operator[] (CORBA::ULong index);
+- const Initializer & operator[] (CORBA::ULong index) const;
++ IR_Initializer & operator[] (CORBA::ULong index);
++ const IR_Initializer & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const InitializerSeq &in (void) const;
+- InitializerSeq &inout (void);
+- InitializerSeq *&out (void);
+- InitializerSeq *_retn (void);
+- InitializerSeq *ptr (void) const;
++ const IR_InitializerSeq &in (void) const;
++ IR_InitializerSeq &inout (void);
++ IR_InitializerSeq *&out (void);
++ IR_InitializerSeq *_retn (void);
++ IR_InitializerSeq *ptr (void) const;
+
+ private:
+- InitializerSeq *ptr_;
++ IR_InitializerSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INITIALIZERSEQ___OUT_CH_)
+-#define _TAO_IR_INITIALIZERSEQ___OUT_CH_
+-
+-class TAO_Export InitializerSeq_out
++class TAO_Export IR_InitializerSeq_out
+ {
+ public:
+- InitializerSeq_out (InitializerSeq *&);
+- InitializerSeq_out (InitializerSeq_var &);
+- InitializerSeq_out (const InitializerSeq_out &);
+- InitializerSeq_out &operator= (const InitializerSeq_out &);
+- InitializerSeq_out &operator= (InitializerSeq *);
+- operator InitializerSeq *&();
+- InitializerSeq *&ptr (void);
+- InitializerSeq *operator-> (void);
+- Initializer & operator[] (CORBA::ULong index);
++ IR_InitializerSeq_out (IR_InitializerSeq *&);
++ IR_InitializerSeq_out (IR_InitializerSeq_var &);
++ IR_InitializerSeq_out (const IR_InitializerSeq_out &);
++ IR_InitializerSeq_out &operator= (const IR_InitializerSeq_out &);
++ IR_InitializerSeq_out &operator= (IR_InitializerSeq *);
++ operator IR_InitializerSeq *&();
++ IR_InitializerSeq *&ptr (void);
++ IR_InitializerSeq *operator-> (void);
++ IR_Initializer & operator[] (CORBA::ULong index);
+
+ private:
+- InitializerSeq *&ptr_;
++ IR_InitializerSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const InitializerSeq_var &);
++ void operator= (const IR_InitializerSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InitializerSeq;
+-
+-struct UnionMember;
+-class UnionMember_var;
+-
+-struct TAO_Export UnionMember
++struct TAO_Export IR_UnionMember
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef UnionMember_var _var_type;
++ typedef IR_UnionMember_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -5652,64 +3890,58 @@
+ TAO_String_Manager name;
+ CORBA::Any label;
+ CORBA::TypeCode_var type;
+- ACE_NESTED_CLASS (IR, IDLType_var) type_def;
++ IR_IDLType_var type_def;
+ };
+
+-class TAO_Export UnionMember_var
++class TAO_Export IR_UnionMember_var
+ {
+ public:
+- UnionMember_var (void); // default constructor
+- UnionMember_var (UnionMember *);
+- UnionMember_var (const UnionMember_var &); // copy constructor
+- ~UnionMember_var (void); // destructor
++ IR_UnionMember_var (void); // default constructor
++ IR_UnionMember_var (IR_UnionMember *);
++ IR_UnionMember_var (const IR_UnionMember_var &); // copy constructor
++ ~IR_UnionMember_var (void); // destructor
+
+- UnionMember_var &operator= (UnionMember *);
+- UnionMember_var &operator= (const UnionMember_var &);
+- UnionMember *operator-> (void);
+- const UnionMember *operator-> (void) const;
++ IR_UnionMember_var &operator= (IR_UnionMember *);
++ IR_UnionMember_var &operator= (const IR_UnionMember_var &);
++ IR_UnionMember *operator-> (void);
++ const IR_UnionMember *operator-> (void) const;
+
+- operator const UnionMember &() const;
+- operator UnionMember &();
+- operator UnionMember &() const;
+- operator UnionMember *&(); // variable-size types only
++ operator const IR_UnionMember &() const;
++ operator IR_UnionMember &();
++ operator IR_UnionMember &() const;
++ operator IR_UnionMember *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const UnionMember &in (void) const;
+- UnionMember &inout (void);
+- UnionMember *&out (void);
+- UnionMember *_retn (void);
+- UnionMember *ptr (void) const;
++ const IR_UnionMember &in (void) const;
++ IR_UnionMember &inout (void);
++ IR_UnionMember *&out (void);
++ IR_UnionMember *_retn (void);
++ IR_UnionMember *ptr (void) const;
+
+ private:
+- UnionMember *ptr_;
++ IR_UnionMember *ptr_;
+ };
+
+-class TAO_Export UnionMember_out
++class TAO_Export IR_UnionMember_out
+ {
+ public:
+- UnionMember_out (UnionMember *&);
+- UnionMember_out (UnionMember_var &);
+- UnionMember_out (const UnionMember_out &);
+- UnionMember_out &operator= (const UnionMember_out &);
+- UnionMember_out &operator= (UnionMember *);
+- operator UnionMember *&();
+- UnionMember *&ptr (void);
+- UnionMember *operator-> (void);
++ IR_UnionMember_out (IR_UnionMember *&);
++ IR_UnionMember_out (IR_UnionMember_var &);
++ IR_UnionMember_out (const IR_UnionMember_out &);
++ IR_UnionMember_out &operator= (const IR_UnionMember_out &);
++ IR_UnionMember_out &operator= (IR_UnionMember *);
++ operator IR_UnionMember *&();
++ IR_UnionMember *&ptr (void);
++ IR_UnionMember *operator-> (void);
+
+ private:
+- UnionMember *&ptr_;
++ IR_UnionMember *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const UnionMember_var &);
++ void operator= (const IR_UnionMember_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMember;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UnionMemberSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -5719,155 +3951,121 @@
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- UnionMember *data,
++ IR_UnionMember *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq &operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void); // Dtor.
+ // = Accessors.
+- UnionMember &operator[] (CORBA::ULong i);
+- const UnionMember &operator[] (CORBA::ULong i) const;
++ IR_UnionMember &operator[] (CORBA::ULong i);
++ const IR_UnionMember &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static UnionMember *allocbuf (CORBA::ULong size);
+- static void freebuf (UnionMember *buffer);
++ static IR_UnionMember *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_UnionMember *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- UnionMember *get_buffer (CORBA::Boolean orphan = 0);
+- const UnionMember *get_buffer (void) const;
++ IR_UnionMember *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_UnionMember *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- UnionMember *data,
++ IR_UnionMember *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_UNIONMEMBERSEQ_CH_)
+-#define _TAO_IR_UNIONMEMBERSEQ_CH_
+-
+-class UnionMemberSeq;
+-class UnionMemberSeq_var;
+-
+ // *************************************************************
+-// UnionMemberSeq
++// IR_UnionMemberSeq
+ // *************************************************************
+
+-class TAO_Export UnionMemberSeq : public
++class TAO_Export IR_UnionMemberSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<UnionMember>
++ TAO_Unbounded_Sequence<IR_UnionMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- UnionMemberSeq (void); // default ctor
+- UnionMemberSeq (CORBA::ULong max); // uses max size
+- UnionMemberSeq (
++ IR_UnionMemberSeq (void); // default ctor
++ IR_UnionMemberSeq (CORBA::ULong max); // uses max size
++ IR_UnionMemberSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- UnionMember *buffer,
++ IR_UnionMember *buffer,
+ CORBA::Boolean release = 0
+ );
+- UnionMemberSeq (const UnionMemberSeq &); // copy ctor
+- ~UnionMemberSeq (void);
++ IR_UnionMemberSeq (const IR_UnionMemberSeq &); // copy ctor
++ ~IR_UnionMemberSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef UnionMemberSeq_var _var_type;
++ typedef IR_UnionMemberSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONMEMBERSEQ___VAR_CH_)
+-#define _TAO_IR_UNIONMEMBERSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::UnionMemberSeq_var
++// class IR_UnionMemberSeq_var
+ // *************************************************************
+
+-class TAO_Export UnionMemberSeq_var
++class TAO_Export IR_UnionMemberSeq_var
+ {
+ public:
+- UnionMemberSeq_var (void); // default constructor
+- UnionMemberSeq_var (UnionMemberSeq *);
+- UnionMemberSeq_var (const UnionMemberSeq_var &); // copy constructor
+- ~UnionMemberSeq_var (void); // destructor
++ IR_UnionMemberSeq_var (void); // default constructor
++ IR_UnionMemberSeq_var (IR_UnionMemberSeq *);
++ IR_UnionMemberSeq_var (const IR_UnionMemberSeq_var &); // copy constructor
++ ~IR_UnionMemberSeq_var (void); // destructor
+
+- UnionMemberSeq_var &operator= (UnionMemberSeq *);
+- UnionMemberSeq_var &operator= (const UnionMemberSeq_var &);
+- UnionMemberSeq *operator-> (void);
+- const UnionMemberSeq *operator-> (void) const;
++ IR_UnionMemberSeq_var &operator= (IR_UnionMemberSeq *);
++ IR_UnionMemberSeq_var &operator= (const IR_UnionMemberSeq_var &);
++ IR_UnionMemberSeq *operator-> (void);
++ const IR_UnionMemberSeq *operator-> (void) const;
+
+- operator const UnionMemberSeq &() const;
+- operator UnionMemberSeq &();
+- operator UnionMemberSeq &() const;
+- operator UnionMemberSeq *&(); // variable-size base types only
++ operator const IR_UnionMemberSeq &() const;
++ operator IR_UnionMemberSeq &();
++ operator IR_UnionMemberSeq &() const;
++ operator IR_UnionMemberSeq *&(); // variable-size base types only
+
+- UnionMember & operator[] (CORBA::ULong index);
+- const UnionMember & operator[] (CORBA::ULong index) const;
++ IR_UnionMember & operator[] (CORBA::ULong index);
++ const IR_UnionMember & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const UnionMemberSeq &in (void) const;
+- UnionMemberSeq &inout (void);
+- UnionMemberSeq *&out (void);
+- UnionMemberSeq *_retn (void);
+- UnionMemberSeq *ptr (void) const;
++ const IR_UnionMemberSeq &in (void) const;
++ IR_UnionMemberSeq &inout (void);
++ IR_UnionMemberSeq *&out (void);
++ IR_UnionMemberSeq *_retn (void);
++ IR_UnionMemberSeq *ptr (void) const;
+
+ private:
+- UnionMemberSeq *ptr_;
++ IR_UnionMemberSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONMEMBERSEQ___OUT_CH_)
+-#define _TAO_IR_UNIONMEMBERSEQ___OUT_CH_
+-
+-class TAO_Export UnionMemberSeq_out
++class TAO_Export IR_UnionMemberSeq_out
+ {
+ public:
+- UnionMemberSeq_out (UnionMemberSeq *&);
+- UnionMemberSeq_out (UnionMemberSeq_var &);
+- UnionMemberSeq_out (const UnionMemberSeq_out &);
+- UnionMemberSeq_out &operator= (const UnionMemberSeq_out &);
+- UnionMemberSeq_out &operator= (UnionMemberSeq *);
+- operator UnionMemberSeq *&();
+- UnionMemberSeq *&ptr (void);
+- UnionMemberSeq *operator-> (void);
+- UnionMember & operator[] (CORBA::ULong index);
++ IR_UnionMemberSeq_out (IR_UnionMemberSeq *&);
++ IR_UnionMemberSeq_out (IR_UnionMemberSeq_var &);
++ IR_UnionMemberSeq_out (const IR_UnionMemberSeq_out &);
++ IR_UnionMemberSeq_out &operator= (const IR_UnionMemberSeq_out &);
++ IR_UnionMemberSeq_out &operator= (IR_UnionMemberSeq *);
++ operator IR_UnionMemberSeq *&();
++ IR_UnionMemberSeq *&ptr (void);
++ IR_UnionMemberSeq *operator-> (void);
++ IR_UnionMember & operator[] (CORBA::ULong index);
+
+ private:
+- UnionMemberSeq *&ptr_;
++ IR_UnionMemberSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const UnionMemberSeq_var &);
++ void operator= (const IR_UnionMemberSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMemberSeq;
+-
+-
+-#if !defined (_TAO_IR_ENUMMEMBERSEQ_CH_)
+-#define _TAO_IR_ENUMMEMBERSEQ_CH_
+-
+-class EnumMemberSeq;
+-class EnumMemberSeq_var;
+-
+ // *************************************************************
+-// EnumMemberSeq
++// IR_EnumMemberSeq
+ // *************************************************************
+
+-class TAO_Export EnumMemberSeq : public
++class TAO_Export IR_EnumMemberSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+@@ -5875,202 +4073,112 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- EnumMemberSeq (void); // default ctor
+- EnumMemberSeq (CORBA::ULong max); // uses max size
+- EnumMemberSeq (
++ IR_EnumMemberSeq (void); // default ctor
++ IR_EnumMemberSeq (CORBA::ULong max); // uses max size
++ IR_EnumMemberSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
+ CORBA::Boolean release = 0
+ );
+- EnumMemberSeq (const EnumMemberSeq &); // copy ctor
+- ~EnumMemberSeq (void);
++ IR_EnumMemberSeq (const IR_EnumMemberSeq &); // copy ctor
++ ~IR_EnumMemberSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef EnumMemberSeq_var _var_type;
++ typedef IR_EnumMemberSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMMEMBERSEQ___VAR_CH_)
+-#define _TAO_IR_ENUMMEMBERSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::EnumMemberSeq_var
++// class IR_EnumMemberSeq_var
+ // *************************************************************
+
+-class TAO_Export EnumMemberSeq_var
++class TAO_Export IR_EnumMemberSeq_var
+ {
+ public:
+- EnumMemberSeq_var (void); // default constructor
+- EnumMemberSeq_var (EnumMemberSeq *);
+- EnumMemberSeq_var (const EnumMemberSeq_var &); // copy constructor
+- ~EnumMemberSeq_var (void); // destructor
++ IR_EnumMemberSeq_var (void); // default constructor
++ IR_EnumMemberSeq_var (IR_EnumMemberSeq *);
++ IR_EnumMemberSeq_var (const IR_EnumMemberSeq_var &); // copy constructor
++ ~IR_EnumMemberSeq_var (void); // destructor
+
+- EnumMemberSeq_var &operator= (EnumMemberSeq *);
+- EnumMemberSeq_var &operator= (const EnumMemberSeq_var &);
+- EnumMemberSeq *operator-> (void);
+- const EnumMemberSeq *operator-> (void) const;
++ IR_EnumMemberSeq_var &operator= (IR_EnumMemberSeq *);
++ IR_EnumMemberSeq_var &operator= (const IR_EnumMemberSeq_var &);
++ IR_EnumMemberSeq *operator-> (void);
++ const IR_EnumMemberSeq *operator-> (void) const;
+
+- operator const EnumMemberSeq &() const;
+- operator EnumMemberSeq &();
+- operator EnumMemberSeq &() const;
+- operator EnumMemberSeq *&(); // variable-size base types only
++ operator const IR_EnumMemberSeq &() const;
++ operator IR_EnumMemberSeq &();
++ operator IR_EnumMemberSeq &() const;
++ operator IR_EnumMemberSeq *&(); // variable-size base types only
+
+ TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const EnumMemberSeq &in (void) const;
+- EnumMemberSeq &inout (void);
+- EnumMemberSeq *&out (void);
+- EnumMemberSeq *_retn (void);
+- EnumMemberSeq *ptr (void) const;
++ const IR_EnumMemberSeq &in (void) const;
++ IR_EnumMemberSeq &inout (void);
++ IR_EnumMemberSeq *&out (void);
++ IR_EnumMemberSeq *_retn (void);
++ IR_EnumMemberSeq *ptr (void) const;
+
+ private:
+- EnumMemberSeq *ptr_;
++ IR_EnumMemberSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMMEMBERSEQ___OUT_CH_)
+-#define _TAO_IR_ENUMMEMBERSEQ___OUT_CH_
+-
+-class TAO_Export EnumMemberSeq_out
++class TAO_Export IR_EnumMemberSeq_out
+ {
+ public:
+- EnumMemberSeq_out (EnumMemberSeq *&);
+- EnumMemberSeq_out (EnumMemberSeq_var &);
+- EnumMemberSeq_out (const EnumMemberSeq_out &);
+- EnumMemberSeq_out &operator= (const EnumMemberSeq_out &);
+- EnumMemberSeq_out &operator= (EnumMemberSeq *);
+- operator EnumMemberSeq *&();
+- EnumMemberSeq *&ptr (void);
+- EnumMemberSeq *operator-> (void);
++ IR_EnumMemberSeq_out (IR_EnumMemberSeq *&);
++ IR_EnumMemberSeq_out (IR_EnumMemberSeq_var &);
++ IR_EnumMemberSeq_out (const IR_EnumMemberSeq_out &);
++ IR_EnumMemberSeq_out &operator= (const IR_EnumMemberSeq_out &);
++ IR_EnumMemberSeq_out &operator= (IR_EnumMemberSeq *);
++ operator IR_EnumMemberSeq *&();
++ IR_EnumMemberSeq *&ptr (void);
++ IR_EnumMemberSeq *operator-> (void);
+ TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+ private:
+- EnumMemberSeq *&ptr_;
++ IR_EnumMemberSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const EnumMemberSeq_var &);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumMemberSeq;
+-
+-
+-#if !defined (_TAO_IR_CONTAINER___PTR_CH_)
+-#define _TAO_IR_CONTAINER___PTR_CH_
+-
+-class Container;
+-typedef Container *Container_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER___VAR_CH_)
+-#define _TAO_IR_CONTAINER___VAR_CH_
+-
+-class TAO_Export Container_var : public TAO_Base_var
+-{
+-public:
+- Container_var (void); // default constructor
+- Container_var (Container_ptr p) : ptr_ (p) {}
+- Container_var (const Container_var &); // copy constructor
+- ~Container_var (void); // destructor
+-
+- Container_var &operator= (Container_ptr);
+- Container_var &operator= (const Container_var &);
+- Container_ptr operator-> (void) const;
+-
+- operator const Container_ptr &() const;
+- operator Container_ptr &();
+- // in, inout, out, _retn
+- Container_ptr in (void) const;
+- Container_ptr &inout (void);
+- Container_ptr &out (void);
+- Container_ptr _retn (void);
+- Container_ptr ptr (void) const;
+-
+-private:
+- Container_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- Container_var (const TAO_Base_var &rhs);
+- Container_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER___OUT_CH_)
+-#define _TAO_IR_CONTAINER___OUT_CH_
+-
+-class TAO_Export Container_out
+-{
+-public:
+- Container_out (Container_ptr &);
+- Container_out (Container_var &);
+- Container_out (const Container_out &);
+- Container_out &operator= (const Container_out &);
+- Container_out &operator= (const Container_var &);
+- Container_out &operator= (Container_ptr);
+- operator Container_ptr &();
+- Container_ptr &ptr (void);
+- Container_ptr operator-> (void);
+-
+-private:
+- Container_ptr &ptr_;
++ void operator= (const IR_EnumMemberSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER_CH_)
+-#define _TAO_IR_CONTAINER_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_Container_Proxy_Impl;
+ class _TAO_Container_Remote_Proxy_Impl;
+ class _TAO_Container_Proxy_Broker;
+ class _TAO_Container_Remote_Proxy_Broker;
+
+-class TAO_Export Container: public virtual CORBA::IRObject
++class TAO_Export IR_Container: public virtual CORBA_IRObject
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef Container_ptr _ptr_type;
+- typedef Container_var _var_type;
++ typedef IR_Container_ptr _ptr_type;
++ typedef IR_Container_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static Container_ptr _duplicate (Container_ptr obj);
+- static Container_ptr _narrow (
++ static IR_Container_ptr _duplicate (IR_Container_ptr obj);
++ static IR_Container_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static Container_ptr _unchecked_narrow (
++ static IR_Container_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static Container_ptr _nil (void)
++ static IR_Container_ptr _nil (void)
+ {
+- return (Container_ptr)0;
++ return (IR_Container_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::Contained_ptr lookup (
++ virtual IR_Contained_ptr lookup (
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6079,8 +4187,8 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ContainedSeq * contents (
+- IR::DefinitionKind limit_type,
++ virtual IR_ContainedSeq * contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6089,10 +4197,10 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ContainedSeq * lookup_name (
++ virtual IR_ContainedSeq * lookup_name (
+ const char * search_name,
+ CORBA::Long levels_to_search,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6113,8 +4221,8 @@
+
+ static void _tao_any_destructor (void*);
+
+- ACE_NESTED_CLASS (IR, Contained_var) contained_object;
+- ACE_NESTED_CLASS (IR, DefinitionKind) kind;
++ IR_Contained_var contained_object;
++ IR_DefinitionKind kind;
+ CORBA::Any value;
+ };
+
+@@ -6170,9 +4278,6 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -6205,15 +4310,8 @@
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONTAINER_DESCRIPTIONSEQ_CH_)
+-#define _TAO_IR_CONTAINER_DESCRIPTIONSEQ_CH_
+-
+- class DescriptionSeq;
+ class DescriptionSeq_var;
+
+ // *************************************************************
+@@ -6246,14 +4344,8 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER_DESCRIPTIONSEQ___VAR_CH_)
+-#define _TAO_IR_CONTAINER_DESCRIPTIONSEQ___VAR_CH_
+-
+ // *************************************************************
+- // class IR::Container::DescriptionSeq_var
++ // class IR_Container::DescriptionSeq_var
+ // *************************************************************
+
+ class TAO_Export DescriptionSeq_var
+@@ -6275,8 +4367,7 @@
+ operator DescriptionSeq *&(); // variable-size base types only
+
+ Description & operator[] (CORBA::ULong index);
+- const Description & operator[] (CORBA::ULong index) const;
+-
++ const Description & operator[] (CORBA::ULong index) const;
+ // in, inout, out, _retn
+ const DescriptionSeq &in (void) const;
+ DescriptionSeq &inout (void);
+@@ -6288,13 +4379,6 @@
+ DescriptionSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER_DESCRIPTIONSEQ___OUT_CH_)
+-#define _TAO_IR_CONTAINER_DESCRIPTIONSEQ___OUT_CH_
+-
+ class TAO_Export DescriptionSeq_out
+ {
+ public:
+@@ -6314,13 +4398,10 @@
+ void operator= (const DescriptionSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+ static CORBA::TypeCode_ptr _tc_DescriptionSeq;
+
+- virtual IR::Container::DescriptionSeq * describe_contents (
+- IR::DefinitionKind limit_type,
++ virtual IR_Container::DescriptionSeq * describe_contents (
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -6330,7 +4411,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ModuleDef_ptr create_module (
++ virtual IR_ModuleDef_ptr create_module (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -6341,11 +4422,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ConstantDef_ptr create_constant (
++ virtual IR_ConstantDef_ptr create_constant (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -6354,11 +4435,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::StructDef_ptr create_struct (
++ virtual IR_StructDef_ptr create_struct (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6366,12 +4447,12 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::UnionDef_ptr create_union (
++ virtual IR_UnionDef_ptr create_union (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr discriminator_type,
+- const IR::UnionMemberSeq & members,
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6379,11 +4460,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::EnumDef_ptr create_enum (
++ virtual IR_EnumDef_ptr create_enum (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6391,11 +4472,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::AliasDef_ptr create_alias (
++ virtual IR_AliasDef_ptr create_alias (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type,
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6403,11 +4484,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::InterfaceDef_ptr create_interface (
++ virtual IR_InterfaceDef_ptr create_interface (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -6417,17 +4498,17 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDef_ptr create_value (
++ virtual IR_ValueDef_ptr create_value (
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Boolean is_custom,
+ CORBA::Boolean is_abstract,
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Boolean is_truncatable,
+- const IR::ValueDefSeq & abstract_base_values,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- const IR::InitializerSeq & initializers,
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6435,11 +4516,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueBoxDef_ptr create_value_box (
++ virtual IR_ValueBoxDef_ptr create_value_box (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6447,11 +4528,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ExceptionDef_ptr create_exception (
++ virtual IR_ExceptionDef_ptr create_exception (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -6459,7 +4540,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::NativeDef_ptr create_native (
++ virtual IR_NativeDef_ptr create_native (
+ const char * id,
+ const char * name,
+ const char * version,
+@@ -6483,804 +4564,27 @@
+ _TAO_Container_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
+
+ protected:
+- Container (int collocated = 0);
++ IR_Container (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- Container (
++ IR_Container (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+- virtual ~Container (void);
+- private:
+- Container (const Container &);
+- void operator= (const Container &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_Container_lookup : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_Container_lookup (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * search_name,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_Container_lookup (const TAO_ClientRequestInfo_IR_Container_lookup &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_lookup &);
+- const char * search_name_;
+- void result (IR::Contained_ptr result);
+- // update the result
+- IR::Contained_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_Container_contents : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_Container_contents (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::DefinitionKind & limit_type,
+- const CORBA::Boolean & exclude_inherited,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_Container_Remote_Proxy_Impl;
++ friend class _TAO_Container_ThruPOA_Proxy_Impl;
++ friend class _TAO_Container_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_Container (void);
+ private:
+- TAO_ClientRequestInfo_IR_Container_contents (const TAO_ClientRequestInfo_IR_Container_contents &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_contents &);
+- const IR::DefinitionKind & limit_type_;
+- const CORBA::Boolean & exclude_inherited_;
+- void result (IR::ContainedSeq * result);
+- // update the result
+- IR::ContainedSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_lookup_name : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_lookup_name (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * search_name,
+- const CORBA::Long & levels_to_search,
+- IR::DefinitionKind & limit_type,
+- const CORBA::Boolean & exclude_inherited,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_lookup_name (const TAO_ClientRequestInfo_IR_Container_lookup_name &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_lookup_name &);
+- const char * search_name_;
+- const CORBA::Long & levels_to_search_;
+- const IR::DefinitionKind & limit_type_;
+- const CORBA::Boolean & exclude_inherited_;
+- void result (IR::ContainedSeq * result);
+- // update the result
+- IR::ContainedSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_describe_contents : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_describe_contents (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::DefinitionKind & limit_type,
+- const CORBA::Boolean & exclude_inherited,
+- const CORBA::Long & max_returned_objs,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_describe_contents (const TAO_ClientRequestInfo_IR_Container_describe_contents &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_describe_contents &);
+- const IR::DefinitionKind & limit_type_;
+- const CORBA::Boolean & exclude_inherited_;
+- const CORBA::Long & max_returned_objs_;
+- void result (ACE_NESTED_CLASS (IR::Container,DescriptionSeq) * result);
+- // update the result
+- ACE_NESTED_CLASS (IR::Container,DescriptionSeq) * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_module : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_module (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_module (const TAO_ClientRequestInfo_IR_Container_create_module &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_module &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- void result (IR::ModuleDef_ptr result);
+- // update the result
+- IR::ModuleDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_constant : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_constant (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- const CORBA::Any & value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_constant (const TAO_ClientRequestInfo_IR_Container_create_constant &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_constant &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr type_;
+- const CORBA::Any & value_;
+- void result (IR::ConstantDef_ptr result);
+- // update the result
+- IR::ConstantDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_struct : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_struct (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::StructMemberSeq & members,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_struct (const TAO_ClientRequestInfo_IR_Container_create_struct &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_struct &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- const IR::StructMemberSeq & members_;
+- void result (IR::StructDef_ptr result);
+- // update the result
+- IR::StructDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_union : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_union (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr discriminator_type,
+- const IR::UnionMemberSeq & members,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_union (const TAO_ClientRequestInfo_IR_Container_create_union &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_union &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr discriminator_type_;
+- const IR::UnionMemberSeq & members_;
+- void result (IR::UnionDef_ptr result);
+- // update the result
+- IR::UnionDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_enum : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_enum (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::EnumMemberSeq & members,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_enum (const TAO_ClientRequestInfo_IR_Container_create_enum &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_enum &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- const IR::EnumMemberSeq & members_;
+- void result (IR::EnumDef_ptr result);
+- // update the result
+- IR::EnumDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_alias : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_alias (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr original_type,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_alias (const TAO_ClientRequestInfo_IR_Container_create_alias &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_alias &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr original_type_;
+- void result (IR::AliasDef_ptr result);
+- // update the result
+- IR::AliasDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_interface : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_interface (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::InterfaceDefSeq & base_interfaces,
+- const CORBA::Boolean & is_abstract,
+- const CORBA::Boolean & is_local,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_interface (const TAO_ClientRequestInfo_IR_Container_create_interface &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_interface &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- const IR::InterfaceDefSeq & base_interfaces_;
+- const CORBA::Boolean & is_abstract_;
+- const CORBA::Boolean & is_local_;
+- void result (IR::InterfaceDef_ptr result);
+- // update the result
+- IR::InterfaceDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_value : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_value (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const CORBA::Boolean & is_custom,
+- const CORBA::Boolean & is_abstract,
+- IR::ValueDef_ptr base_value,
+- const CORBA::Boolean & is_truncatable,
+- const IR::ValueDefSeq & abstract_base_values,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- const IR::InitializerSeq & initializers,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_value (const TAO_ClientRequestInfo_IR_Container_create_value &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_value &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- const CORBA::Boolean & is_custom_;
+- const CORBA::Boolean & is_abstract_;
+- IR::ValueDef_ptr base_value_;
+- const CORBA::Boolean & is_truncatable_;
+- const IR::ValueDefSeq & abstract_base_values_;
+- const IR::InterfaceDefSeq & supported_interfaces_;
+- const IR::InitializerSeq & initializers_;
+- void result (IR::ValueDef_ptr result);
+- // update the result
+- IR::ValueDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_value_box : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_value_box (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr original_type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_value_box (const TAO_ClientRequestInfo_IR_Container_create_value_box &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_value_box &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr original_type_def_;
+- void result (IR::ValueBoxDef_ptr result);
+- // update the result
+- IR::ValueBoxDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_exception : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_exception (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::StructMemberSeq & members,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_exception (const TAO_ClientRequestInfo_IR_Container_create_exception &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_exception &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- const IR::StructMemberSeq & members_;
+- void result (IR::ExceptionDef_ptr result);
+- // update the result
+- IR::ExceptionDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Container_create_native : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Container;
+-
+- friend class _TAO_Container_Remote_Proxy_Impl;
+- friend class _TAO_Container_ThruPOA_Proxy_Impl;
+- friend class _TAO_Container_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Container_create_native (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Container_create_native (const TAO_ClientRequestInfo_IR_Container_create_native &);
+- void operator= (const TAO_ClientRequestInfo_IR_Container_create_native &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- void result (IR::NativeDef_ptr result);
+- // update the result
+- IR::NativeDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_Container (const IR_Container &);
++ void operator= (const IR_Container &);
+ };
+
+
+@@ -7294,12 +4598,12 @@
+ //
+
+ class TAO_Export _TAO_Container_Proxy_Impl :
+- public virtual CORBA::_TAO_IRObject_Proxy_Impl
++ public virtual _TAO_IRObject_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_Container_Proxy_Impl (void) { }
+
+- virtual IR::Contained_ptr lookup (
++ virtual IR_Contained_ptr lookup (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -7308,9 +4612,9 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ContainedSeq * contents (
++ virtual IR_ContainedSeq * contents (
+ CORBA_Object *_collocated_tao_target_,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -7318,11 +4622,11 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ContainedSeq * lookup_name (
++ virtual IR_ContainedSeq * lookup_name (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Long levels_to_search,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -7330,9 +4634,9 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::Container::DescriptionSeq * describe_contents (
++ virtual IR_Container::DescriptionSeq * describe_contents (
+ CORBA_Object *_collocated_tao_target_,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -7341,7 +4645,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ModuleDef_ptr create_module (
++ virtual IR_ModuleDef_ptr create_module (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -7352,12 +4656,12 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ConstantDef_ptr create_constant (
++ virtual IR_ConstantDef_ptr create_constant (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -7365,61 +4669,61 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::StructDef_ptr create_struct (
++ virtual IR_StructDef_ptr create_struct (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::UnionDef_ptr create_union (
++ virtual IR_UnionDef_ptr create_union (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr discriminator_type,
+- const IR::UnionMemberSeq & members,
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::EnumDef_ptr create_enum (
++ virtual IR_EnumDef_ptr create_enum (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::AliasDef_ptr create_alias (
++ virtual IR_AliasDef_ptr create_alias (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type,
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::InterfaceDef_ptr create_interface (
++ virtual IR_InterfaceDef_ptr create_interface (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -7428,49 +4732,49 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ValueDef_ptr create_value (
++ virtual IR_ValueDef_ptr create_value (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Boolean is_custom,
+ CORBA::Boolean is_abstract,
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Boolean is_truncatable,
+- const IR::ValueDefSeq & abstract_base_values,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- const IR::InitializerSeq & initializers,
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ValueBoxDef_ptr create_value_box (
++ virtual IR_ValueBoxDef_ptr create_value_box (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ExceptionDef_ptr create_exception (
++ virtual IR_ExceptionDef_ptr create_exception (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::NativeDef_ptr create_native (
++ virtual IR_NativeDef_ptr create_native (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -7485,6 +4789,7 @@
+ _TAO_Container_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -7497,7 +4802,7 @@
+ class TAO_Export _TAO_Container_Remote_Proxy_Impl :
+ public virtual _TAO_Container_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual CORBA::_TAO_IRObject_Remote_Proxy_Impl
++ public virtual _TAO_IRObject_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -7505,7 +4810,7 @@
+
+ virtual ~_TAO_Container_Remote_Proxy_Impl (void) { }
+
+- virtual IR::Contained_ptr lookup (
++ virtual IR_Contained_ptr lookup (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -7514,9 +4819,9 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ContainedSeq * contents (
++ virtual IR_ContainedSeq * contents (
+ CORBA_Object *_collocated_tao_target_,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -7524,11 +4829,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ContainedSeq * lookup_name (
++ virtual IR_ContainedSeq * lookup_name (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_name,
+ CORBA::Long levels_to_search,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -7536,9 +4841,9 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::Container::DescriptionSeq * describe_contents (
++ virtual IR_Container::DescriptionSeq * describe_contents (
+ CORBA_Object *_collocated_tao_target_,
+- IR::DefinitionKind limit_type,
++ IR_DefinitionKind limit_type,
+ CORBA::Boolean exclude_inherited,
+ CORBA::Long max_returned_objs,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -7547,7 +4852,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ModuleDef_ptr create_module (
++ virtual IR_ModuleDef_ptr create_module (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -7558,12 +4863,12 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ConstantDef_ptr create_constant (
++ virtual IR_ConstantDef_ptr create_constant (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -7571,61 +4876,61 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::StructDef_ptr create_struct (
++ virtual IR_StructDef_ptr create_struct (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::UnionDef_ptr create_union (
++ virtual IR_UnionDef_ptr create_union (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr discriminator_type,
+- const IR::UnionMemberSeq & members,
++ IR_IDLType_ptr discriminator_type,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::EnumDef_ptr create_enum (
++ virtual IR_EnumDef_ptr create_enum (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::AliasDef_ptr create_alias (
++ virtual IR_AliasDef_ptr create_alias (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type,
++ IR_IDLType_ptr original_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::InterfaceDef_ptr create_interface (
++ virtual IR_InterfaceDef_ptr create_interface (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Boolean is_abstract,
+ CORBA::Boolean is_local,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -7634,49 +4939,49 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDef_ptr create_value (
++ virtual IR_ValueDef_ptr create_value (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+ CORBA::Boolean is_custom,
+ CORBA::Boolean is_abstract,
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Boolean is_truncatable,
+- const IR::ValueDefSeq & abstract_base_values,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- const IR::InitializerSeq & initializers,
++ const IR_ValueDefSeq & abstract_base_values,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueBoxDef_ptr create_value_box (
++ virtual IR_ValueBoxDef_ptr create_value_box (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ExceptionDef_ptr create_exception (
++ virtual IR_ExceptionDef_ptr create_exception (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::NativeDef_ptr create_native (
++ virtual IR_NativeDef_ptr create_native (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+@@ -7686,7 +4991,6 @@
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+-
+ };
+
+ //
+@@ -7709,8 +5013,9 @@
+ {
+ public:
+ virtual ~_TAO_Container_Proxy_Broker (void);
++
+ virtual _TAO_Container_Proxy_Impl &select_proxy (
+- Container *object,
++ IR_Container *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -7735,9 +5040,9 @@
+ _TAO_Container_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_Container_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_Container_Proxy_Impl &select_proxy (
+- Container *object,
++ IR_Container *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -7751,123 +5056,45 @@
+ static _TAO_Container_Remote_Proxy_Broker *the_TAO_Container_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Container;
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE___PTR_CH_)
+-#define _TAO_IR_IDLTYPE___PTR_CH_
+-
+-class IDLType;
+-typedef IDLType *IDLType_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE___VAR_CH_)
+-#define _TAO_IR_IDLTYPE___VAR_CH_
+-
+-class TAO_Export IDLType_var : public TAO_Base_var
+-{
+-public:
+- IDLType_var (void); // default constructor
+- IDLType_var (IDLType_ptr p) : ptr_ (p) {}
+- IDLType_var (const IDLType_var &); // copy constructor
+- ~IDLType_var (void); // destructor
+-
+- IDLType_var &operator= (IDLType_ptr);
+- IDLType_var &operator= (const IDLType_var &);
+- IDLType_ptr operator-> (void) const;
+-
+- operator const IDLType_ptr &() const;
+- operator IDLType_ptr &();
+- // in, inout, out, _retn
+- IDLType_ptr in (void) const;
+- IDLType_ptr &inout (void);
+- IDLType_ptr &out (void);
+- IDLType_ptr _retn (void);
+- IDLType_ptr ptr (void) const;
+-
+-private:
+- IDLType_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- IDLType_var (const TAO_Base_var &rhs);
+- IDLType_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE___OUT_CH_)
+-#define _TAO_IR_IDLTYPE___OUT_CH_
+-
+-class TAO_Export IDLType_out
+-{
+-public:
+- IDLType_out (IDLType_ptr &);
+- IDLType_out (IDLType_var &);
+- IDLType_out (const IDLType_out &);
+- IDLType_out &operator= (const IDLType_out &);
+- IDLType_out &operator= (const IDLType_var &);
+- IDLType_out &operator= (IDLType_ptr);
+- operator IDLType_ptr &();
+- IDLType_ptr &ptr (void);
+- IDLType_ptr operator-> (void);
+-
+-private:
+- IDLType_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE_CH_)
+-#define _TAO_IR_IDLTYPE_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_IDLType_Proxy_Impl;
+ class _TAO_IDLType_Remote_Proxy_Impl;
+ class _TAO_IDLType_Proxy_Broker;
+ class _TAO_IDLType_Remote_Proxy_Broker;
+
+-class TAO_Export IDLType: public virtual CORBA::IRObject
++class TAO_Export IR_IDLType: public virtual CORBA_IRObject
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef IDLType_ptr _ptr_type;
+- typedef IDLType_var _var_type;
++ typedef IR_IDLType_ptr _ptr_type;
++ typedef IR_IDLType_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static IDLType_ptr _duplicate (IDLType_ptr obj);
+- static IDLType_ptr _narrow (
++ static IR_IDLType_ptr _duplicate (IR_IDLType_ptr obj);
++ static IR_IDLType_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static IDLType_ptr _unchecked_narrow (
++ static IR_IDLType_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static IDLType_ptr _nil (void)
++ static IR_IDLType_ptr _nil (void)
+ {
+- return (IDLType_ptr)0;
++ return (IR_IDLType_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual CORBA::TypeCode_ptr type (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual CORBA::TypeCode_ptr type (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+@@ -7887,78 +5114,27 @@
+ _TAO_IDLType_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
+
+ protected:
+- IDLType (int collocated = 0);
++ IR_IDLType (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- IDLType (
++ IR_IDLType (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_IDLType_Remote_Proxy_Impl;
+- friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
+- friend class _TAO_IDLType_Direct_Proxy_Impl;
+-
+- virtual ~IDLType (void);
+- private:
+- IDLType (const IDLType &);
+- void operator= (const IDLType &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_IDLType_type_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::IDLType;
+-
+- friend class _TAO_IDLType_Remote_Proxy_Impl;
+- friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
+- friend class _TAO_IDLType_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_IDLType_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ );
+
+- private:
+- TAO_ClientRequestInfo_IR_IDLType_type_get (const TAO_ClientRequestInfo_IR_IDLType_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_IDLType_type_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+- };
++ friend class _TAO_IDLType_Remote_Proxy_Impl;
++ friend class _TAO_IDLType_ThruPOA_Proxy_Impl;
++ friend class _TAO_IDLType_Direct_Proxy_Impl;
+
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
++ virtual ~IR_IDLType (void);
++private:
++ IR_IDLType (const IR_IDLType &);
++ void operator= (const IR_IDLType &);
+ };
+
+
+@@ -7972,14 +5148,14 @@
+ //
+
+ class TAO_Export _TAO_IDLType_Proxy_Impl :
+- public virtual CORBA::_TAO_IRObject_Proxy_Impl
++ public virtual _TAO_IRObject_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_IDLType_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+@@ -7989,6 +5165,7 @@
+ _TAO_IDLType_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -8001,7 +5178,7 @@
+ class TAO_Export _TAO_IDLType_Remote_Proxy_Impl :
+ public virtual _TAO_IDLType_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual CORBA::_TAO_IRObject_Remote_Proxy_Impl
++ public virtual _TAO_IRObject_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -8009,9 +5186,9 @@
+
+ virtual ~_TAO_IDLType_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+@@ -8039,8 +5216,9 @@
+ {
+ public:
+ virtual ~_TAO_IDLType_Proxy_Broker (void);
++
+ virtual _TAO_IDLType_Proxy_Impl &select_proxy (
+- IDLType *object,
++ IR_IDLType *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -8065,9 +5243,9 @@
+ _TAO_IDLType_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_IDLType_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_IDLType_Proxy_Impl &select_proxy (
+- IDLType *object,
++ IR_IDLType *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -8081,426 +5259,283 @@
+ static _TAO_IDLType_Remote_Proxy_Broker *the_TAO_IDLType_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IDLType;
+-
+-class PrimitiveDef;
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___PTR_CH_)
+-#define _TAO_IR_PRIMITIVEDEF___PTR_CH_
+-
+-typedef PrimitiveDef *PrimitiveDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___VAR_CH_)
+-#define _TAO_IR_PRIMITIVEDEF___VAR_CH_
+-
+-class TAO_Export PrimitiveDef_var : public TAO_Base_var
++class TAO_Export IR_PrimitiveDef_var : public TAO_Base_var
+ {
+ public:
+- PrimitiveDef_var (void); // default constructor
+- PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {}
+- PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
+- ~PrimitiveDef_var (void); // destructor
++ IR_PrimitiveDef_var (void); // default constructor
++ IR_PrimitiveDef_var (IR_PrimitiveDef_ptr p) : ptr_ (p) {}
++ IR_PrimitiveDef_var (const IR_PrimitiveDef_var &); // copy constructor
++ ~IR_PrimitiveDef_var (void); // destructor
+
+- PrimitiveDef_var &operator= (PrimitiveDef_ptr);
+- PrimitiveDef_var &operator= (const PrimitiveDef_var &);
+- PrimitiveDef_ptr operator-> (void) const;
++ IR_PrimitiveDef_var &operator= (IR_PrimitiveDef_ptr);
++ IR_PrimitiveDef_var &operator= (const IR_PrimitiveDef_var &);
++ IR_PrimitiveDef_ptr operator-> (void) const;
+
+- operator const PrimitiveDef_ptr &() const;
+- operator PrimitiveDef_ptr &();
++ operator const IR_PrimitiveDef_ptr &() const;
++ operator IR_PrimitiveDef_ptr &();
+ // in, inout, out, _retn
+- PrimitiveDef_ptr in (void) const;
+- PrimitiveDef_ptr &inout (void);
+- PrimitiveDef_ptr &out (void);
+- PrimitiveDef_ptr _retn (void);
+- PrimitiveDef_ptr ptr (void) const;
++ IR_PrimitiveDef_ptr in (void) const;
++ IR_PrimitiveDef_ptr &inout (void);
++ IR_PrimitiveDef_ptr &out (void);
++ IR_PrimitiveDef_ptr _retn (void);
++ IR_PrimitiveDef_ptr ptr (void) const;
+
+ private:
+- PrimitiveDef_ptr ptr_;
++ IR_PrimitiveDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- PrimitiveDef_var (const TAO_Base_var &rhs);
+- PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
++ IR_PrimitiveDef_var (const TAO_Base_var &rhs);
++ IR_PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___OUT_CH_)
+-#define _TAO_IR_PRIMITIVEDEF___OUT_CH_
+-
+-class TAO_Export PrimitiveDef_out
++class TAO_Export IR_PrimitiveDef_out
+ {
+ public:
+- PrimitiveDef_out (PrimitiveDef_ptr &);
+- PrimitiveDef_out (PrimitiveDef_var &);
+- PrimitiveDef_out (const PrimitiveDef_out &);
+- PrimitiveDef_out &operator= (const PrimitiveDef_out &);
+- PrimitiveDef_out &operator= (const PrimitiveDef_var &);
+- PrimitiveDef_out &operator= (PrimitiveDef_ptr);
+- operator PrimitiveDef_ptr &();
+- PrimitiveDef_ptr &ptr (void);
+- PrimitiveDef_ptr operator-> (void);
++ IR_PrimitiveDef_out (IR_PrimitiveDef_ptr &);
++ IR_PrimitiveDef_out (IR_PrimitiveDef_var &);
++ IR_PrimitiveDef_out (const IR_PrimitiveDef_out &);
++ IR_PrimitiveDef_out &operator= (const IR_PrimitiveDef_out &);
++ IR_PrimitiveDef_out &operator= (const IR_PrimitiveDef_var &);
++ IR_PrimitiveDef_out &operator= (IR_PrimitiveDef_ptr);
++ operator IR_PrimitiveDef_ptr &();
++ IR_PrimitiveDef_ptr &ptr (void);
++ IR_PrimitiveDef_ptr operator-> (void);
+
+ private:
+- PrimitiveDef_ptr &ptr_;
++ IR_PrimitiveDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class StringDef;
+-
+-#if !defined (_TAO_IR_STRINGDEF___PTR_CH_)
+-#define _TAO_IR_STRINGDEF___PTR_CH_
+-
+-typedef StringDef *StringDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF___VAR_CH_)
+-#define _TAO_IR_STRINGDEF___VAR_CH_
+-
+-class TAO_Export StringDef_var : public TAO_Base_var
++class TAO_Export IR_StringDef_var : public TAO_Base_var
+ {
+ public:
+- StringDef_var (void); // default constructor
+- StringDef_var (StringDef_ptr p) : ptr_ (p) {}
+- StringDef_var (const StringDef_var &); // copy constructor
+- ~StringDef_var (void); // destructor
++ IR_StringDef_var (void); // default constructor
++ IR_StringDef_var (IR_StringDef_ptr p) : ptr_ (p) {}
++ IR_StringDef_var (const IR_StringDef_var &); // copy constructor
++ ~IR_StringDef_var (void); // destructor
+
+- StringDef_var &operator= (StringDef_ptr);
+- StringDef_var &operator= (const StringDef_var &);
+- StringDef_ptr operator-> (void) const;
++ IR_StringDef_var &operator= (IR_StringDef_ptr);
++ IR_StringDef_var &operator= (const IR_StringDef_var &);
++ IR_StringDef_ptr operator-> (void) const;
+
+- operator const StringDef_ptr &() const;
+- operator StringDef_ptr &();
++ operator const IR_StringDef_ptr &() const;
++ operator IR_StringDef_ptr &();
+ // in, inout, out, _retn
+- StringDef_ptr in (void) const;
+- StringDef_ptr &inout (void);
+- StringDef_ptr &out (void);
+- StringDef_ptr _retn (void);
+- StringDef_ptr ptr (void) const;
++ IR_StringDef_ptr in (void) const;
++ IR_StringDef_ptr &inout (void);
++ IR_StringDef_ptr &out (void);
++ IR_StringDef_ptr _retn (void);
++ IR_StringDef_ptr ptr (void) const;
+
+ private:
+- StringDef_ptr ptr_;
++ IR_StringDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- StringDef_var (const TAO_Base_var &rhs);
+- StringDef_var &operator= (const TAO_Base_var &rhs);
++ IR_StringDef_var (const TAO_Base_var &rhs);
++ IR_StringDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF___OUT_CH_)
+-#define _TAO_IR_STRINGDEF___OUT_CH_
+-
+-class TAO_Export StringDef_out
++class TAO_Export IR_StringDef_out
+ {
+ public:
+- StringDef_out (StringDef_ptr &);
+- StringDef_out (StringDef_var &);
+- StringDef_out (const StringDef_out &);
+- StringDef_out &operator= (const StringDef_out &);
+- StringDef_out &operator= (const StringDef_var &);
+- StringDef_out &operator= (StringDef_ptr);
+- operator StringDef_ptr &();
+- StringDef_ptr &ptr (void);
+- StringDef_ptr operator-> (void);
++ IR_StringDef_out (IR_StringDef_ptr &);
++ IR_StringDef_out (IR_StringDef_var &);
++ IR_StringDef_out (const IR_StringDef_out &);
++ IR_StringDef_out &operator= (const IR_StringDef_out &);
++ IR_StringDef_out &operator= (const IR_StringDef_var &);
++ IR_StringDef_out &operator= (IR_StringDef_ptr);
++ operator IR_StringDef_ptr &();
++ IR_StringDef_ptr &ptr (void);
++ IR_StringDef_ptr operator-> (void);
+
+ private:
+- StringDef_ptr &ptr_;
++ IR_StringDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class SequenceDef;
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___PTR_CH_)
+-#define _TAO_IR_SEQUENCEDEF___PTR_CH_
+-
+-typedef SequenceDef *SequenceDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___VAR_CH_)
+-#define _TAO_IR_SEQUENCEDEF___VAR_CH_
+-
+-class TAO_Export SequenceDef_var : public TAO_Base_var
++class TAO_Export IR_SequenceDef_var : public TAO_Base_var
+ {
+ public:
+- SequenceDef_var (void); // default constructor
+- SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {}
+- SequenceDef_var (const SequenceDef_var &); // copy constructor
+- ~SequenceDef_var (void); // destructor
++ IR_SequenceDef_var (void); // default constructor
++ IR_SequenceDef_var (IR_SequenceDef_ptr p) : ptr_ (p) {}
++ IR_SequenceDef_var (const IR_SequenceDef_var &); // copy constructor
++ ~IR_SequenceDef_var (void); // destructor
+
+- SequenceDef_var &operator= (SequenceDef_ptr);
+- SequenceDef_var &operator= (const SequenceDef_var &);
+- SequenceDef_ptr operator-> (void) const;
++ IR_SequenceDef_var &operator= (IR_SequenceDef_ptr);
++ IR_SequenceDef_var &operator= (const IR_SequenceDef_var &);
++ IR_SequenceDef_ptr operator-> (void) const;
+
+- operator const SequenceDef_ptr &() const;
+- operator SequenceDef_ptr &();
++ operator const IR_SequenceDef_ptr &() const;
++ operator IR_SequenceDef_ptr &();
+ // in, inout, out, _retn
+- SequenceDef_ptr in (void) const;
+- SequenceDef_ptr &inout (void);
+- SequenceDef_ptr &out (void);
+- SequenceDef_ptr _retn (void);
+- SequenceDef_ptr ptr (void) const;
++ IR_SequenceDef_ptr in (void) const;
++ IR_SequenceDef_ptr &inout (void);
++ IR_SequenceDef_ptr &out (void);
++ IR_SequenceDef_ptr _retn (void);
++ IR_SequenceDef_ptr ptr (void) const;
+
+ private:
+- SequenceDef_ptr ptr_;
++ IR_SequenceDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- SequenceDef_var (const TAO_Base_var &rhs);
+- SequenceDef_var &operator= (const TAO_Base_var &rhs);
++ IR_SequenceDef_var (const TAO_Base_var &rhs);
++ IR_SequenceDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___OUT_CH_)
+-#define _TAO_IR_SEQUENCEDEF___OUT_CH_
+-
+-class TAO_Export SequenceDef_out
++class TAO_Export IR_SequenceDef_out
+ {
+ public:
+- SequenceDef_out (SequenceDef_ptr &);
+- SequenceDef_out (SequenceDef_var &);
+- SequenceDef_out (const SequenceDef_out &);
+- SequenceDef_out &operator= (const SequenceDef_out &);
+- SequenceDef_out &operator= (const SequenceDef_var &);
+- SequenceDef_out &operator= (SequenceDef_ptr);
+- operator SequenceDef_ptr &();
+- SequenceDef_ptr &ptr (void);
+- SequenceDef_ptr operator-> (void);
++ IR_SequenceDef_out (IR_SequenceDef_ptr &);
++ IR_SequenceDef_out (IR_SequenceDef_var &);
++ IR_SequenceDef_out (const IR_SequenceDef_out &);
++ IR_SequenceDef_out &operator= (const IR_SequenceDef_out &);
++ IR_SequenceDef_out &operator= (const IR_SequenceDef_var &);
++ IR_SequenceDef_out &operator= (IR_SequenceDef_ptr);
++ operator IR_SequenceDef_ptr &();
++ IR_SequenceDef_ptr &ptr (void);
++ IR_SequenceDef_ptr operator-> (void);
+
+ private:
+- SequenceDef_ptr &ptr_;
++ IR_SequenceDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class ArrayDef;
+-
+-#if !defined (_TAO_IR_ARRAYDEF___PTR_CH_)
+-#define _TAO_IR_ARRAYDEF___PTR_CH_
+-
+-typedef ArrayDef *ArrayDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF___VAR_CH_)
+-#define _TAO_IR_ARRAYDEF___VAR_CH_
+-
+-class TAO_Export ArrayDef_var : public TAO_Base_var
++class TAO_Export IR_ArrayDef_var : public TAO_Base_var
+ {
+ public:
+- ArrayDef_var (void); // default constructor
+- ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {}
+- ArrayDef_var (const ArrayDef_var &); // copy constructor
+- ~ArrayDef_var (void); // destructor
++ IR_ArrayDef_var (void); // default constructor
++ IR_ArrayDef_var (IR_ArrayDef_ptr p) : ptr_ (p) {}
++ IR_ArrayDef_var (const IR_ArrayDef_var &); // copy constructor
++ ~IR_ArrayDef_var (void); // destructor
+
+- ArrayDef_var &operator= (ArrayDef_ptr);
+- ArrayDef_var &operator= (const ArrayDef_var &);
+- ArrayDef_ptr operator-> (void) const;
++ IR_ArrayDef_var &operator= (IR_ArrayDef_ptr);
++ IR_ArrayDef_var &operator= (const IR_ArrayDef_var &);
++ IR_ArrayDef_ptr operator-> (void) const;
+
+- operator const ArrayDef_ptr &() const;
+- operator ArrayDef_ptr &();
++ operator const IR_ArrayDef_ptr &() const;
++ operator IR_ArrayDef_ptr &();
+ // in, inout, out, _retn
+- ArrayDef_ptr in (void) const;
+- ArrayDef_ptr &inout (void);
+- ArrayDef_ptr &out (void);
+- ArrayDef_ptr _retn (void);
+- ArrayDef_ptr ptr (void) const;
++ IR_ArrayDef_ptr in (void) const;
++ IR_ArrayDef_ptr &inout (void);
++ IR_ArrayDef_ptr &out (void);
++ IR_ArrayDef_ptr _retn (void);
++ IR_ArrayDef_ptr ptr (void) const;
+
+ private:
+- ArrayDef_ptr ptr_;
++ IR_ArrayDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ArrayDef_var (const TAO_Base_var &rhs);
+- ArrayDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ArrayDef_var (const TAO_Base_var &rhs);
++ IR_ArrayDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF___OUT_CH_)
+-#define _TAO_IR_ARRAYDEF___OUT_CH_
+-
+-class TAO_Export ArrayDef_out
++class TAO_Export IR_ArrayDef_out
+ {
+ public:
+- ArrayDef_out (ArrayDef_ptr &);
+- ArrayDef_out (ArrayDef_var &);
+- ArrayDef_out (const ArrayDef_out &);
+- ArrayDef_out &operator= (const ArrayDef_out &);
+- ArrayDef_out &operator= (const ArrayDef_var &);
+- ArrayDef_out &operator= (ArrayDef_ptr);
+- operator ArrayDef_ptr &();
+- ArrayDef_ptr &ptr (void);
+- ArrayDef_ptr operator-> (void);
++ IR_ArrayDef_out (IR_ArrayDef_ptr &);
++ IR_ArrayDef_out (IR_ArrayDef_var &);
++ IR_ArrayDef_out (const IR_ArrayDef_out &);
++ IR_ArrayDef_out &operator= (const IR_ArrayDef_out &);
++ IR_ArrayDef_out &operator= (const IR_ArrayDef_var &);
++ IR_ArrayDef_out &operator= (IR_ArrayDef_ptr);
++ operator IR_ArrayDef_ptr &();
++ IR_ArrayDef_ptr &ptr (void);
++ IR_ArrayDef_ptr operator-> (void);
+
+ private:
+- ArrayDef_ptr &ptr_;
++ IR_ArrayDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class WstringDef;
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___PTR_CH_)
+-#define _TAO_IR_WSTRINGDEF___PTR_CH_
+-
+-typedef WstringDef *WstringDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___VAR_CH_)
+-#define _TAO_IR_WSTRINGDEF___VAR_CH_
+-
+-class TAO_Export WstringDef_var : public TAO_Base_var
++class TAO_Export IR_WstringDef_var : public TAO_Base_var
+ {
+ public:
+- WstringDef_var (void); // default constructor
+- WstringDef_var (WstringDef_ptr p) : ptr_ (p) {}
+- WstringDef_var (const WstringDef_var &); // copy constructor
+- ~WstringDef_var (void); // destructor
++ IR_WstringDef_var (void); // default constructor
++ IR_WstringDef_var (IR_WstringDef_ptr p) : ptr_ (p) {}
++ IR_WstringDef_var (const IR_WstringDef_var &); // copy constructor
++ ~IR_WstringDef_var (void); // destructor
+
+- WstringDef_var &operator= (WstringDef_ptr);
+- WstringDef_var &operator= (const WstringDef_var &);
+- WstringDef_ptr operator-> (void) const;
++ IR_WstringDef_var &operator= (IR_WstringDef_ptr);
++ IR_WstringDef_var &operator= (const IR_WstringDef_var &);
++ IR_WstringDef_ptr operator-> (void) const;
+
+- operator const WstringDef_ptr &() const;
+- operator WstringDef_ptr &();
++ operator const IR_WstringDef_ptr &() const;
++ operator IR_WstringDef_ptr &();
+ // in, inout, out, _retn
+- WstringDef_ptr in (void) const;
+- WstringDef_ptr &inout (void);
+- WstringDef_ptr &out (void);
+- WstringDef_ptr _retn (void);
+- WstringDef_ptr ptr (void) const;
++ IR_WstringDef_ptr in (void) const;
++ IR_WstringDef_ptr &inout (void);
++ IR_WstringDef_ptr &out (void);
++ IR_WstringDef_ptr _retn (void);
++ IR_WstringDef_ptr ptr (void) const;
+
+ private:
+- WstringDef_ptr ptr_;
++ IR_WstringDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- WstringDef_var (const TAO_Base_var &rhs);
+- WstringDef_var &operator= (const TAO_Base_var &rhs);
++ IR_WstringDef_var (const TAO_Base_var &rhs);
++ IR_WstringDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___OUT_CH_)
+-#define _TAO_IR_WSTRINGDEF___OUT_CH_
+-
+-class TAO_Export WstringDef_out
++class TAO_Export IR_WstringDef_out
+ {
+ public:
+- WstringDef_out (WstringDef_ptr &);
+- WstringDef_out (WstringDef_var &);
+- WstringDef_out (const WstringDef_out &);
+- WstringDef_out &operator= (const WstringDef_out &);
+- WstringDef_out &operator= (const WstringDef_var &);
+- WstringDef_out &operator= (WstringDef_ptr);
+- operator WstringDef_ptr &();
+- WstringDef_ptr &ptr (void);
+- WstringDef_ptr operator-> (void);
++ IR_WstringDef_out (IR_WstringDef_ptr &);
++ IR_WstringDef_out (IR_WstringDef_var &);
++ IR_WstringDef_out (const IR_WstringDef_out &);
++ IR_WstringDef_out &operator= (const IR_WstringDef_out &);
++ IR_WstringDef_out &operator= (const IR_WstringDef_var &);
++ IR_WstringDef_out &operator= (IR_WstringDef_ptr);
++ operator IR_WstringDef_ptr &();
++ IR_WstringDef_ptr &ptr (void);
++ IR_WstringDef_ptr operator-> (void);
+
+ private:
+- WstringDef_ptr &ptr_;
++ IR_WstringDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-class FixedDef;
+-
+-#if !defined (_TAO_IR_FIXEDDEF___PTR_CH_)
+-#define _TAO_IR_FIXEDDEF___PTR_CH_
+-
+-typedef FixedDef *FixedDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF___VAR_CH_)
+-#define _TAO_IR_FIXEDDEF___VAR_CH_
+-
+-class TAO_Export FixedDef_var : public TAO_Base_var
++class TAO_Export IR_FixedDef_var : public TAO_Base_var
+ {
+ public:
+- FixedDef_var (void); // default constructor
+- FixedDef_var (FixedDef_ptr p) : ptr_ (p) {}
+- FixedDef_var (const FixedDef_var &); // copy constructor
+- ~FixedDef_var (void); // destructor
++ IR_FixedDef_var (void); // default constructor
++ IR_FixedDef_var (IR_FixedDef_ptr p) : ptr_ (p) {}
++ IR_FixedDef_var (const IR_FixedDef_var &); // copy constructor
++ ~IR_FixedDef_var (void); // destructor
+
+- FixedDef_var &operator= (FixedDef_ptr);
+- FixedDef_var &operator= (const FixedDef_var &);
+- FixedDef_ptr operator-> (void) const;
++ IR_FixedDef_var &operator= (IR_FixedDef_ptr);
++ IR_FixedDef_var &operator= (const IR_FixedDef_var &);
++ IR_FixedDef_ptr operator-> (void) const;
+
+- operator const FixedDef_ptr &() const;
+- operator FixedDef_ptr &();
++ operator const IR_FixedDef_ptr &() const;
++ operator IR_FixedDef_ptr &();
+ // in, inout, out, _retn
+- FixedDef_ptr in (void) const;
+- FixedDef_ptr &inout (void);
+- FixedDef_ptr &out (void);
+- FixedDef_ptr _retn (void);
+- FixedDef_ptr ptr (void) const;
++ IR_FixedDef_ptr in (void) const;
++ IR_FixedDef_ptr &inout (void);
++ IR_FixedDef_ptr &out (void);
++ IR_FixedDef_ptr _retn (void);
++ IR_FixedDef_ptr ptr (void) const;
+
+ private:
+- FixedDef_ptr ptr_;
++ IR_FixedDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- FixedDef_var (const TAO_Base_var &rhs);
+- FixedDef_var &operator= (const TAO_Base_var &rhs);
++ IR_FixedDef_var (const TAO_Base_var &rhs);
++ IR_FixedDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF___OUT_CH_)
+-#define _TAO_IR_FIXEDDEF___OUT_CH_
+-
+-class TAO_Export FixedDef_out
++class TAO_Export IR_FixedDef_out
+ {
+ public:
+- FixedDef_out (FixedDef_ptr &);
+- FixedDef_out (FixedDef_var &);
+- FixedDef_out (const FixedDef_out &);
+- FixedDef_out &operator= (const FixedDef_out &);
+- FixedDef_out &operator= (const FixedDef_var &);
+- FixedDef_out &operator= (FixedDef_ptr);
+- operator FixedDef_ptr &();
+- FixedDef_ptr &ptr (void);
+- FixedDef_ptr operator-> (void);
++ IR_FixedDef_out (IR_FixedDef_ptr &);
++ IR_FixedDef_out (IR_FixedDef_var &);
++ IR_FixedDef_out (const IR_FixedDef_out &);
++ IR_FixedDef_out &operator= (const IR_FixedDef_out &);
++ IR_FixedDef_out &operator= (const IR_FixedDef_var &);
++ IR_FixedDef_out &operator= (IR_FixedDef_ptr);
++ operator IR_FixedDef_ptr &();
++ IR_FixedDef_ptr &ptr (void);
++ IR_FixedDef_ptr operator-> (void);
+
+ private:
+- FixedDef_ptr &ptr_;
++ IR_FixedDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-enum PrimitiveKind
+-{
++enum IR_PrimitiveKind
++ {
+ pk_null,
+ pk_void,
+ pk_short,
+@@ -8522,82 +5557,8 @@
+ pk_longdouble,
+ pk_wchar,
+ pk_wstring,
+- pk_value_base
+-};
+-typedef PrimitiveKind &PrimitiveKind_out;
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveKind;
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY___PTR_CH_)
+-#define _TAO_IR_REPOSITORY___PTR_CH_
+-
+-class Repository;
+-typedef Repository *Repository_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY___VAR_CH_)
+-#define _TAO_IR_REPOSITORY___VAR_CH_
+-
+-class TAO_Export Repository_var : public TAO_Base_var
+-{
+-public:
+- Repository_var (void); // default constructor
+- Repository_var (Repository_ptr p) : ptr_ (p) {}
+- Repository_var (const Repository_var &); // copy constructor
+- ~Repository_var (void); // destructor
+-
+- Repository_var &operator= (Repository_ptr);
+- Repository_var &operator= (const Repository_var &);
+- Repository_ptr operator-> (void) const;
+-
+- operator const Repository_ptr &() const;
+- operator Repository_ptr &();
+- // in, inout, out, _retn
+- Repository_ptr in (void) const;
+- Repository_ptr &inout (void);
+- Repository_ptr &out (void);
+- Repository_ptr _retn (void);
+- Repository_ptr ptr (void) const;
+-
+-private:
+- Repository_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- Repository_var (const TAO_Base_var &rhs);
+- Repository_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY___OUT_CH_)
+-#define _TAO_IR_REPOSITORY___OUT_CH_
+-
+-class TAO_Export Repository_out
+-{
+-public:
+- Repository_out (Repository_ptr &);
+- Repository_out (Repository_var &);
+- Repository_out (const Repository_out &);
+- Repository_out &operator= (const Repository_out &);
+- Repository_out &operator= (const Repository_var &);
+- Repository_out &operator= (Repository_ptr);
+- operator Repository_ptr &();
+- Repository_ptr &ptr (void);
+- Repository_ptr operator-> (void);
+-
+-private:
+- Repository_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY_CH_)
+-#define _TAO_IR_REPOSITORY_CH_
++ pk_value_base
++ };
+
+ // Forward Classes Declaration
+ class _TAO_Repository_Proxy_Impl;
+@@ -8605,34 +5566,34 @@
+ class _TAO_Repository_Proxy_Broker;
+ class _TAO_Repository_Remote_Proxy_Broker;
+
+-class TAO_Export Repository: public virtual Container
++class TAO_Export IR_Repository: public virtual IR_Container
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef Repository_ptr _ptr_type;
+- typedef Repository_var _var_type;
++ typedef IR_Repository_ptr _ptr_type;
++ typedef IR_Repository_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static Repository_ptr _duplicate (Repository_ptr obj);
+- static Repository_ptr _narrow (
++ static IR_Repository_ptr _duplicate (IR_Repository_ptr obj);
++ static IR_Repository_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static Repository_ptr _unchecked_narrow (
++ static IR_Repository_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static Repository_ptr _nil (void)
++ static IR_Repository_ptr _nil (void)
+ {
+- return (Repository_ptr)0;
++ return (IR_Repository_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::Contained_ptr lookup_id (
++ virtual IR_Contained_ptr lookup_id (
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -8650,8 +5611,8 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::PrimitiveDef_ptr get_primitive (
+- IR::PrimitiveKind kind,
++ virtual IR_PrimitiveDef_ptr get_primitive (
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8659,7 +5620,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::StringDef_ptr create_string (
++ virtual IR_StringDef_ptr create_string (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -8668,7 +5629,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::WstringDef_ptr create_wstring (
++ virtual IR_WstringDef_ptr create_wstring (
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -8677,9 +5638,9 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::SequenceDef_ptr create_sequence (
++ virtual IR_SequenceDef_ptr create_sequence (
+ CORBA::ULong bound,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8687,9 +5648,9 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ArrayDef_ptr create_array (
++ virtual IR_ArrayDef_ptr create_array (
+ CORBA::ULong length,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -8697,7 +5658,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::FixedDef_ptr create_fixed (
++ virtual IR_FixedDef_ptr create_fixed (
+ CORBA::UShort digits,
+ CORBA::Short scale,
+ CORBA::Environment &ACE_TRY_ENV =
+@@ -8720,401 +5681,27 @@
+ _TAO_Repository_Proxy_Broker *the_TAO_Repository_Proxy_Broker_;
+
+ protected:
+- Repository (int collocated = 0);
++ IR_Repository (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- Repository (
++ IR_Repository (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_Repository_Remote_Proxy_Impl;
+- friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+- friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+- virtual ~Repository (void);
+- private:
+- Repository (const Repository &);
+- void operator= (const Repository &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_Repository_lookup_id : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::Repository;
+-
+- friend class _TAO_Repository_Remote_Proxy_Impl;
+- friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+- friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_Repository_lookup_id (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * search_id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_Repository_lookup_id (const TAO_ClientRequestInfo_IR_Repository_lookup_id &);
+- void operator= (const TAO_ClientRequestInfo_IR_Repository_lookup_id &);
+- const char * search_id_;
+- void result (IR::Contained_ptr result);
+- // update the result
+- IR::Contained_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::Repository;
+-
+- friend class _TAO_Repository_Remote_Proxy_Impl;
+- friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+- friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::TypeCode_ptr tc,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode (const TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode &);
+- void operator= (const TAO_ClientRequestInfo_IR_Repository_get_canonical_typecode &);
+- CORBA::TypeCode_ptr tc_;
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Repository_get_primitive : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Repository;
+-
+- friend class _TAO_Repository_Remote_Proxy_Impl;
+- friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+- friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Repository_get_primitive (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::PrimitiveKind & kind,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Repository_get_primitive (const TAO_ClientRequestInfo_IR_Repository_get_primitive &);
+- void operator= (const TAO_ClientRequestInfo_IR_Repository_get_primitive &);
+- const IR::PrimitiveKind & kind_;
+- void result (IR::PrimitiveDef_ptr result);
+- // update the result
+- IR::PrimitiveDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Repository_create_string : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Repository;
+-
+- friend class _TAO_Repository_Remote_Proxy_Impl;
+- friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+- friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Repository_create_string (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Repository_create_string (const TAO_ClientRequestInfo_IR_Repository_create_string &);
+- void operator= (const TAO_ClientRequestInfo_IR_Repository_create_string &);
+- const CORBA::ULong & bound_;
+- void result (IR::StringDef_ptr result);
+- // update the result
+- IR::StringDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Repository_create_wstring : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Repository;
+-
+- friend class _TAO_Repository_Remote_Proxy_Impl;
+- friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+- friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Repository_create_wstring (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Repository_create_wstring (const TAO_ClientRequestInfo_IR_Repository_create_wstring &);
+- void operator= (const TAO_ClientRequestInfo_IR_Repository_create_wstring &);
+- const CORBA::ULong & bound_;
+- void result (IR::WstringDef_ptr result);
+- // update the result
+- IR::WstringDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Repository_create_sequence : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Repository;
+-
+- friend class _TAO_Repository_Remote_Proxy_Impl;
+- friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+- friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Repository_create_sequence (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- IR::IDLType_ptr element_type,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Repository_create_sequence (const TAO_ClientRequestInfo_IR_Repository_create_sequence &);
+- void operator= (const TAO_ClientRequestInfo_IR_Repository_create_sequence &);
+- const CORBA::ULong & bound_;
+- IR::IDLType_ptr element_type_;
+- void result (IR::SequenceDef_ptr result);
+- // update the result
+- IR::SequenceDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Repository_create_array : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Repository;
+-
++
+ friend class _TAO_Repository_Remote_Proxy_Impl;
+ friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+ friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Repository_create_array (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & length,
+- IR::IDLType_ptr element_type,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Repository_create_array (const TAO_ClientRequestInfo_IR_Repository_create_array &);
+- void operator= (const TAO_ClientRequestInfo_IR_Repository_create_array &);
+- const CORBA::ULong & length_;
+- IR::IDLType_ptr element_type_;
+- void result (IR::ArrayDef_ptr result);
+- // update the result
+- IR::ArrayDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_Repository_create_fixed : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::Repository;
+
+- friend class _TAO_Repository_Remote_Proxy_Impl;
+- friend class _TAO_Repository_ThruPOA_Proxy_Impl;
+- friend class _TAO_Repository_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_Repository_create_fixed (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::UShort & digits,
+- const CORBA::Short & scale,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_Repository_create_fixed (const TAO_ClientRequestInfo_IR_Repository_create_fixed &);
+- void operator= (const TAO_ClientRequestInfo_IR_Repository_create_fixed &);
+- const CORBA::UShort & digits_;
+- const CORBA::Short & scale_;
+- void result (IR::FixedDef_ptr result);
+- // update the result
+- IR::FixedDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ virtual ~IR_Repository (void);
++private:
++ IR_Repository (const IR_Repository &);
++ void operator= (const IR_Repository &);
+ };
+
+
+@@ -9128,12 +5715,12 @@
+ //
+
+ class TAO_Export _TAO_Repository_Proxy_Impl :
+- public virtual IR::_TAO_Container_Proxy_Impl
++ public virtual _TAO_Container_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_Repository_Proxy_Impl (void) { }
+
+- virtual IR::Contained_ptr lookup_id (
++ virtual IR_Contained_ptr lookup_id (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -9151,16 +5738,16 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::PrimitiveDef_ptr get_primitive (
++ virtual IR_PrimitiveDef_ptr get_primitive (
+ CORBA_Object *_collocated_tao_target_,
+- IR::PrimitiveKind kind,
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::StringDef_ptr create_string (
++ virtual IR_StringDef_ptr create_string (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -9169,7 +5756,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::WstringDef_ptr create_wstring (
++ virtual IR_WstringDef_ptr create_wstring (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -9178,27 +5765,27 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::SequenceDef_ptr create_sequence (
++ virtual IR_SequenceDef_ptr create_sequence (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ArrayDef_ptr create_array (
++ virtual IR_ArrayDef_ptr create_array (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong length,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::FixedDef_ptr create_fixed (
++ virtual IR_FixedDef_ptr create_fixed (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::UShort digits,
+ CORBA::Short scale,
+@@ -9212,6 +5799,7 @@
+ _TAO_Repository_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -9224,7 +5812,7 @@
+ class TAO_Export _TAO_Repository_Remote_Proxy_Impl :
+ public virtual _TAO_Repository_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Container_Remote_Proxy_Impl
++ public virtual _TAO_Container_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -9232,7 +5820,7 @@
+
+ virtual ~_TAO_Repository_Remote_Proxy_Impl (void) { }
+
+- virtual IR::Contained_ptr lookup_id (
++ virtual IR_Contained_ptr lookup_id (
+ CORBA_Object *_collocated_tao_target_,
+ const char * search_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -9250,16 +5838,16 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::PrimitiveDef_ptr get_primitive (
++ virtual IR_PrimitiveDef_ptr get_primitive (
+ CORBA_Object *_collocated_tao_target_,
+- IR::PrimitiveKind kind,
++ IR_PrimitiveKind kind,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::StringDef_ptr create_string (
++ virtual IR_StringDef_ptr create_string (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -9268,7 +5856,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::WstringDef_ptr create_wstring (
++ virtual IR_WstringDef_ptr create_wstring (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -9277,27 +5865,27 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::SequenceDef_ptr create_sequence (
++ virtual IR_SequenceDef_ptr create_sequence (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong bound,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ArrayDef_ptr create_array (
++ virtual IR_ArrayDef_ptr create_array (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::ULong length,
+- IR::IDLType_ptr element_type,
++ IR_IDLType_ptr element_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::FixedDef_ptr create_fixed (
++ virtual IR_FixedDef_ptr create_fixed (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::UShort digits,
+ CORBA::Short scale,
+@@ -9329,8 +5917,9 @@
+ {
+ public:
+ virtual ~_TAO_Repository_Proxy_Broker (void);
++
+ virtual _TAO_Repository_Proxy_Impl &select_proxy (
+- Repository *object,
++ IR_Repository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -9355,9 +5944,9 @@
+ _TAO_Repository_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_Repository_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_Repository_Proxy_Impl &select_proxy (
+- Repository *object,
++ IR_Repository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -9371,127 +5960,94 @@
+ static _TAO_Repository_Remote_Proxy_Broker *the_TAO_Repository_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Repository;
+-
+-
+-#if !defined (_TAO_IR_COMPONENTREPOSITORY___PTR_CH_)
+-#define _TAO_IR_COMPONENTREPOSITORY___PTR_CH_
+-
+-class ComponentRepository;
+-typedef ComponentRepository *ComponentRepository_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTREPOSITORY___VAR_CH_)
+-#define _TAO_IR_COMPONENTREPOSITORY___VAR_CH_
+-
+-class TAO_Export ComponentRepository_var : public TAO_Base_var
++class TAO_Export IR_ComponentRepository_var : public TAO_Base_var
+ {
+ public:
+- ComponentRepository_var (void); // default constructor
+- ComponentRepository_var (ComponentRepository_ptr p) : ptr_ (p) {}
+- ComponentRepository_var (const ComponentRepository_var &); // copy constructor
+- ~ComponentRepository_var (void); // destructor
++ IR_ComponentRepository_var (void); // default constructor
++ IR_ComponentRepository_var (IR_ComponentRepository_ptr p) : ptr_ (p) {}
++ IR_ComponentRepository_var (const IR_ComponentRepository_var &); // copy constructor
++ ~IR_ComponentRepository_var (void); // destructor
+
+- ComponentRepository_var &operator= (ComponentRepository_ptr);
+- ComponentRepository_var &operator= (const ComponentRepository_var &);
+- ComponentRepository_ptr operator-> (void) const;
++ IR_ComponentRepository_var &operator= (IR_ComponentRepository_ptr);
++ IR_ComponentRepository_var &operator= (const IR_ComponentRepository_var &);
++ IR_ComponentRepository_ptr operator-> (void) const;
+
+- operator const ComponentRepository_ptr &() const;
+- operator ComponentRepository_ptr &();
++ operator const IR_ComponentRepository_ptr &() const;
++ operator IR_ComponentRepository_ptr &();
+ // in, inout, out, _retn
+- ComponentRepository_ptr in (void) const;
+- ComponentRepository_ptr &inout (void);
+- ComponentRepository_ptr &out (void);
+- ComponentRepository_ptr _retn (void);
+- ComponentRepository_ptr ptr (void) const;
++ IR_ComponentRepository_ptr in (void) const;
++ IR_ComponentRepository_ptr &inout (void);
++ IR_ComponentRepository_ptr &out (void);
++ IR_ComponentRepository_ptr _retn (void);
++ IR_ComponentRepository_ptr ptr (void) const;
+
+ private:
+- ComponentRepository_ptr ptr_;
++ IR_ComponentRepository_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ComponentRepository_var (const TAO_Base_var &rhs);
+- ComponentRepository_var &operator= (const TAO_Base_var &rhs);
++ IR_ComponentRepository_var (const TAO_Base_var &rhs);
++ IR_ComponentRepository_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTREPOSITORY___OUT_CH_)
+-#define _TAO_IR_COMPONENTREPOSITORY___OUT_CH_
+-
+-class TAO_Export ComponentRepository_out
++class TAO_Export IR_ComponentRepository_out
+ {
+ public:
+- ComponentRepository_out (ComponentRepository_ptr &);
+- ComponentRepository_out (ComponentRepository_var &);
+- ComponentRepository_out (const ComponentRepository_out &);
+- ComponentRepository_out &operator= (const ComponentRepository_out &);
+- ComponentRepository_out &operator= (const ComponentRepository_var &);
+- ComponentRepository_out &operator= (ComponentRepository_ptr);
+- operator ComponentRepository_ptr &();
+- ComponentRepository_ptr &ptr (void);
+- ComponentRepository_ptr operator-> (void);
++ IR_ComponentRepository_out (IR_ComponentRepository_ptr &);
++ IR_ComponentRepository_out (IR_ComponentRepository_var &);
++ IR_ComponentRepository_out (const IR_ComponentRepository_out &);
++ IR_ComponentRepository_out &operator= (const IR_ComponentRepository_out &);
++ IR_ComponentRepository_out &operator= (const IR_ComponentRepository_var &);
++ IR_ComponentRepository_out &operator= (IR_ComponentRepository_ptr);
++ operator IR_ComponentRepository_ptr &();
++ IR_ComponentRepository_ptr &ptr (void);
++ IR_ComponentRepository_ptr operator-> (void);
+
+ private:
+- ComponentRepository_ptr &ptr_;
++ IR_ComponentRepository_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTREPOSITORY_CH_)
+-#define _TAO_IR_COMPONENTREPOSITORY_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_ComponentRepository_Proxy_Impl;
+ class _TAO_ComponentRepository_Remote_Proxy_Impl;
+ class _TAO_ComponentRepository_Proxy_Broker;
+ class _TAO_ComponentRepository_Remote_Proxy_Broker;
+
+-class TAO_Export ComponentRepository: public virtual Repository
++class TAO_Export IR_ComponentRepository: public virtual IR_Repository
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ComponentRepository_ptr _ptr_type;
+- typedef ComponentRepository_var _var_type;
++ typedef IR_ComponentRepository_ptr _ptr_type;
++ typedef IR_ComponentRepository_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ComponentRepository_ptr _duplicate (ComponentRepository_ptr obj);
+- static ComponentRepository_ptr _narrow (
++ static IR_ComponentRepository_ptr _duplicate (IR_ComponentRepository_ptr obj);
++ static IR_ComponentRepository_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ComponentRepository_ptr _unchecked_narrow (
++ static IR_ComponentRepository_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ComponentRepository_ptr _nil (void)
++ static IR_ComponentRepository_ptr _nil (void)
+ {
+- return (ComponentRepository_ptr)0;
++ return (IR_ComponentRepository_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::ComponentDef_ptr create_component (
++ virtual IR_ComponentDef_ptr create_component (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ComponentDef_ptr base_component,
+- const IR::InterfaceDefSeq & supports_interfaces,
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9499,13 +6055,13 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::HomeDef_ptr create_home (
++ virtual IR_HomeDef_ptr create_home (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::HomeDef_ptr base_home,
+- IR::ComponentDef_ptr managed_component,
+- IR::ValueDef_ptr primary_key,
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -9526,143 +6082,27 @@
+ _TAO_ComponentRepository_Proxy_Broker *the_TAO_ComponentRepository_Proxy_Broker_;
+
+ protected:
+- ComponentRepository (int collocated = 0);
++ IR_ComponentRepository (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ComponentRepository (
++ IR_ComponentRepository (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
+- friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
+-
+- virtual ~ComponentRepository (void);
+- private:
+- ComponentRepository (const ComponentRepository &);
+- void operator= (const ComponentRepository &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ComponentRepository_create_component : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ComponentRepository;
+-
+- friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
+- friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ComponentRepository_create_component (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ComponentDef_ptr base_component,
+- const IR::InterfaceDefSeq & supports_interfaces,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_ComponentRepository_create_component (const TAO_ClientRequestInfo_IR_ComponentRepository_create_component &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentRepository_create_component &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::ComponentDef_ptr base_component_;
+- const IR::InterfaceDefSeq & supports_interfaces_;
+- void result (IR::ComponentDef_ptr result);
+- // update the result
+- IR::ComponentDef_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_ComponentRepository_create_home : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ComponentRepository;
+-
+- friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
+- friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ComponentRepository_create_home (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::HomeDef_ptr base_home,
+- IR::ComponentDef_ptr managed_component,
+- IR::ValueDef_ptr primary_key,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_ComponentRepository_Remote_Proxy_Impl;
++ friend class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
++ friend class _TAO_ComponentRepository_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_ComponentRepository (void);
+ private:
+- TAO_ClientRequestInfo_IR_ComponentRepository_create_home (const TAO_ClientRequestInfo_IR_ComponentRepository_create_home &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentRepository_create_home &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::HomeDef_ptr base_home_;
+- IR::ComponentDef_ptr managed_component_;
+- IR::ValueDef_ptr primary_key_;
+- void result (IR::HomeDef_ptr result);
+- // update the result
+- IR::HomeDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_ComponentRepository (const IR_ComponentRepository &);
++ void operator= (const IR_ComponentRepository &);
+ };
+
+
+@@ -9676,32 +6116,32 @@
+ //
+
+ class TAO_Export _TAO_ComponentRepository_Proxy_Impl :
+- public virtual IR::_TAO_Repository_Proxy_Impl
++ public virtual _TAO_Repository_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ComponentRepository_Proxy_Impl (void) { }
+
+- virtual IR::ComponentDef_ptr create_component (
++ virtual IR_ComponentDef_ptr create_component (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ComponentDef_ptr base_component,
+- const IR::InterfaceDefSeq & supports_interfaces,
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::HomeDef_ptr create_home (
++ virtual IR_HomeDef_ptr create_home (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::HomeDef_ptr base_home,
+- IR::ComponentDef_ptr managed_component,
+- IR::ValueDef_ptr primary_key,
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -9712,6 +6152,7 @@
+ _TAO_ComponentRepository_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -9724,7 +6165,7 @@
+ class TAO_Export _TAO_ComponentRepository_Remote_Proxy_Impl :
+ public virtual _TAO_ComponentRepository_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Repository_Remote_Proxy_Impl
++ public virtual _TAO_Repository_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -9732,27 +6173,27 @@
+
+ virtual ~_TAO_ComponentRepository_Remote_Proxy_Impl (void) { }
+
+- virtual IR::ComponentDef_ptr create_component (
++ virtual IR_ComponentDef_ptr create_component (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ComponentDef_ptr base_component,
+- const IR::InterfaceDefSeq & supports_interfaces,
++ IR_ComponentDef_ptr base_component,
++ const IR_InterfaceDefSeq & supports_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::HomeDef_ptr create_home (
++ virtual IR_HomeDef_ptr create_home (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::HomeDef_ptr base_home,
+- IR::ComponentDef_ptr managed_component,
+- IR::ValueDef_ptr primary_key,
++ IR_HomeDef_ptr base_home,
++ IR_ComponentDef_ptr managed_component,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -9781,8 +6222,9 @@
+ {
+ public:
+ virtual ~_TAO_ComponentRepository_Proxy_Broker (void);
++
+ virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
+- ComponentRepository *object,
++ IR_ComponentRepository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -9807,9 +6249,9 @@
+ _TAO_ComponentRepository_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ComponentRepository_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ComponentRepository_Proxy_Impl &select_proxy (
+- ComponentRepository *object,
++ IR_ComponentRepository *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -9823,117 +6265,39 @@
+ static _TAO_ComponentRepository_Remote_Proxy_Broker *the_TAO_ComponentRepository_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
++// Forward Classes Declaration
++class _TAO_ModuleDef_Proxy_Impl;
++class _TAO_ModuleDef_Remote_Proxy_Impl;
++class _TAO_ModuleDef_Proxy_Broker;
++class _TAO_ModuleDef_Remote_Proxy_Broker;
+
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentRepository;
+-
+-
+-#if !defined (_TAO_IR_MODULEDEF___PTR_CH_)
+-#define _TAO_IR_MODULEDEF___PTR_CH_
+-
+-class ModuleDef;
+-typedef ModuleDef *ModuleDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_MODULEDEF___VAR_CH_)
+-#define _TAO_IR_MODULEDEF___VAR_CH_
+-
+-class TAO_Export ModuleDef_var : public TAO_Base_var
+-{
+-public:
+- ModuleDef_var (void); // default constructor
+- ModuleDef_var (ModuleDef_ptr p) : ptr_ (p) {}
+- ModuleDef_var (const ModuleDef_var &); // copy constructor
+- ~ModuleDef_var (void); // destructor
+-
+- ModuleDef_var &operator= (ModuleDef_ptr);
+- ModuleDef_var &operator= (const ModuleDef_var &);
+- ModuleDef_ptr operator-> (void) const;
+-
+- operator const ModuleDef_ptr &() const;
+- operator ModuleDef_ptr &();
+- // in, inout, out, _retn
+- ModuleDef_ptr in (void) const;
+- ModuleDef_ptr &inout (void);
+- ModuleDef_ptr &out (void);
+- ModuleDef_ptr _retn (void);
+- ModuleDef_ptr ptr (void) const;
+-
+-private:
+- ModuleDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ModuleDef_var (const TAO_Base_var &rhs);
+- ModuleDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_MODULEDEF___OUT_CH_)
+-#define _TAO_IR_MODULEDEF___OUT_CH_
+-
+-class TAO_Export ModuleDef_out
+-{
+-public:
+- ModuleDef_out (ModuleDef_ptr &);
+- ModuleDef_out (ModuleDef_var &);
+- ModuleDef_out (const ModuleDef_out &);
+- ModuleDef_out &operator= (const ModuleDef_out &);
+- ModuleDef_out &operator= (const ModuleDef_var &);
+- ModuleDef_out &operator= (ModuleDef_ptr);
+- operator ModuleDef_ptr &();
+- ModuleDef_ptr &ptr (void);
+- ModuleDef_ptr operator-> (void);
+-
+-private:
+- ModuleDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_MODULEDEF_CH_)
+-#define _TAO_IR_MODULEDEF_CH_
+-
+-// Forward Classes Declaration
+-class _TAO_ModuleDef_Proxy_Impl;
+-class _TAO_ModuleDef_Remote_Proxy_Impl;
+-class _TAO_ModuleDef_Proxy_Broker;
+-class _TAO_ModuleDef_Remote_Proxy_Broker;
+-
+-class TAO_Export ModuleDef: public virtual Container, public virtual Contained
+-{
+-public:
+-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ModuleDef_ptr _ptr_type;
+- typedef ModuleDef_var _var_type;
+-#endif /* ! __GNUC__ || g++ >= 2.8 */
++class TAO_Export IR_ModuleDef: public virtual IR_Container, public virtual IR_Contained
++{
++public:
++#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
++ typedef IR_ModuleDef_ptr _ptr_type;
++ typedef IR_ModuleDef_var _var_type;
++#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ModuleDef_ptr _duplicate (ModuleDef_ptr obj);
+- static ModuleDef_ptr _narrow (
++ static IR_ModuleDef_ptr _duplicate (IR_ModuleDef_ptr obj);
++ static IR_ModuleDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ModuleDef_ptr _unchecked_narrow (
++ static IR_ModuleDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ModuleDef_ptr _nil (void)
++ static IR_ModuleDef_ptr _nil (void)
+ {
+- return (ModuleDef_ptr)0;
++ return (IR_ModuleDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -9951,58 +6315,51 @@
+ _TAO_ModuleDef_Proxy_Broker *the_TAO_ModuleDef_Proxy_Broker_;
+
+ protected:
+- ModuleDef (int collocated = 0);
++ IR_ModuleDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ModuleDef (
++ IR_ModuleDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_ModuleDef_Remote_Proxy_Impl;
+- friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ModuleDef_Direct_Proxy_Impl;
++ friend class _TAO_ModuleDef_Remote_Proxy_Impl;
++ friend class _TAO_ModuleDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_ModuleDef_Direct_Proxy_Impl;
+
+- virtual ~ModuleDef (void);
+- private:
+- ModuleDef (const ModuleDef &);
+- void operator= (const ModuleDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+- };
++ virtual ~IR_ModuleDef (void);
++private:
++ IR_ModuleDef (const IR_ModuleDef &);
++ void operator= (const IR_ModuleDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+
+-
++
+ ///////////////////////////////////////////////////////////////////////
+ // Base Impl. Declaration
+ //
+
+ class TAO_Export _TAO_ModuleDef_Proxy_Impl :
+- public virtual IR::_TAO_Container_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Proxy_Impl
++ public virtual _TAO_Container_Proxy_Impl,
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ModuleDef_Proxy_Impl (void) { }
+
+- protected:
++ protected:
+ _TAO_ModuleDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -10015,8 +6372,8 @@
+ class TAO_Export _TAO_ModuleDef_Remote_Proxy_Impl :
+ public virtual _TAO_ModuleDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Container_Remote_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
++ public virtual _TAO_Container_Remote_Proxy_Impl,
++ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -10024,7 +6381,7 @@
+
+ virtual ~_TAO_ModuleDef_Remote_Proxy_Impl (void) { }
+
+- };
++};
+
+ //
+ // Base Proxy Impl. Declaration
+@@ -10046,8 +6403,9 @@
+ {
+ public:
+ virtual ~_TAO_ModuleDef_Proxy_Broker (void);
++
+ virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
+- ModuleDef *object,
++ IR_ModuleDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -10072,9 +6430,9 @@
+ _TAO_ModuleDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ModuleDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ModuleDef_Proxy_Impl &select_proxy (
+- ModuleDef *object,
++ IR_ModuleDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -10088,24 +6446,15 @@
+ static _TAO_ModuleDef_Remote_Proxy_Broker *the_TAO_ModuleDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDef;
+-
+-struct ModuleDescription;
+-class ModuleDescription_var;
+-
+-struct TAO_Export ModuleDescription
++struct TAO_Export IR_ModuleDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ModuleDescription_var _var_type;
++ typedef IR_ModuleDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -10116,170 +6465,96 @@
+ TAO_String_Manager version;
+ };
+
+-class TAO_Export ModuleDescription_var
+-{
+-public:
+- ModuleDescription_var (void); // default constructor
+- ModuleDescription_var (ModuleDescription *);
+- ModuleDescription_var (const ModuleDescription_var &); // copy constructor
+- ~ModuleDescription_var (void); // destructor
+-
+- ModuleDescription_var &operator= (ModuleDescription *);
+- ModuleDescription_var &operator= (const ModuleDescription_var &);
+- ModuleDescription *operator-> (void);
+- const ModuleDescription *operator-> (void) const;
+-
+- operator const ModuleDescription &() const;
+- operator ModuleDescription &();
+- operator ModuleDescription &() const;
+- operator ModuleDescription *&(); // variable-size types only
+-
+- // in, inout, out, _retn
+- const ModuleDescription &in (void) const;
+- ModuleDescription &inout (void);
+- ModuleDescription *&out (void);
+- ModuleDescription *_retn (void);
+- ModuleDescription *ptr (void) const;
+-
+-private:
+- ModuleDescription *ptr_;
+-};
+-
+-class TAO_Export ModuleDescription_out
++class TAO_Export IR_ModuleDescription_var
+ {
+ public:
+- ModuleDescription_out (ModuleDescription *&);
+- ModuleDescription_out (ModuleDescription_var &);
+- ModuleDescription_out (const ModuleDescription_out &);
+- ModuleDescription_out &operator= (const ModuleDescription_out &);
+- ModuleDescription_out &operator= (ModuleDescription *);
+- operator ModuleDescription *&();
+- ModuleDescription *&ptr (void);
+- ModuleDescription *operator-> (void);
++ IR_ModuleDescription_var (void); // default constructor
++ IR_ModuleDescription_var (IR_ModuleDescription *);
++ IR_ModuleDescription_var (const IR_ModuleDescription_var &); // copy constructor
++ ~IR_ModuleDescription_var (void); // destructor
+
+-private:
+- ModuleDescription *&ptr_;
+- // assignment from T_var not allowed
+- void operator= (const ModuleDescription_var &);
+-};
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDescription;
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___PTR_CH_)
+-#define _TAO_IR_CONSTANTDEF___PTR_CH_
+-
+-class ConstantDef;
+-typedef ConstantDef *ConstantDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___VAR_CH_)
+-#define _TAO_IR_CONSTANTDEF___VAR_CH_
+-
+-class TAO_Export ConstantDef_var : public TAO_Base_var
+-{
+-public:
+- ConstantDef_var (void); // default constructor
+- ConstantDef_var (ConstantDef_ptr p) : ptr_ (p) {}
+- ConstantDef_var (const ConstantDef_var &); // copy constructor
+- ~ConstantDef_var (void); // destructor
++ IR_ModuleDescription_var &operator= (IR_ModuleDescription *);
++ IR_ModuleDescription_var &operator= (const IR_ModuleDescription_var &);
++ IR_ModuleDescription *operator-> (void);
++ const IR_ModuleDescription *operator-> (void) const;
+
+- ConstantDef_var &operator= (ConstantDef_ptr);
+- ConstantDef_var &operator= (const ConstantDef_var &);
+- ConstantDef_ptr operator-> (void) const;
++ operator const IR_ModuleDescription &() const;
++ operator IR_ModuleDescription &();
++ operator IR_ModuleDescription &() const;
++ operator IR_ModuleDescription *&(); // variable-size types only
+
+- operator const ConstantDef_ptr &() const;
+- operator ConstantDef_ptr &();
+ // in, inout, out, _retn
+- ConstantDef_ptr in (void) const;
+- ConstantDef_ptr &inout (void);
+- ConstantDef_ptr &out (void);
+- ConstantDef_ptr _retn (void);
+- ConstantDef_ptr ptr (void) const;
++ const IR_ModuleDescription &in (void) const;
++ IR_ModuleDescription &inout (void);
++ IR_ModuleDescription *&out (void);
++ IR_ModuleDescription *_retn (void);
++ IR_ModuleDescription *ptr (void) const;
+
+ private:
+- ConstantDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ConstantDef_var (const TAO_Base_var &rhs);
+- ConstantDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ModuleDescription *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___OUT_CH_)
+-#define _TAO_IR_CONSTANTDEF___OUT_CH_
+-
+-class TAO_Export ConstantDef_out
++class TAO_Export IR_ModuleDescription_out
+ {
+ public:
+- ConstantDef_out (ConstantDef_ptr &);
+- ConstantDef_out (ConstantDef_var &);
+- ConstantDef_out (const ConstantDef_out &);
+- ConstantDef_out &operator= (const ConstantDef_out &);
+- ConstantDef_out &operator= (const ConstantDef_var &);
+- ConstantDef_out &operator= (ConstantDef_ptr);
+- operator ConstantDef_ptr &();
+- ConstantDef_ptr &ptr (void);
+- ConstantDef_ptr operator-> (void);
++ IR_ModuleDescription_out (IR_ModuleDescription *&);
++ IR_ModuleDescription_out (IR_ModuleDescription_var &);
++ IR_ModuleDescription_out (const IR_ModuleDescription_out &);
++ IR_ModuleDescription_out &operator= (const IR_ModuleDescription_out &);
++ IR_ModuleDescription_out &operator= (IR_ModuleDescription *);
++ operator IR_ModuleDescription *&();
++ IR_ModuleDescription *&ptr (void);
++ IR_ModuleDescription *operator-> (void);
+
+ private:
+- ConstantDef_ptr &ptr_;
++ IR_ModuleDescription *&ptr_;
++ // assignment from T_var not allowed
++ void operator= (const IR_ModuleDescription_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF_CH_)
+-#define _TAO_IR_CONSTANTDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_ConstantDef_Proxy_Impl;
+ class _TAO_ConstantDef_Remote_Proxy_Impl;
+ class _TAO_ConstantDef_Proxy_Broker;
+ class _TAO_ConstantDef_Remote_Proxy_Broker;
+
+-class TAO_Export ConstantDef: public virtual Contained
++class TAO_Export IR_ConstantDef: public virtual IR_Contained
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ConstantDef_ptr _ptr_type;
+- typedef ConstantDef_var _var_type;
++ typedef IR_ConstantDef_ptr _ptr_type;
++ typedef IR_ConstantDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ConstantDef_ptr _duplicate (ConstantDef_ptr obj);
+- static ConstantDef_ptr _narrow (
++ static IR_ConstantDef_ptr _duplicate (IR_ConstantDef_ptr obj);
++ static IR_ConstantDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ConstantDef_ptr _unchecked_narrow (
++ static IR_ConstantDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ConstantDef_ptr _nil (void)
++ static IR_ConstantDef_ptr _nil (void)
+ {
+- return (ConstantDef_ptr)0;
++ return (IR_ConstantDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual CORBA::TypeCode_ptr type (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual CORBA::TypeCode_ptr type (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr type_def (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual IR_IDLType_ptr type_def (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+@@ -10287,7 +6562,7 @@
+ ));
+
+ virtual void type_def (
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -10325,250 +6600,27 @@
+ _TAO_ConstantDef_Proxy_Broker *the_TAO_ConstantDef_Proxy_Broker_;
+
+ protected:
+- ConstantDef (int collocated = 0);
++ IR_ConstantDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ConstantDef (
++ IR_ConstantDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+- friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+-
+- virtual ~ConstantDef (void);
+- private:
+- ConstantDef (const ConstantDef &);
+- void operator= (const ConstantDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ConstantDef_type_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ConstantDef;
+-
+- friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+- friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ConstantDef_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_ConstantDef_type_get (const TAO_ClientRequestInfo_IR_ConstantDef_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_ConstantDef_type_def_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ConstantDef;
+-
+- friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+- friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ConstantDef_type_def_get (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ConstantDef_type_def_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ConstantDef;
+-
+- friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+- friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ConstantDef_type_def_set (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_type_def_set &);
+- IR::IDLType_ptr type_def_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ConstantDef_value_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ConstantDef;
+-
++
+ friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+ friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ConstantDef_value_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ConstantDef_value_get (const TAO_ClientRequestInfo_IR_ConstantDef_value_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_value_get &);
+- void result (CORBA::Any * result);
+- // update the result
+- CORBA::Any * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ConstantDef_value_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ConstantDef;
+
+- friend class _TAO_ConstantDef_Remote_Proxy_Impl;
+- friend class _TAO_ConstantDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ConstantDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ConstantDef_value_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Any & value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_ConstantDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_ConstantDef_value_set (const TAO_ClientRequestInfo_IR_ConstantDef_value_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ConstantDef_value_set &);
+- const CORBA::Any & value_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_ConstantDef (const IR_ConstantDef &);
++ void operator= (const IR_ConstantDef &);
+ };
+
+
+@@ -10582,12 +6634,12 @@
+ //
+
+ class TAO_Export _TAO_ConstantDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ConstantDef_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -10595,7 +6647,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::IDLType_ptr type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -10605,7 +6657,7 @@
+
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -10633,6 +6685,7 @@
+ _TAO_ConstantDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -10645,7 +6698,7 @@
+ class TAO_Export _TAO_ConstantDef_Remote_Proxy_Impl :
+ public virtual _TAO_ConstantDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -10653,15 +6706,15 @@
+
+ virtual ~_TAO_ConstantDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -10671,22 +6724,22 @@
+
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual CORBA::Any * value (
++ virtual CORBA::Any * value (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual void value (
++ virtual void value (
+ CORBA_Object *_collocated_tao_target_,
+ const CORBA::Any & value,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -10717,8 +6770,9 @@
+ {
+ public:
+ virtual ~_TAO_ConstantDef_Proxy_Broker (void);
++
+ virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
+- ConstantDef *object,
++ IR_ConstantDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -10743,9 +6797,9 @@
+ _TAO_ConstantDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ConstantDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ConstantDef_Proxy_Impl &select_proxy (
+- ConstantDef *object,
++ IR_ConstantDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -10759,24 +6813,15 @@
+ static _TAO_ConstantDef_Remote_Proxy_Broker *the_TAO_ConstantDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDef;
+-
+-struct ConstantDescription;
+-class ConstantDescription_var;
+-
+-struct TAO_Export ConstantDescription
++struct TAO_Export IR_ConstantDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ConstantDescription_var _var_type;
++ typedef IR_ConstantDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -10789,156 +6834,127 @@
+ CORBA::Any value;
+ };
+
+-class TAO_Export ConstantDescription_var
++class TAO_Export IR_ConstantDescription_var
+ {
+ public:
+- ConstantDescription_var (void); // default constructor
+- ConstantDescription_var (ConstantDescription *);
+- ConstantDescription_var (const ConstantDescription_var &); // copy constructor
+- ~ConstantDescription_var (void); // destructor
+-
+- ConstantDescription_var &operator= (ConstantDescription *);
+- ConstantDescription_var &operator= (const ConstantDescription_var &);
+- ConstantDescription *operator-> (void);
+- const ConstantDescription *operator-> (void) const;
+-
+- operator const ConstantDescription &() const;
+- operator ConstantDescription &();
+- operator ConstantDescription &() const;
+- operator ConstantDescription *&(); // variable-size types only
++ IR_ConstantDescription_var (void); // default constructor
++ IR_ConstantDescription_var (IR_ConstantDescription *);
++ IR_ConstantDescription_var (const IR_ConstantDescription_var &); // copy constructor
++ ~IR_ConstantDescription_var (void); // destructor
++
++ IR_ConstantDescription_var &operator= (IR_ConstantDescription *);
++ IR_ConstantDescription_var &operator= (const IR_ConstantDescription_var &);
++ IR_ConstantDescription *operator-> (void);
++ const IR_ConstantDescription *operator-> (void) const;
++
++ operator const IR_ConstantDescription &() const;
++ operator IR_ConstantDescription &();
++ operator IR_ConstantDescription &() const;
++ operator IR_ConstantDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const ConstantDescription &in (void) const;
+- ConstantDescription &inout (void);
+- ConstantDescription *&out (void);
+- ConstantDescription *_retn (void);
+- ConstantDescription *ptr (void) const;
++ const IR_ConstantDescription &in (void) const;
++ IR_ConstantDescription &inout (void);
++ IR_ConstantDescription *&out (void);
++ IR_ConstantDescription *_retn (void);
++ IR_ConstantDescription *ptr (void) const;
+
+ private:
+- ConstantDescription *ptr_;
++ IR_ConstantDescription *ptr_;
+ };
+
+-class TAO_Export ConstantDescription_out
++class TAO_Export IR_ConstantDescription_out
+ {
+ public:
+- ConstantDescription_out (ConstantDescription *&);
+- ConstantDescription_out (ConstantDescription_var &);
+- ConstantDescription_out (const ConstantDescription_out &);
+- ConstantDescription_out &operator= (const ConstantDescription_out &);
+- ConstantDescription_out &operator= (ConstantDescription *);
+- operator ConstantDescription *&();
+- ConstantDescription *&ptr (void);
+- ConstantDescription *operator-> (void);
++ IR_ConstantDescription_out (IR_ConstantDescription *&);
++ IR_ConstantDescription_out (IR_ConstantDescription_var &);
++ IR_ConstantDescription_out (const IR_ConstantDescription_out &);
++ IR_ConstantDescription_out &operator= (const IR_ConstantDescription_out &);
++ IR_ConstantDescription_out &operator= (IR_ConstantDescription *);
++ operator IR_ConstantDescription *&();
++ IR_ConstantDescription *&ptr (void);
++ IR_ConstantDescription *operator-> (void);
+
+ private:
+- ConstantDescription *&ptr_;
++ IR_ConstantDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ConstantDescription_var &);
++ void operator= (const IR_ConstantDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDescription;
+-
+-
+-#if !defined (_TAO_IR_TYPEDEFDEF___PTR_CH_)
+-#define _TAO_IR_TYPEDEFDEF___PTR_CH_
+-
+-class TypedefDef;
+-typedef TypedefDef *TypedefDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_TYPEDEFDEF___VAR_CH_)
+-#define _TAO_IR_TYPEDEFDEF___VAR_CH_
+-
+-class TAO_Export TypedefDef_var : public TAO_Base_var
++class TAO_Export IR_TypedefDef_var : public TAO_Base_var
+ {
+ public:
+- TypedefDef_var (void); // default constructor
+- TypedefDef_var (TypedefDef_ptr p) : ptr_ (p) {}
+- TypedefDef_var (const TypedefDef_var &); // copy constructor
+- ~TypedefDef_var (void); // destructor
++ IR_TypedefDef_var (void); // default constructor
++ IR_TypedefDef_var (IR_TypedefDef_ptr p) : ptr_ (p) {}
++ IR_TypedefDef_var (const IR_TypedefDef_var &); // copy constructor
++ ~IR_TypedefDef_var (void); // destructor
+
+- TypedefDef_var &operator= (TypedefDef_ptr);
+- TypedefDef_var &operator= (const TypedefDef_var &);
+- TypedefDef_ptr operator-> (void) const;
++ IR_TypedefDef_var &operator= (IR_TypedefDef_ptr);
++ IR_TypedefDef_var &operator= (const IR_TypedefDef_var &);
++ IR_TypedefDef_ptr operator-> (void) const;
+
+- operator const TypedefDef_ptr &() const;
+- operator TypedefDef_ptr &();
++ operator const IR_TypedefDef_ptr &() const;
++ operator IR_TypedefDef_ptr &();
+ // in, inout, out, _retn
+- TypedefDef_ptr in (void) const;
+- TypedefDef_ptr &inout (void);
+- TypedefDef_ptr &out (void);
+- TypedefDef_ptr _retn (void);
+- TypedefDef_ptr ptr (void) const;
++ IR_TypedefDef_ptr in (void) const;
++ IR_TypedefDef_ptr &inout (void);
++ IR_TypedefDef_ptr &out (void);
++ IR_TypedefDef_ptr _retn (void);
++ IR_TypedefDef_ptr ptr (void) const;
+
+ private:
+- TypedefDef_ptr ptr_;
++ IR_TypedefDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- TypedefDef_var (const TAO_Base_var &rhs);
+- TypedefDef_var &operator= (const TAO_Base_var &rhs);
++ IR_TypedefDef_var (const TAO_Base_var &rhs);
++ IR_TypedefDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_TYPEDEFDEF___OUT_CH_)
+-#define _TAO_IR_TYPEDEFDEF___OUT_CH_
+-
+-class TAO_Export TypedefDef_out
++class TAO_Export IR_TypedefDef_out
+ {
+ public:
+- TypedefDef_out (TypedefDef_ptr &);
+- TypedefDef_out (TypedefDef_var &);
+- TypedefDef_out (const TypedefDef_out &);
+- TypedefDef_out &operator= (const TypedefDef_out &);
+- TypedefDef_out &operator= (const TypedefDef_var &);
+- TypedefDef_out &operator= (TypedefDef_ptr);
+- operator TypedefDef_ptr &();
+- TypedefDef_ptr &ptr (void);
+- TypedefDef_ptr operator-> (void);
++ IR_TypedefDef_out (IR_TypedefDef_ptr &);
++ IR_TypedefDef_out (IR_TypedefDef_var &);
++ IR_TypedefDef_out (const IR_TypedefDef_out &);
++ IR_TypedefDef_out &operator= (const IR_TypedefDef_out &);
++ IR_TypedefDef_out &operator= (const IR_TypedefDef_var &);
++ IR_TypedefDef_out &operator= (IR_TypedefDef_ptr);
++ operator IR_TypedefDef_ptr &();
++ IR_TypedefDef_ptr &ptr (void);
++ IR_TypedefDef_ptr operator-> (void);
+
+ private:
+- TypedefDef_ptr &ptr_;
++ IR_TypedefDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_TYPEDEFDEF_CH_)
+-#define _TAO_IR_TYPEDEFDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_TypedefDef_Proxy_Impl;
+ class _TAO_TypedefDef_Remote_Proxy_Impl;
+ class _TAO_TypedefDef_Proxy_Broker;
+ class _TAO_TypedefDef_Remote_Proxy_Broker;
+
+-class TAO_Export TypedefDef: public virtual Contained, public virtual IDLType
++class TAO_Export IR_TypedefDef: public virtual IR_Contained, public virtual IR_IDLType
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef TypedefDef_ptr _ptr_type;
+- typedef TypedefDef_var _var_type;
++ typedef IR_TypedefDef_ptr _ptr_type;
++ typedef IR_TypedefDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
+- static TypedefDef_ptr _narrow (
++ static IR_TypedefDef_ptr _duplicate (IR_TypedefDef_ptr obj);
++ static IR_TypedefDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static TypedefDef_ptr _unchecked_narrow (
++ static IR_TypedefDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static TypedefDef_ptr _nil (void)
++ static IR_TypedefDef_ptr _nil (void)
+ {
+- return (TypedefDef_ptr)0;
++ return (IR_TypedefDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -10956,61 +6972,54 @@
+ _TAO_TypedefDef_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
+
+ protected:
+- TypedefDef (int collocated = 0);
++ IR_TypedefDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- TypedefDef (
++ IR_TypedefDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_TypedefDef_Remote_Proxy_Impl;
+- friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_TypedefDef_Direct_Proxy_Impl;
++ friend class _TAO_TypedefDef_Remote_Proxy_Impl;
++ friend class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_TypedefDef_Direct_Proxy_Impl;
+
+- virtual ~TypedefDef (void);
+- private:
+- TypedefDef (const TypedefDef &);
+- void operator= (const TypedefDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+- };
++ virtual ~IR_TypedefDef (void);
++private:
++ IR_TypedefDef (const IR_TypedefDef &);
++ void operator= (const IR_TypedefDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+
+-
++
+ ///////////////////////////////////////////////////////////////////////
+ // Base Impl. Declaration
+ //
+
+ class TAO_Export _TAO_TypedefDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl,
++ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_TypedefDef_Proxy_Impl (void) { }
+
+- protected:
++ protected:
+ _TAO_TypedefDef_Proxy_Impl (void);
+
+ };
+- //
+- // Base Proxy Impl. Declaration
+- ///////////////////////////////////////////////////////////////////////
++
++//
++// Base Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -11020,8 +7029,8 @@
+ class TAO_Export _TAO_TypedefDef_Remote_Proxy_Impl :
+ public virtual _TAO_TypedefDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl,
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -11029,7 +7038,7 @@
+
+ virtual ~_TAO_TypedefDef_Remote_Proxy_Impl (void) { }
+
+- };
++};
+
+ //
+ // Base Proxy Impl. Declaration
+@@ -11051,8 +7060,9 @@
+ {
+ public:
+ virtual ~_TAO_TypedefDef_Proxy_Broker (void);
++
+ virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
+- TypedefDef *object,
++ IR_TypedefDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -11077,9 +7087,9 @@
+ _TAO_TypedefDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_TypedefDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_TypedefDef_Proxy_Impl &select_proxy (
+- TypedefDef *object,
++ IR_TypedefDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -11093,24 +7103,15 @@
+ static _TAO_TypedefDef_Remote_Proxy_Broker *the_TAO_TypedefDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypedefDef;
+-
+-struct TypeDescription;
+-class TypeDescription_var;
+-
+-struct TAO_Export TypeDescription
++struct TAO_Export IR_TypeDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef TypeDescription_var _var_type;
++ typedef IR_TypeDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -11122,170 +7123,96 @@
+ CORBA::TypeCode_var type;
+ };
+
+-class TAO_Export TypeDescription_var
+-{
+-public:
+- TypeDescription_var (void); // default constructor
+- TypeDescription_var (TypeDescription *);
+- TypeDescription_var (const TypeDescription_var &); // copy constructor
+- ~TypeDescription_var (void); // destructor
+-
+- TypeDescription_var &operator= (TypeDescription *);
+- TypeDescription_var &operator= (const TypeDescription_var &);
+- TypeDescription *operator-> (void);
+- const TypeDescription *operator-> (void) const;
+-
+- operator const TypeDescription &() const;
+- operator TypeDescription &();
+- operator TypeDescription &() const;
+- operator TypeDescription *&(); // variable-size types only
+-
+- // in, inout, out, _retn
+- const TypeDescription &in (void) const;
+- TypeDescription &inout (void);
+- TypeDescription *&out (void);
+- TypeDescription *_retn (void);
+- TypeDescription *ptr (void) const;
+-
+-private:
+- TypeDescription *ptr_;
+-};
+-
+-class TAO_Export TypeDescription_out
++class TAO_Export IR_TypeDescription_var
+ {
+ public:
+- TypeDescription_out (TypeDescription *&);
+- TypeDescription_out (TypeDescription_var &);
+- TypeDescription_out (const TypeDescription_out &);
+- TypeDescription_out &operator= (const TypeDescription_out &);
+- TypeDescription_out &operator= (TypeDescription *);
+- operator TypeDescription *&();
+- TypeDescription *&ptr (void);
+- TypeDescription *operator-> (void);
++ IR_TypeDescription_var (void); // default constructor
++ IR_TypeDescription_var (IR_TypeDescription *);
++ IR_TypeDescription_var (const IR_TypeDescription_var &); // copy constructor
++ ~IR_TypeDescription_var (void); // destructor
+
+-private:
+- TypeDescription *&ptr_;
+- // assignment from T_var not allowed
+- void operator= (const TypeDescription_var &);
+-};
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeDescription;
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF___PTR_CH_)
+-#define _TAO_IR_STRUCTDEF___PTR_CH_
+-
+-class StructDef;
+-typedef StructDef *StructDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF___VAR_CH_)
+-#define _TAO_IR_STRUCTDEF___VAR_CH_
+-
+-class TAO_Export StructDef_var : public TAO_Base_var
+-{
+-public:
+- StructDef_var (void); // default constructor
+- StructDef_var (StructDef_ptr p) : ptr_ (p) {}
+- StructDef_var (const StructDef_var &); // copy constructor
+- ~StructDef_var (void); // destructor
++ IR_TypeDescription_var &operator= (IR_TypeDescription *);
++ IR_TypeDescription_var &operator= (const IR_TypeDescription_var &);
++ IR_TypeDescription *operator-> (void);
++ const IR_TypeDescription *operator-> (void) const;
+
+- StructDef_var &operator= (StructDef_ptr);
+- StructDef_var &operator= (const StructDef_var &);
+- StructDef_ptr operator-> (void) const;
++ operator const IR_TypeDescription &() const;
++ operator IR_TypeDescription &();
++ operator IR_TypeDescription &() const;
++ operator IR_TypeDescription *&(); // variable-size types only
+
+- operator const StructDef_ptr &() const;
+- operator StructDef_ptr &();
+ // in, inout, out, _retn
+- StructDef_ptr in (void) const;
+- StructDef_ptr &inout (void);
+- StructDef_ptr &out (void);
+- StructDef_ptr _retn (void);
+- StructDef_ptr ptr (void) const;
++ const IR_TypeDescription &in (void) const;
++ IR_TypeDescription &inout (void);
++ IR_TypeDescription *&out (void);
++ IR_TypeDescription *_retn (void);
++ IR_TypeDescription *ptr (void) const;
+
+ private:
+- StructDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- StructDef_var (const TAO_Base_var &rhs);
+- StructDef_var &operator= (const TAO_Base_var &rhs);
++ IR_TypeDescription *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF___OUT_CH_)
+-#define _TAO_IR_STRUCTDEF___OUT_CH_
+-
+-class TAO_Export StructDef_out
++class TAO_Export IR_TypeDescription_out
+ {
+ public:
+- StructDef_out (StructDef_ptr &);
+- StructDef_out (StructDef_var &);
+- StructDef_out (const StructDef_out &);
+- StructDef_out &operator= (const StructDef_out &);
+- StructDef_out &operator= (const StructDef_var &);
+- StructDef_out &operator= (StructDef_ptr);
+- operator StructDef_ptr &();
+- StructDef_ptr &ptr (void);
+- StructDef_ptr operator-> (void);
++ IR_TypeDescription_out (IR_TypeDescription *&);
++ IR_TypeDescription_out (IR_TypeDescription_var &);
++ IR_TypeDescription_out (const IR_TypeDescription_out &);
++ IR_TypeDescription_out &operator= (const IR_TypeDescription_out &);
++ IR_TypeDescription_out &operator= (IR_TypeDescription *);
++ operator IR_TypeDescription *&();
++ IR_TypeDescription *&ptr (void);
++ IR_TypeDescription *operator-> (void);
+
+ private:
+- StructDef_ptr &ptr_;
++ IR_TypeDescription *&ptr_;
++ // assignment from T_var not allowed
++ void operator= (const IR_TypeDescription_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF_CH_)
+-#define _TAO_IR_STRUCTDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_StructDef_Proxy_Impl;
+ class _TAO_StructDef_Remote_Proxy_Impl;
+ class _TAO_StructDef_Proxy_Broker;
+ class _TAO_StructDef_Remote_Proxy_Broker;
+
+-class TAO_Export StructDef: public virtual TypedefDef, public virtual Container
++class TAO_Export IR_StructDef: public virtual IR_TypedefDef, public virtual IR_Container
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef StructDef_ptr _ptr_type;
+- typedef StructDef_var _var_type;
++ typedef IR_StructDef_ptr _ptr_type;
++ typedef IR_StructDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static StructDef_ptr _duplicate (StructDef_ptr obj);
+- static StructDef_ptr _narrow (
++ static IR_StructDef_ptr _duplicate (IR_StructDef_ptr obj);
++ static IR_StructDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static StructDef_ptr _unchecked_narrow (
++ static IR_StructDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static StructDef_ptr _nil (void)
++ static IR_StructDef_ptr _nil (void)
+ {
+- return (StructDef_ptr)0;
++ return (IR_StructDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::StructMemberSeq * members (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual IR_StructMemberSeq * members (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual void members (
+- const IR::StructMemberSeq & members,
++ virtual void members (
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11306,121 +7233,27 @@
+ _TAO_StructDef_Proxy_Broker *the_TAO_StructDef_Proxy_Broker_;
+
+ protected:
+- StructDef (int collocated = 0);
++ IR_StructDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- StructDef (
++ IR_StructDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_StructDef_Remote_Proxy_Impl;
+- friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_StructDef_Direct_Proxy_Impl;
+-
+- virtual ~StructDef (void);
+- private:
+- StructDef (const StructDef &);
+- void operator= (const StructDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_StructDef_members_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::StructDef;
+-
+- friend class _TAO_StructDef_Remote_Proxy_Impl;
+- friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_StructDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_StructDef_members_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_StructDef_members_get (const TAO_ClientRequestInfo_IR_StructDef_members_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_StructDef_members_get &);
+- void result (IR::StructMemberSeq * result);
+- // update the result
+- IR::StructMemberSeq * result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_StructDef_members_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::StructDef;
+-
+- friend class _TAO_StructDef_Remote_Proxy_Impl;
+- friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_StructDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_StructDef_members_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::StructMemberSeq & members,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_StructDef_Remote_Proxy_Impl;
++ friend class _TAO_StructDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_StructDef_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_StructDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_StructDef_members_set (const TAO_ClientRequestInfo_IR_StructDef_members_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_StructDef_members_set &);
+- const IR::StructMemberSeq & members_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_StructDef (const IR_StructDef &);
++ void operator= (const IR_StructDef &);
+ };
+
+
+@@ -11434,13 +7267,13 @@
+ //
+
+ class TAO_Export _TAO_StructDef_Proxy_Impl :
+- public virtual IR::_TAO_TypedefDef_Proxy_Impl,
+- public virtual IR::_TAO_Container_Proxy_Impl
++ public virtual _TAO_TypedefDef_Proxy_Impl,
++ public virtual _TAO_Container_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_StructDef_Proxy_Impl (void) { }
+
+- virtual IR::StructMemberSeq * members (
++ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -11450,7 +7283,7 @@
+
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -11461,6 +7294,7 @@
+ _TAO_StructDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -11473,8 +7307,8 @@
+ class TAO_Export _TAO_StructDef_Remote_Proxy_Impl :
+ public virtual _TAO_StructDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl,
+- public virtual IR::_TAO_Container_Remote_Proxy_Impl
++ public virtual _TAO_TypedefDef_Remote_Proxy_Impl,
++ public virtual _TAO_Container_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -11482,7 +7316,7 @@
+
+ virtual ~_TAO_StructDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::StructMemberSeq * members (
++ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -11492,7 +7326,7 @@
+
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -11521,8 +7355,9 @@
+ {
+ public:
+ virtual ~_TAO_StructDef_Proxy_Broker (void);
++
+ virtual _TAO_StructDef_Proxy_Impl &select_proxy (
+- StructDef *object,
++ IR_StructDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -11547,9 +7382,9 @@
+ _TAO_StructDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_StructDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_StructDef_Proxy_Impl &select_proxy (
+- StructDef *object,
++ IR_StructDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -11563,117 +7398,39 @@
+ static _TAO_StructDef_Remote_Proxy_Broker *the_TAO_StructDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructDef;
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF___PTR_CH_)
+-#define _TAO_IR_UNIONDEF___PTR_CH_
+-
+-class UnionDef;
+-typedef UnionDef *UnionDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF___VAR_CH_)
+-#define _TAO_IR_UNIONDEF___VAR_CH_
+-
+-class TAO_Export UnionDef_var : public TAO_Base_var
+-{
+-public:
+- UnionDef_var (void); // default constructor
+- UnionDef_var (UnionDef_ptr p) : ptr_ (p) {}
+- UnionDef_var (const UnionDef_var &); // copy constructor
+- ~UnionDef_var (void); // destructor
+-
+- UnionDef_var &operator= (UnionDef_ptr);
+- UnionDef_var &operator= (const UnionDef_var &);
+- UnionDef_ptr operator-> (void) const;
+-
+- operator const UnionDef_ptr &() const;
+- operator UnionDef_ptr &();
+- // in, inout, out, _retn
+- UnionDef_ptr in (void) const;
+- UnionDef_ptr &inout (void);
+- UnionDef_ptr &out (void);
+- UnionDef_ptr _retn (void);
+- UnionDef_ptr ptr (void) const;
+-
+-private:
+- UnionDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- UnionDef_var (const TAO_Base_var &rhs);
+- UnionDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF___OUT_CH_)
+-#define _TAO_IR_UNIONDEF___OUT_CH_
+-
+-class TAO_Export UnionDef_out
+-{
+-public:
+- UnionDef_out (UnionDef_ptr &);
+- UnionDef_out (UnionDef_var &);
+- UnionDef_out (const UnionDef_out &);
+- UnionDef_out &operator= (const UnionDef_out &);
+- UnionDef_out &operator= (const UnionDef_var &);
+- UnionDef_out &operator= (UnionDef_ptr);
+- operator UnionDef_ptr &();
+- UnionDef_ptr &ptr (void);
+- UnionDef_ptr operator-> (void);
+-
+-private:
+- UnionDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF_CH_)
+-#define _TAO_IR_UNIONDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_UnionDef_Proxy_Impl;
+ class _TAO_UnionDef_Remote_Proxy_Impl;
+ class _TAO_UnionDef_Proxy_Broker;
+ class _TAO_UnionDef_Remote_Proxy_Broker;
+
+-class TAO_Export UnionDef: public virtual TypedefDef, public virtual Container
++class TAO_Export IR_UnionDef: public virtual IR_TypedefDef, public virtual IR_Container
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef UnionDef_ptr _ptr_type;
+- typedef UnionDef_var _var_type;
++ typedef IR_UnionDef_ptr _ptr_type;
++ typedef IR_UnionDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static UnionDef_ptr _duplicate (UnionDef_ptr obj);
+- static UnionDef_ptr _narrow (
++ static IR_UnionDef_ptr _duplicate (IR_UnionDef_ptr obj);
++ static IR_UnionDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static UnionDef_ptr _unchecked_narrow (
++ static IR_UnionDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static UnionDef_ptr _nil (void)
++ static IR_UnionDef_ptr _nil (void)
+ {
+- return (UnionDef_ptr)0;
++ return (IR_UnionDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -11686,7 +7443,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr discriminator_type_def (
++ virtual IR_IDLType_ptr discriminator_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11695,7 +7452,7 @@
+ ));
+
+ virtual void discriminator_type_def (
+- IR::IDLType_ptr discriminator_type_def,
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11703,7 +7460,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::UnionMemberSeq * members (
++ virtual IR_UnionMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11712,7 +7469,7 @@
+ ));
+
+ virtual void members (
+- const IR::UnionMemberSeq & members,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -11733,250 +7490,27 @@
+ _TAO_UnionDef_Proxy_Broker *the_TAO_UnionDef_Proxy_Broker_;
+
+ protected:
+- UnionDef (int collocated = 0);
++ IR_UnionDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- UnionDef (
++ IR_UnionDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_UnionDef_Remote_Proxy_Impl;
+- friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_UnionDef_Direct_Proxy_Impl;
+-
+- virtual ~UnionDef (void);
+- private:
+- UnionDef (const UnionDef &);
+- void operator= (const UnionDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::UnionDef;
+-
+- friend class _TAO_UnionDef_Remote_Proxy_Impl;
+- friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_UnionDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::UnionDef;
+-
+- friend class _TAO_UnionDef_Remote_Proxy_Impl;
+- friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_UnionDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::UnionDef;
+-
+- friend class _TAO_UnionDef_Remote_Proxy_Impl;
+- friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_UnionDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr discriminator_type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_UnionDef_discriminator_type_def_set &);
+- IR::IDLType_ptr discriminator_type_def_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_UnionDef_members_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::UnionDef;
+-
+ friend class _TAO_UnionDef_Remote_Proxy_Impl;
+ friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_UnionDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_UnionDef_members_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_UnionDef_members_get (const TAO_ClientRequestInfo_IR_UnionDef_members_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_UnionDef_members_get &);
+- void result (IR::UnionMemberSeq * result);
+- // update the result
+- IR::UnionMemberSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_UnionDef_members_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::UnionDef;
+
+- friend class _TAO_UnionDef_Remote_Proxy_Impl;
+- friend class _TAO_UnionDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_UnionDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_UnionDef_members_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::UnionMemberSeq & members,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_UnionDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_UnionDef_members_set (const TAO_ClientRequestInfo_IR_UnionDef_members_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_UnionDef_members_set &);
+- const IR::UnionMemberSeq & members_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_UnionDef (const IR_UnionDef &);
++ void operator= (const IR_UnionDef &);
+ };
+
+
+@@ -11990,13 +7524,13 @@
+ //
+
+ class TAO_Export _TAO_UnionDef_Proxy_Impl :
+- public virtual IR::_TAO_TypedefDef_Proxy_Impl,
+- public virtual IR::_TAO_Container_Proxy_Impl
++ public virtual _TAO_TypedefDef_Proxy_Impl,
++ public virtual _TAO_Container_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_UnionDef_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr discriminator_type (
++ virtual CORBA::TypeCode_ptr discriminator_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12004,7 +7538,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::IDLType_ptr discriminator_type_def (
++ virtual IR_IDLType_ptr discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12014,24 +7548,24 @@
+
+ virtual void discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr discriminator_type_def,
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::UnionMemberSeq * members (
++ virtual IR_UnionMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual void members (
++ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::UnionMemberSeq & members,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -12042,6 +7576,7 @@
+ _TAO_UnionDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -12054,8 +7589,8 @@
+ class TAO_Export _TAO_UnionDef_Remote_Proxy_Impl :
+ public virtual _TAO_UnionDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl,
+- public virtual IR::_TAO_Container_Remote_Proxy_Impl
++ public virtual _TAO_TypedefDef_Remote_Proxy_Impl,
++ public virtual _TAO_Container_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -12063,7 +7598,7 @@
+
+ virtual ~_TAO_UnionDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr discriminator_type (
++ virtual CORBA::TypeCode_ptr discriminator_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12071,7 +7606,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr discriminator_type_def (
++ virtual IR_IDLType_ptr discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12081,14 +7616,14 @@
+
+ virtual void discriminator_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr discriminator_type_def,
++ IR_IDLType_ptr discriminator_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::UnionMemberSeq * members (
++ virtual IR_UnionMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12098,7 +7633,7 @@
+
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::UnionMemberSeq & members,
++ const IR_UnionMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -12127,8 +7662,9 @@
+ {
+ public:
+ virtual ~_TAO_UnionDef_Proxy_Broker (void);
++
+ virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
+- UnionDef *object,
++ IR_UnionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -12153,9 +7689,9 @@
+ _TAO_UnionDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_UnionDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_UnionDef_Proxy_Impl &select_proxy (
+- UnionDef *object,
++ IR_UnionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -12169,122 +7705,44 @@
+ static _TAO_UnionDef_Remote_Proxy_Broker *the_TAO_UnionDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
++// Forward Classes Declaration
++class _TAO_EnumDef_Proxy_Impl;
++class _TAO_EnumDef_Remote_Proxy_Impl;
++class _TAO_EnumDef_Proxy_Broker;
++class _TAO_EnumDef_Remote_Proxy_Broker;
+
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionDef;
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF___PTR_CH_)
+-#define _TAO_IR_ENUMDEF___PTR_CH_
+-
+-class EnumDef;
+-typedef EnumDef *EnumDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF___VAR_CH_)
+-#define _TAO_IR_ENUMDEF___VAR_CH_
+-
+-class TAO_Export EnumDef_var : public TAO_Base_var
+-{
+-public:
+- EnumDef_var (void); // default constructor
+- EnumDef_var (EnumDef_ptr p) : ptr_ (p) {}
+- EnumDef_var (const EnumDef_var &); // copy constructor
+- ~EnumDef_var (void); // destructor
+-
+- EnumDef_var &operator= (EnumDef_ptr);
+- EnumDef_var &operator= (const EnumDef_var &);
+- EnumDef_ptr operator-> (void) const;
+-
+- operator const EnumDef_ptr &() const;
+- operator EnumDef_ptr &();
+- // in, inout, out, _retn
+- EnumDef_ptr in (void) const;
+- EnumDef_ptr &inout (void);
+- EnumDef_ptr &out (void);
+- EnumDef_ptr _retn (void);
+- EnumDef_ptr ptr (void) const;
+-
+-private:
+- EnumDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- EnumDef_var (const TAO_Base_var &rhs);
+- EnumDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF___OUT_CH_)
+-#define _TAO_IR_ENUMDEF___OUT_CH_
+-
+-class TAO_Export EnumDef_out
+-{
+-public:
+- EnumDef_out (EnumDef_ptr &);
+- EnumDef_out (EnumDef_var &);
+- EnumDef_out (const EnumDef_out &);
+- EnumDef_out &operator= (const EnumDef_out &);
+- EnumDef_out &operator= (const EnumDef_var &);
+- EnumDef_out &operator= (EnumDef_ptr);
+- operator EnumDef_ptr &();
+- EnumDef_ptr &ptr (void);
+- EnumDef_ptr operator-> (void);
+-
+-private:
+- EnumDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF_CH_)
+-#define _TAO_IR_ENUMDEF_CH_
+-
+-// Forward Classes Declaration
+-class _TAO_EnumDef_Proxy_Impl;
+-class _TAO_EnumDef_Remote_Proxy_Impl;
+-class _TAO_EnumDef_Proxy_Broker;
+-class _TAO_EnumDef_Remote_Proxy_Broker;
+-
+-class TAO_Export EnumDef: public virtual TypedefDef
++class TAO_Export IR_EnumDef: public virtual IR_TypedefDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef EnumDef_ptr _ptr_type;
+- typedef EnumDef_var _var_type;
++ typedef IR_EnumDef_ptr _ptr_type;
++ typedef IR_EnumDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static EnumDef_ptr _duplicate (EnumDef_ptr obj);
+- static EnumDef_ptr _narrow (
++ static IR_EnumDef_ptr _duplicate (IR_EnumDef_ptr obj);
++ static IR_EnumDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static EnumDef_ptr _unchecked_narrow (
++ static IR_EnumDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static EnumDef_ptr _nil (void)
++ static IR_EnumDef_ptr _nil (void)
+ {
+- return (EnumDef_ptr)0;
++ return (IR_EnumDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::EnumMemberSeq * members (
++ virtual IR_EnumMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -12293,7 +7751,7 @@
+ ));
+
+ virtual void members (
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -12314,121 +7772,27 @@
+ _TAO_EnumDef_Proxy_Broker *the_TAO_EnumDef_Proxy_Broker_;
+
+ protected:
+- EnumDef (int collocated = 0);
++ IR_EnumDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- EnumDef (
++ IR_EnumDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_EnumDef_Remote_Proxy_Impl;
+- friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_EnumDef_Direct_Proxy_Impl;
+-
+- virtual ~EnumDef (void);
+- private:
+- EnumDef (const EnumDef &);
+- void operator= (const EnumDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_EnumDef_members_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::EnumDef;
+-
+- friend class _TAO_EnumDef_Remote_Proxy_Impl;
+- friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_EnumDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_EnumDef_members_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_EnumDef_members_get (const TAO_ClientRequestInfo_IR_EnumDef_members_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_EnumDef_members_get &);
+- void result (IR::EnumMemberSeq * result);
+- // update the result
+- IR::EnumMemberSeq * result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_EnumDef_members_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::EnumDef;
+-
+- friend class _TAO_EnumDef_Remote_Proxy_Impl;
+- friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_EnumDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_EnumDef_members_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::EnumMemberSeq & members,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_EnumDef_Remote_Proxy_Impl;
++ friend class _TAO_EnumDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_EnumDef_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_EnumDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_EnumDef_members_set (const TAO_ClientRequestInfo_IR_EnumDef_members_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_EnumDef_members_set &);
+- const IR::EnumMemberSeq & members_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_EnumDef (const IR_EnumDef &);
++ void operator= (const IR_EnumDef &);
+ };
+
+
+@@ -12442,12 +7806,12 @@
+ //
+
+ class TAO_Export _TAO_EnumDef_Proxy_Impl :
+- public virtual IR::_TAO_TypedefDef_Proxy_Impl
++ public virtual _TAO_TypedefDef_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_EnumDef_Proxy_Impl (void) { }
+
+- virtual IR::EnumMemberSeq * members (
++ virtual IR_EnumMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12455,9 +7819,9 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual void members (
++ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -12468,6 +7832,7 @@
+ _TAO_EnumDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -12480,7 +7845,7 @@
+ class TAO_Export _TAO_EnumDef_Remote_Proxy_Impl :
+ public virtual _TAO_EnumDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl
++ public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -12488,7 +7853,7 @@
+
+ virtual ~_TAO_EnumDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::EnumMemberSeq * members (
++ virtual IR_EnumMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12498,7 +7863,7 @@
+
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::EnumMemberSeq & members,
++ const IR_EnumMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -12527,8 +7892,9 @@
+ {
+ public:
+ virtual ~_TAO_EnumDef_Proxy_Broker (void);
++
+ virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
+- EnumDef *object,
++ IR_EnumDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -12553,9 +7919,9 @@
+ _TAO_EnumDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_EnumDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_EnumDef_Proxy_Impl &select_proxy (
+- EnumDef *object,
++ IR_EnumDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -12569,122 +7935,44 @@
+ static _TAO_EnumDef_Remote_Proxy_Broker *the_TAO_EnumDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumDef;
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF___PTR_CH_)
+-#define _TAO_IR_ALIASDEF___PTR_CH_
+-
+-class AliasDef;
+-typedef AliasDef *AliasDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF___VAR_CH_)
+-#define _TAO_IR_ALIASDEF___VAR_CH_
+-
+-class TAO_Export AliasDef_var : public TAO_Base_var
+-{
+-public:
+- AliasDef_var (void); // default constructor
+- AliasDef_var (AliasDef_ptr p) : ptr_ (p) {}
+- AliasDef_var (const AliasDef_var &); // copy constructor
+- ~AliasDef_var (void); // destructor
+-
+- AliasDef_var &operator= (AliasDef_ptr);
+- AliasDef_var &operator= (const AliasDef_var &);
+- AliasDef_ptr operator-> (void) const;
+-
+- operator const AliasDef_ptr &() const;
+- operator AliasDef_ptr &();
+- // in, inout, out, _retn
+- AliasDef_ptr in (void) const;
+- AliasDef_ptr &inout (void);
+- AliasDef_ptr &out (void);
+- AliasDef_ptr _retn (void);
+- AliasDef_ptr ptr (void) const;
+-
+-private:
+- AliasDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- AliasDef_var (const TAO_Base_var &rhs);
+- AliasDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF___OUT_CH_)
+-#define _TAO_IR_ALIASDEF___OUT_CH_
+-
+-class TAO_Export AliasDef_out
+-{
+-public:
+- AliasDef_out (AliasDef_ptr &);
+- AliasDef_out (AliasDef_var &);
+- AliasDef_out (const AliasDef_out &);
+- AliasDef_out &operator= (const AliasDef_out &);
+- AliasDef_out &operator= (const AliasDef_var &);
+- AliasDef_out &operator= (AliasDef_ptr);
+- operator AliasDef_ptr &();
+- AliasDef_ptr &ptr (void);
+- AliasDef_ptr operator-> (void);
+-
+-private:
+- AliasDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF_CH_)
+-#define _TAO_IR_ALIASDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_AliasDef_Proxy_Impl;
+ class _TAO_AliasDef_Remote_Proxy_Impl;
+ class _TAO_AliasDef_Proxy_Broker;
+ class _TAO_AliasDef_Remote_Proxy_Broker;
+
+-class TAO_Export AliasDef: public virtual TypedefDef
++class TAO_Export IR_AliasDef: public virtual IR_TypedefDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef AliasDef_ptr _ptr_type;
+- typedef AliasDef_var _var_type;
++ typedef IR_AliasDef_ptr _ptr_type;
++ typedef IR_AliasDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static AliasDef_ptr _duplicate (AliasDef_ptr obj);
+- static AliasDef_ptr _narrow (
++ static IR_AliasDef_ptr _duplicate (IR_AliasDef_ptr obj);
++ static IR_AliasDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static AliasDef_ptr _unchecked_narrow (
++ static IR_AliasDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static AliasDef_ptr _nil (void)
++ static IR_AliasDef_ptr _nil (void)
+ {
+- return (AliasDef_ptr)0;
++ return (IR_AliasDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::IDLType_ptr original_type_def (
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -12692,8 +7980,8 @@
+ CORBA::SystemException
+ ));
+
+- virtual void original_type_def (
+- IR::IDLType_ptr original_type_def,
++ virtual void original_type_def (
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -12714,121 +8002,27 @@
+ _TAO_AliasDef_Proxy_Broker *the_TAO_AliasDef_Proxy_Broker_;
+
+ protected:
+- AliasDef (int collocated = 0);
++ IR_AliasDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- AliasDef (
++ IR_AliasDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_AliasDef_Remote_Proxy_Impl;
+- friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_AliasDef_Direct_Proxy_Impl;
+-
+- virtual ~AliasDef (void);
+- private:
+- AliasDef (const AliasDef &);
+- void operator= (const AliasDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::AliasDef;
+-
+- friend class _TAO_AliasDef_Remote_Proxy_Impl;
+- friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_AliasDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::AliasDef;
+-
+- friend class _TAO_AliasDef_Remote_Proxy_Impl;
+- friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_AliasDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr original_type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_AliasDef_Remote_Proxy_Impl;
++ friend class _TAO_AliasDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_AliasDef_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_AliasDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_AliasDef_original_type_def_set &);
+- IR::IDLType_ptr original_type_def_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_AliasDef (const IR_AliasDef &);
++ void operator= (const IR_AliasDef &);
+ };
+
+
+@@ -12842,12 +8036,12 @@
+ //
+
+ class TAO_Export _TAO_AliasDef_Proxy_Impl :
+- public virtual IR::_TAO_TypedefDef_Proxy_Impl
++ public virtual _TAO_TypedefDef_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_AliasDef_Proxy_Impl (void) { }
+
+- virtual IR::IDLType_ptr original_type_def (
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12857,7 +8051,7 @@
+
+ virtual void original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -12868,6 +8062,7 @@
+ _TAO_AliasDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -12880,7 +8075,7 @@
+ class TAO_Export _TAO_AliasDef_Remote_Proxy_Impl :
+ public virtual _TAO_AliasDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl
++ public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -12888,7 +8083,7 @@
+
+ virtual ~_TAO_AliasDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::IDLType_ptr original_type_def (
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -12898,7 +8093,7 @@
+
+ virtual void original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -12927,8 +8122,9 @@
+ {
+ public:
+ virtual ~_TAO_AliasDef_Proxy_Broker (void);
++
+ virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
+- AliasDef *object,
++ IR_AliasDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -12953,9 +8149,9 @@
+ _TAO_AliasDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_AliasDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_AliasDef_Proxy_Impl &select_proxy (
+- AliasDef *object,
++ IR_AliasDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -12969,117 +8165,39 @@
+ static _TAO_AliasDef_Remote_Proxy_Broker *the_TAO_AliasDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AliasDef;
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF___PTR_CH_)
+-#define _TAO_IR_NATIVEDEF___PTR_CH_
+-
+-class NativeDef;
+-typedef NativeDef *NativeDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF___VAR_CH_)
+-#define _TAO_IR_NATIVEDEF___VAR_CH_
+-
+-class TAO_Export NativeDef_var : public TAO_Base_var
+-{
+-public:
+- NativeDef_var (void); // default constructor
+- NativeDef_var (NativeDef_ptr p) : ptr_ (p) {}
+- NativeDef_var (const NativeDef_var &); // copy constructor
+- ~NativeDef_var (void); // destructor
+-
+- NativeDef_var &operator= (NativeDef_ptr);
+- NativeDef_var &operator= (const NativeDef_var &);
+- NativeDef_ptr operator-> (void) const;
+-
+- operator const NativeDef_ptr &() const;
+- operator NativeDef_ptr &();
+- // in, inout, out, _retn
+- NativeDef_ptr in (void) const;
+- NativeDef_ptr &inout (void);
+- NativeDef_ptr &out (void);
+- NativeDef_ptr _retn (void);
+- NativeDef_ptr ptr (void) const;
+-
+-private:
+- NativeDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- NativeDef_var (const TAO_Base_var &rhs);
+- NativeDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF___OUT_CH_)
+-#define _TAO_IR_NATIVEDEF___OUT_CH_
+-
+-class TAO_Export NativeDef_out
+-{
+-public:
+- NativeDef_out (NativeDef_ptr &);
+- NativeDef_out (NativeDef_var &);
+- NativeDef_out (const NativeDef_out &);
+- NativeDef_out &operator= (const NativeDef_out &);
+- NativeDef_out &operator= (const NativeDef_var &);
+- NativeDef_out &operator= (NativeDef_ptr);
+- operator NativeDef_ptr &();
+- NativeDef_ptr &ptr (void);
+- NativeDef_ptr operator-> (void);
+-
+-private:
+- NativeDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF_CH_)
+-#define _TAO_IR_NATIVEDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_NativeDef_Proxy_Impl;
+ class _TAO_NativeDef_Remote_Proxy_Impl;
+ class _TAO_NativeDef_Proxy_Broker;
+ class _TAO_NativeDef_Remote_Proxy_Broker;
+
+-class TAO_Export NativeDef: public virtual TypedefDef
++class TAO_Export IR_NativeDef: public virtual IR_TypedefDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef NativeDef_ptr _ptr_type;
+- typedef NativeDef_var _var_type;
++ typedef IR_NativeDef_ptr _ptr_type;
++ typedef IR_NativeDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static NativeDef_ptr _duplicate (NativeDef_ptr obj);
+- static NativeDef_ptr _narrow (
++ static IR_NativeDef_ptr _duplicate (IR_NativeDef_ptr obj);
++ static IR_NativeDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static NativeDef_ptr _unchecked_narrow (
++ static IR_NativeDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static NativeDef_ptr _nil (void)
++ static IR_NativeDef_ptr _nil (void)
+ {
+- return (NativeDef_ptr)0;
++ return (IR_NativeDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -13097,60 +8215,53 @@
+ _TAO_NativeDef_Proxy_Broker *the_TAO_NativeDef_Proxy_Broker_;
+
+ protected:
+- NativeDef (int collocated = 0);
++ IR_NativeDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- NativeDef (
++ IR_NativeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_NativeDef_Remote_Proxy_Impl;
+- friend class _TAO_NativeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_NativeDef_Direct_Proxy_Impl;
++ friend class _TAO_NativeDef_Remote_Proxy_Impl;
++ friend class _TAO_NativeDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_NativeDef_Direct_Proxy_Impl;
+
+- virtual ~NativeDef (void);
+- private:
+- NativeDef (const NativeDef &);
+- void operator= (const NativeDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+- };
++ virtual ~IR_NativeDef (void);
++private:
++ IR_NativeDef (const IR_NativeDef &);
++ void operator= (const IR_NativeDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+
+-
+- ///////////////////////////////////////////////////////////////////////
+- // Base Impl. Declaration
+- //
+
+- class TAO_Export _TAO_NativeDef_Proxy_Impl :
+- public virtual IR::_TAO_TypedefDef_Proxy_Impl
+- {
+- public:
+- virtual ~_TAO_NativeDef_Proxy_Impl (void) { }
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
++
++class TAO_Export _TAO_NativeDef_Proxy_Impl :
++ public virtual _TAO_TypedefDef_Proxy_Impl
++{
++public:
++ virtual ~_TAO_NativeDef_Proxy_Impl (void) { }
+
+- protected:
+- _TAO_NativeDef_Proxy_Impl (void);
++protected:
++ _TAO_NativeDef_Proxy_Impl (void);
+
+- };
+- //
+- // Base Proxy Impl. Declaration
+- ///////////////////////////////////////////////////////////////////////
++};
++
++//
++// Base Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -13160,7 +8271,7 @@
+ class TAO_Export _TAO_NativeDef_Remote_Proxy_Impl :
+ public virtual _TAO_NativeDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl
++ public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -13168,7 +8279,7 @@
+
+ virtual ~_TAO_NativeDef_Remote_Proxy_Impl (void) { }
+
+- };
++};
+
+ //
+ // Base Proxy Impl. Declaration
+@@ -13190,8 +8301,9 @@
+ {
+ public:
+ virtual ~_TAO_NativeDef_Proxy_Broker (void);
++
+ virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
+- NativeDef *object,
++ IR_NativeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -13216,138 +8328,60 @@
+ _TAO_NativeDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_NativeDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_NativeDef_Proxy_Impl &select_proxy (
+- NativeDef *object,
++ IR_NativeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+ private:
+ _TAO_NativeDef_Remote_Proxy_Impl remote_proxy_impl_;
+-// This member function is used to get an handle to the unique instance
+-// of the Remote Proxy Broker that is available for a given
+-// interface.
+-
+-public:
+- static _TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
+ };
+
++// This funxtion is used to get an handle to the unique instance
++// of the Remote Proxy Broker that is available for a given
++// interface.
++
++_TAO_NativeDef_Remote_Proxy_Broker *the_TAO_NativeDef_Remote_Proxy_Broker (void);
+
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NativeDef;
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___PTR_CH_)
+-#define _TAO_IR_PRIMITIVEDEF___PTR_CH_
+-
+-class PrimitiveDef;
+-typedef PrimitiveDef *PrimitiveDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___VAR_CH_)
+-#define _TAO_IR_PRIMITIVEDEF___VAR_CH_
+-
+-class TAO_Export PrimitiveDef_var : public TAO_Base_var
+-{
+-public:
+- PrimitiveDef_var (void); // default constructor
+- PrimitiveDef_var (PrimitiveDef_ptr p) : ptr_ (p) {}
+- PrimitiveDef_var (const PrimitiveDef_var &); // copy constructor
+- ~PrimitiveDef_var (void); // destructor
+-
+- PrimitiveDef_var &operator= (PrimitiveDef_ptr);
+- PrimitiveDef_var &operator= (const PrimitiveDef_var &);
+- PrimitiveDef_ptr operator-> (void) const;
+-
+- operator const PrimitiveDef_ptr &() const;
+- operator PrimitiveDef_ptr &();
+- // in, inout, out, _retn
+- PrimitiveDef_ptr in (void) const;
+- PrimitiveDef_ptr &inout (void);
+- PrimitiveDef_ptr &out (void);
+- PrimitiveDef_ptr _retn (void);
+- PrimitiveDef_ptr ptr (void) const;
+-
+-private:
+- PrimitiveDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- PrimitiveDef_var (const TAO_Base_var &rhs);
+- PrimitiveDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___OUT_CH_)
+-#define _TAO_IR_PRIMITIVEDEF___OUT_CH_
+-
+-class TAO_Export PrimitiveDef_out
+-{
+-public:
+- PrimitiveDef_out (PrimitiveDef_ptr &);
+- PrimitiveDef_out (PrimitiveDef_var &);
+- PrimitiveDef_out (const PrimitiveDef_out &);
+- PrimitiveDef_out &operator= (const PrimitiveDef_out &);
+- PrimitiveDef_out &operator= (const PrimitiveDef_var &);
+- PrimitiveDef_out &operator= (PrimitiveDef_ptr);
+- operator PrimitiveDef_ptr &();
+- PrimitiveDef_ptr &ptr (void);
+- PrimitiveDef_ptr operator-> (void);
+-
+-private:
+- PrimitiveDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF_CH_)
+-#define _TAO_IR_PRIMITIVEDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_PrimitiveDef_Proxy_Impl;
+ class _TAO_PrimitiveDef_Remote_Proxy_Impl;
+ class _TAO_PrimitiveDef_Proxy_Broker;
+ class _TAO_PrimitiveDef_Remote_Proxy_Broker;
+
+-class TAO_Export PrimitiveDef: public virtual IDLType
++class TAO_Export IR_PrimitiveDef: public virtual IR_IDLType
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef PrimitiveDef_ptr _ptr_type;
+- typedef PrimitiveDef_var _var_type;
++ typedef IR_PrimitiveDef_ptr _ptr_type;
++ typedef IR_PrimitiveDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static PrimitiveDef_ptr _duplicate (PrimitiveDef_ptr obj);
+- static PrimitiveDef_ptr _narrow (
++ static IR_PrimitiveDef_ptr _duplicate (IR_PrimitiveDef_ptr obj);
++ static IR_PrimitiveDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static PrimitiveDef_ptr _unchecked_narrow (
++ static IR_PrimitiveDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static PrimitiveDef_ptr _nil (void)
++ static IR_PrimitiveDef_ptr _nil (void)
+ {
+- return (PrimitiveDef_ptr)0;
++ return (IR_PrimitiveDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::PrimitiveKind kind (
++ virtual IR_PrimitiveKind kind (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -13368,78 +8402,27 @@
+ _TAO_PrimitiveDef_Proxy_Broker *the_TAO_PrimitiveDef_Proxy_Broker_;
+
+ protected:
+- PrimitiveDef (int collocated = 0);
++ IR_PrimitiveDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- PrimitiveDef (
++ IR_PrimitiveDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
+- friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
+-
+- virtual ~PrimitiveDef (void);
+- private:
+- PrimitiveDef (const PrimitiveDef &);
+- void operator= (const PrimitiveDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::PrimitiveDef;
+-
+- friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
+- friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ );
+
+- private:
+- TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get (const TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_PrimitiveDef_kind_get &);
+- void result (IR::PrimitiveKind result);
+- // update the result
+- IR::PrimitiveKind result_;
+- };
++ friend class _TAO_PrimitiveDef_Remote_Proxy_Impl;
++ friend class _TAO_PrimitiveDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_PrimitiveDef_Direct_Proxy_Impl;
+
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
++ virtual ~IR_PrimitiveDef (void);
++private:
++ IR_PrimitiveDef (const IR_PrimitiveDef &);
++ void operator= (const IR_PrimitiveDef &);
+ };
+
+
+@@ -13453,12 +8436,12 @@
+ //
+
+ class TAO_Export _TAO_PrimitiveDef_Proxy_Impl :
+- public virtual IR::_TAO_IDLType_Proxy_Impl
++ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_PrimitiveDef_Proxy_Impl (void) { }
+
+- virtual IR::PrimitiveKind kind (
++ virtual IR_PrimitiveKind kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13470,6 +8453,7 @@
+ _TAO_PrimitiveDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -13482,7 +8466,7 @@
+ class TAO_Export _TAO_PrimitiveDef_Remote_Proxy_Impl :
+ public virtual _TAO_PrimitiveDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -13490,7 +8474,7 @@
+
+ virtual ~_TAO_PrimitiveDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::PrimitiveKind kind (
++ virtual IR_PrimitiveKind kind (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13520,8 +8504,9 @@
+ {
+ public:
+ virtual ~_TAO_PrimitiveDef_Proxy_Broker (void);
++
+ virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
+- PrimitiveDef *object,
++ IR_PrimitiveDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -13546,9 +8531,9 @@
+ _TAO_PrimitiveDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_PrimitiveDef_Proxy_Impl &select_proxy (
+- PrimitiveDef *object,
++ IR_PrimitiveDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -13562,117 +8547,39 @@
+ static _TAO_PrimitiveDef_Remote_Proxy_Broker *the_TAO_PrimitiveDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveDef;
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF___PTR_CH_)
+-#define _TAO_IR_STRINGDEF___PTR_CH_
+-
+-class StringDef;
+-typedef StringDef *StringDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF___VAR_CH_)
+-#define _TAO_IR_STRINGDEF___VAR_CH_
+-
+-class TAO_Export StringDef_var : public TAO_Base_var
+-{
+-public:
+- StringDef_var (void); // default constructor
+- StringDef_var (StringDef_ptr p) : ptr_ (p) {}
+- StringDef_var (const StringDef_var &); // copy constructor
+- ~StringDef_var (void); // destructor
+-
+- StringDef_var &operator= (StringDef_ptr);
+- StringDef_var &operator= (const StringDef_var &);
+- StringDef_ptr operator-> (void) const;
+-
+- operator const StringDef_ptr &() const;
+- operator StringDef_ptr &();
+- // in, inout, out, _retn
+- StringDef_ptr in (void) const;
+- StringDef_ptr &inout (void);
+- StringDef_ptr &out (void);
+- StringDef_ptr _retn (void);
+- StringDef_ptr ptr (void) const;
+-
+-private:
+- StringDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- StringDef_var (const TAO_Base_var &rhs);
+- StringDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF___OUT_CH_)
+-#define _TAO_IR_STRINGDEF___OUT_CH_
+-
+-class TAO_Export StringDef_out
+-{
+-public:
+- StringDef_out (StringDef_ptr &);
+- StringDef_out (StringDef_var &);
+- StringDef_out (const StringDef_out &);
+- StringDef_out &operator= (const StringDef_out &);
+- StringDef_out &operator= (const StringDef_var &);
+- StringDef_out &operator= (StringDef_ptr);
+- operator StringDef_ptr &();
+- StringDef_ptr &ptr (void);
+- StringDef_ptr operator-> (void);
+-
+-private:
+- StringDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF_CH_)
+-#define _TAO_IR_STRINGDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_StringDef_Proxy_Impl;
+ class _TAO_StringDef_Remote_Proxy_Impl;
+ class _TAO_StringDef_Proxy_Broker;
+ class _TAO_StringDef_Remote_Proxy_Broker;
+
+-class TAO_Export StringDef: public virtual IDLType
++class TAO_Export IR_StringDef: public virtual IR_IDLType
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef StringDef_ptr _ptr_type;
+- typedef StringDef_var _var_type;
++ typedef IR_StringDef_ptr _ptr_type;
++ typedef IR_StringDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static StringDef_ptr _duplicate (StringDef_ptr obj);
+- static StringDef_ptr _narrow (
++ static IR_StringDef_ptr _duplicate (IR_StringDef_ptr obj);
++ static IR_StringDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static StringDef_ptr _unchecked_narrow (
++ static IR_StringDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static StringDef_ptr _nil (void)
++ static IR_StringDef_ptr _nil (void)
+ {
+- return (StringDef_ptr)0;
++ return (IR_StringDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -13707,121 +8614,27 @@
+ _TAO_StringDef_Proxy_Broker *the_TAO_StringDef_Proxy_Broker_;
+
+ protected:
+- StringDef (int collocated = 0);
++ IR_StringDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- StringDef (
++ IR_StringDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_StringDef_Remote_Proxy_Impl;
+- friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_StringDef_Direct_Proxy_Impl;
+-
+- virtual ~StringDef (void);
+- private:
+- StringDef (const StringDef &);
+- void operator= (const StringDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_StringDef_bound_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::StringDef;
+-
+- friend class _TAO_StringDef_Remote_Proxy_Impl;
+- friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_StringDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_StringDef_bound_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_StringDef_bound_get (const TAO_ClientRequestInfo_IR_StringDef_bound_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_StringDef_bound_get &);
+- void result (CORBA::ULong result);
+- // update the result
+- CORBA::ULong result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_StringDef_bound_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::StringDef;
+-
+- friend class _TAO_StringDef_Remote_Proxy_Impl;
+- friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_StringDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_StringDef_bound_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_StringDef_Remote_Proxy_Impl;
++ friend class _TAO_StringDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_StringDef_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_StringDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_StringDef_bound_set (const TAO_ClientRequestInfo_IR_StringDef_bound_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_StringDef_bound_set &);
+- const CORBA::ULong & bound_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_StringDef (const IR_StringDef &);
++ void operator= (const IR_StringDef &);
+ };
+
+
+@@ -13835,12 +8648,12 @@
+ //
+
+ class TAO_Export _TAO_StringDef_Proxy_Impl :
+- public virtual IR::_TAO_IDLType_Proxy_Impl
++ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_StringDef_Proxy_Impl (void) { }
+
+- virtual CORBA::ULong bound (
++ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13861,6 +8674,7 @@
+ _TAO_StringDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -13873,7 +8687,7 @@
+ class TAO_Export _TAO_StringDef_Remote_Proxy_Impl :
+ public virtual _TAO_StringDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -13881,7 +8695,7 @@
+
+ virtual ~_TAO_StringDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::ULong bound (
++ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -13920,8 +8734,9 @@
+ {
+ public:
+ virtual ~_TAO_StringDef_Proxy_Broker (void);
++
+ virtual _TAO_StringDef_Proxy_Impl &select_proxy (
+- StringDef *object,
++ IR_StringDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -13946,9 +8761,9 @@
+ _TAO_StringDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_StringDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_StringDef_Proxy_Impl &select_proxy (
+- StringDef *object,
++ IR_StringDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -13962,117 +8777,39 @@
+ static _TAO_StringDef_Remote_Proxy_Broker *the_TAO_StringDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StringDef;
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___PTR_CH_)
+-#define _TAO_IR_WSTRINGDEF___PTR_CH_
+-
+-class WstringDef;
+-typedef WstringDef *WstringDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___VAR_CH_)
+-#define _TAO_IR_WSTRINGDEF___VAR_CH_
+-
+-class TAO_Export WstringDef_var : public TAO_Base_var
+-{
+-public:
+- WstringDef_var (void); // default constructor
+- WstringDef_var (WstringDef_ptr p) : ptr_ (p) {}
+- WstringDef_var (const WstringDef_var &); // copy constructor
+- ~WstringDef_var (void); // destructor
+-
+- WstringDef_var &operator= (WstringDef_ptr);
+- WstringDef_var &operator= (const WstringDef_var &);
+- WstringDef_ptr operator-> (void) const;
+-
+- operator const WstringDef_ptr &() const;
+- operator WstringDef_ptr &();
+- // in, inout, out, _retn
+- WstringDef_ptr in (void) const;
+- WstringDef_ptr &inout (void);
+- WstringDef_ptr &out (void);
+- WstringDef_ptr _retn (void);
+- WstringDef_ptr ptr (void) const;
+-
+-private:
+- WstringDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- WstringDef_var (const TAO_Base_var &rhs);
+- WstringDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___OUT_CH_)
+-#define _TAO_IR_WSTRINGDEF___OUT_CH_
+-
+-class TAO_Export WstringDef_out
+-{
+-public:
+- WstringDef_out (WstringDef_ptr &);
+- WstringDef_out (WstringDef_var &);
+- WstringDef_out (const WstringDef_out &);
+- WstringDef_out &operator= (const WstringDef_out &);
+- WstringDef_out &operator= (const WstringDef_var &);
+- WstringDef_out &operator= (WstringDef_ptr);
+- operator WstringDef_ptr &();
+- WstringDef_ptr &ptr (void);
+- WstringDef_ptr operator-> (void);
+-
+-private:
+- WstringDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF_CH_)
+-#define _TAO_IR_WSTRINGDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_WstringDef_Proxy_Impl;
+ class _TAO_WstringDef_Remote_Proxy_Impl;
+ class _TAO_WstringDef_Proxy_Broker;
+ class _TAO_WstringDef_Remote_Proxy_Broker;
+
+-class TAO_Export WstringDef: public virtual IDLType
++class TAO_Export IR_WstringDef: public virtual IR_IDLType
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef WstringDef_ptr _ptr_type;
+- typedef WstringDef_var _var_type;
++ typedef IR_WstringDef_ptr _ptr_type;
++ typedef IR_WstringDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static WstringDef_ptr _duplicate (WstringDef_ptr obj);
+- static WstringDef_ptr _narrow (
++ static IR_WstringDef_ptr _duplicate (IR_WstringDef_ptr obj);
++ static IR_WstringDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static WstringDef_ptr _unchecked_narrow (
++ static IR_WstringDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static WstringDef_ptr _nil (void)
++ static IR_WstringDef_ptr _nil (void)
+ {
+- return (WstringDef_ptr)0;
++ return (IR_WstringDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -14107,142 +8844,48 @@
+ _TAO_WstringDef_Proxy_Broker *the_TAO_WstringDef_Proxy_Broker_;
+
+ protected:
+- WstringDef (int collocated = 0);
++ IR_WstringDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- WstringDef (
++ IR_WstringDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_WstringDef_Remote_Proxy_Impl;
+- friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_WstringDef_Direct_Proxy_Impl;
++ friend class _TAO_WstringDef_Remote_Proxy_Impl;
++ friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_WstringDef_Direct_Proxy_Impl;
+
+- virtual ~WstringDef (void);
+- private:
+- WstringDef (const WstringDef &);
+- void operator= (const WstringDef &);
++ virtual ~IR_WstringDef (void);
++private:
++ IR_WstringDef (const IR_WstringDef &);
++ void operator= (const IR_WstringDef &);
++};
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_WstringDef_bound_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::WstringDef;
+-
+- friend class _TAO_WstringDef_Remote_Proxy_Impl;
+- friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_WstringDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_WstringDef_bound_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_WstringDef_bound_get (const TAO_ClientRequestInfo_IR_WstringDef_bound_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_WstringDef_bound_get &);
+- void result (CORBA::ULong result);
+- // update the result
+- CORBA::ULong result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_WstringDef_bound_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::WstringDef;
+-
+- friend class _TAO_WstringDef_Remote_Proxy_Impl;
+- friend class _TAO_WstringDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_WstringDef_Direct_Proxy_Impl;
++
++// The Proxy Implementations are used by each interface to
++// perform a call. Each different implementation encapsulate
++// an invocation logics.
++
++
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
++
++class TAO_Export _TAO_WstringDef_Proxy_Impl :
++ public virtual _TAO_IDLType_Proxy_Impl
++{
++public:
++ virtual ~_TAO_WstringDef_Proxy_Impl (void) { }
+
+- TAO_ClientRequestInfo_IR_WstringDef_bound_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_WstringDef_bound_set (const TAO_ClientRequestInfo_IR_WstringDef_bound_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_WstringDef_bound_set &);
+- const CORBA::ULong & bound_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+-};
+-
+-
+-// The Proxy Implementations are used by each interface to
+-// perform a call. Each different implementation encapsulate
+-// an invocation logics.
+-
+-
+-///////////////////////////////////////////////////////////////////////
+-// Base Impl. Declaration
+-//
+-
+-class TAO_Export _TAO_WstringDef_Proxy_Impl :
+- public virtual IR::_TAO_IDLType_Proxy_Impl
+-{
+-public:
+- virtual ~_TAO_WstringDef_Proxy_Impl (void) { }
+-
+- virtual CORBA::ULong bound (
++ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+@@ -14261,6 +8904,7 @@
+ _TAO_WstringDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -14273,7 +8917,7 @@
+ class TAO_Export _TAO_WstringDef_Remote_Proxy_Impl :
+ public virtual _TAO_WstringDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -14281,7 +8925,7 @@
+
+ virtual ~_TAO_WstringDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::ULong bound (
++ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -14320,8 +8964,9 @@
+ {
+ public:
+ virtual ~_TAO_WstringDef_Proxy_Broker (void);
++
+ virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
+- WstringDef *object,
++ IR_WstringDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -14346,9 +8991,9 @@
+ _TAO_WstringDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_WstringDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_WstringDef_Proxy_Impl &select_proxy (
+- WstringDef *object,
++ IR_WstringDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -14362,123 +9007,45 @@
+ static _TAO_WstringDef_Remote_Proxy_Broker *the_TAO_WstringDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WstringDef;
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF___PTR_CH_)
+-#define _TAO_IR_FIXEDDEF___PTR_CH_
+-
+-class FixedDef;
+-typedef FixedDef *FixedDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF___VAR_CH_)
+-#define _TAO_IR_FIXEDDEF___VAR_CH_
+-
+-class TAO_Export FixedDef_var : public TAO_Base_var
+-{
+-public:
+- FixedDef_var (void); // default constructor
+- FixedDef_var (FixedDef_ptr p) : ptr_ (p) {}
+- FixedDef_var (const FixedDef_var &); // copy constructor
+- ~FixedDef_var (void); // destructor
+-
+- FixedDef_var &operator= (FixedDef_ptr);
+- FixedDef_var &operator= (const FixedDef_var &);
+- FixedDef_ptr operator-> (void) const;
+-
+- operator const FixedDef_ptr &() const;
+- operator FixedDef_ptr &();
+- // in, inout, out, _retn
+- FixedDef_ptr in (void) const;
+- FixedDef_ptr &inout (void);
+- FixedDef_ptr &out (void);
+- FixedDef_ptr _retn (void);
+- FixedDef_ptr ptr (void) const;
+-
+-private:
+- FixedDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- FixedDef_var (const TAO_Base_var &rhs);
+- FixedDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF___OUT_CH_)
+-#define _TAO_IR_FIXEDDEF___OUT_CH_
+-
+-class TAO_Export FixedDef_out
+-{
+-public:
+- FixedDef_out (FixedDef_ptr &);
+- FixedDef_out (FixedDef_var &);
+- FixedDef_out (const FixedDef_out &);
+- FixedDef_out &operator= (const FixedDef_out &);
+- FixedDef_out &operator= (const FixedDef_var &);
+- FixedDef_out &operator= (FixedDef_ptr);
+- operator FixedDef_ptr &();
+- FixedDef_ptr &ptr (void);
+- FixedDef_ptr operator-> (void);
+-
+-private:
+- FixedDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF_CH_)
+-#define _TAO_IR_FIXEDDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_FixedDef_Proxy_Impl;
+ class _TAO_FixedDef_Remote_Proxy_Impl;
+ class _TAO_FixedDef_Proxy_Broker;
+ class _TAO_FixedDef_Remote_Proxy_Broker;
+
+-class TAO_Export FixedDef: public virtual IDLType
++class TAO_Export IR_FixedDef: public virtual IR_IDLType
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef FixedDef_ptr _ptr_type;
+- typedef FixedDef_var _var_type;
++ typedef IR_FixedDef_ptr _ptr_type;
++ typedef IR_FixedDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static FixedDef_ptr _duplicate (FixedDef_ptr obj);
+- static FixedDef_ptr _narrow (
++ static IR_FixedDef_ptr _duplicate (IR_FixedDef_ptr obj);
++ static IR_FixedDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static FixedDef_ptr _unchecked_narrow (
++ static IR_FixedDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static FixedDef_ptr _nil (void)
++ static IR_FixedDef_ptr _nil (void)
+ {
+- return (FixedDef_ptr)0;
++ return (IR_FixedDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual CORBA::UShort digits (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual CORBA::UShort digits (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+@@ -14524,207 +9091,27 @@
+ _TAO_FixedDef_Proxy_Broker *the_TAO_FixedDef_Proxy_Broker_;
+
+ protected:
+- FixedDef (int collocated = 0);
++ IR_FixedDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- FixedDef (
++ IR_FixedDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_FixedDef_Remote_Proxy_Impl;
+- friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_FixedDef_Direct_Proxy_Impl;
+-
+- virtual ~FixedDef (void);
+- private:
+- FixedDef (const FixedDef &);
+- void operator= (const FixedDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_FixedDef_digits_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::FixedDef;
+-
+- friend class _TAO_FixedDef_Remote_Proxy_Impl;
+- friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_FixedDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_FixedDef_digits_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_FixedDef_digits_get (const TAO_ClientRequestInfo_IR_FixedDef_digits_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_FixedDef_digits_get &);
+- void result (CORBA::UShort result);
+- // update the result
+- CORBA::UShort result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_FixedDef_digits_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::FixedDef;
+-
+- friend class _TAO_FixedDef_Remote_Proxy_Impl;
+- friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_FixedDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_FixedDef_digits_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::UShort & digits,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_FixedDef_digits_set (const TAO_ClientRequestInfo_IR_FixedDef_digits_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_FixedDef_digits_set &);
+- const CORBA::UShort & digits_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_FixedDef_scale_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::FixedDef;
+-
++
+ friend class _TAO_FixedDef_Remote_Proxy_Impl;
+ friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_FixedDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_FixedDef_scale_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_FixedDef_scale_get (const TAO_ClientRequestInfo_IR_FixedDef_scale_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_FixedDef_scale_get &);
+- void result (CORBA::Short result);
+- // update the result
+- CORBA::Short result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_FixedDef_scale_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::FixedDef;
+
+- friend class _TAO_FixedDef_Remote_Proxy_Impl;
+- friend class _TAO_FixedDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_FixedDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_FixedDef_scale_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Short & scale,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_FixedDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_FixedDef_scale_set (const TAO_ClientRequestInfo_IR_FixedDef_scale_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_FixedDef_scale_set &);
+- const CORBA::Short & scale_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_FixedDef (const IR_FixedDef &);
++ void operator= (const IR_FixedDef &);
+ };
+
+
+@@ -14738,12 +9125,12 @@
+ //
+
+ class TAO_Export _TAO_FixedDef_Proxy_Impl :
+- public virtual IR::_TAO_IDLType_Proxy_Impl
++ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_FixedDef_Proxy_Impl (void) { }
+
+- virtual CORBA::UShort digits (
++ virtual CORBA::UShort digits (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -14781,6 +9168,7 @@
+ _TAO_FixedDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -14793,7 +9181,7 @@
+ class TAO_Export _TAO_FixedDef_Remote_Proxy_Impl :
+ public virtual _TAO_FixedDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -14801,7 +9189,7 @@
+
+ virtual ~_TAO_FixedDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::UShort digits (
++ virtual CORBA::UShort digits (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -14857,8 +9245,9 @@
+ {
+ public:
+ virtual ~_TAO_FixedDef_Proxy_Broker (void);
++
+ virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
+- FixedDef *object,
++ IR_FixedDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -14883,9 +9272,9 @@
+ _TAO_FixedDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_FixedDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_FixedDef_Proxy_Impl &select_proxy (
+- FixedDef *object,
++ IR_FixedDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -14899,117 +9288,39 @@
+ static _TAO_FixedDef_Remote_Proxy_Broker *the_TAO_FixedDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FixedDef;
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___PTR_CH_)
+-#define _TAO_IR_SEQUENCEDEF___PTR_CH_
+-
+-class SequenceDef;
+-typedef SequenceDef *SequenceDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___VAR_CH_)
+-#define _TAO_IR_SEQUENCEDEF___VAR_CH_
+-
+-class TAO_Export SequenceDef_var : public TAO_Base_var
+-{
+-public:
+- SequenceDef_var (void); // default constructor
+- SequenceDef_var (SequenceDef_ptr p) : ptr_ (p) {}
+- SequenceDef_var (const SequenceDef_var &); // copy constructor
+- ~SequenceDef_var (void); // destructor
+-
+- SequenceDef_var &operator= (SequenceDef_ptr);
+- SequenceDef_var &operator= (const SequenceDef_var &);
+- SequenceDef_ptr operator-> (void) const;
+-
+- operator const SequenceDef_ptr &() const;
+- operator SequenceDef_ptr &();
+- // in, inout, out, _retn
+- SequenceDef_ptr in (void) const;
+- SequenceDef_ptr &inout (void);
+- SequenceDef_ptr &out (void);
+- SequenceDef_ptr _retn (void);
+- SequenceDef_ptr ptr (void) const;
+-
+-private:
+- SequenceDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- SequenceDef_var (const TAO_Base_var &rhs);
+- SequenceDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___OUT_CH_)
+-#define _TAO_IR_SEQUENCEDEF___OUT_CH_
+-
+-class TAO_Export SequenceDef_out
+-{
+-public:
+- SequenceDef_out (SequenceDef_ptr &);
+- SequenceDef_out (SequenceDef_var &);
+- SequenceDef_out (const SequenceDef_out &);
+- SequenceDef_out &operator= (const SequenceDef_out &);
+- SequenceDef_out &operator= (const SequenceDef_var &);
+- SequenceDef_out &operator= (SequenceDef_ptr);
+- operator SequenceDef_ptr &();
+- SequenceDef_ptr &ptr (void);
+- SequenceDef_ptr operator-> (void);
+-
+-private:
+- SequenceDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF_CH_)
+-#define _TAO_IR_SEQUENCEDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_SequenceDef_Proxy_Impl;
+ class _TAO_SequenceDef_Remote_Proxy_Impl;
+ class _TAO_SequenceDef_Proxy_Broker;
+ class _TAO_SequenceDef_Remote_Proxy_Broker;
+
+-class TAO_Export SequenceDef: public virtual IDLType
++class TAO_Export IR_SequenceDef: public virtual IR_IDLType
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef SequenceDef_ptr _ptr_type;
+- typedef SequenceDef_var _var_type;
++ typedef IR_SequenceDef_ptr _ptr_type;
++ typedef IR_SequenceDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static SequenceDef_ptr _duplicate (SequenceDef_ptr obj);
+- static SequenceDef_ptr _narrow (
++ static IR_SequenceDef_ptr _duplicate (IR_SequenceDef_ptr obj);
++ static IR_SequenceDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static SequenceDef_ptr _unchecked_narrow (
++ static IR_SequenceDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static SequenceDef_ptr _nil (void)
++ static IR_SequenceDef_ptr _nil (void)
+ {
+- return (SequenceDef_ptr)0;
++ return (IR_SequenceDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -15039,7 +9350,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr element_type_def (
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15048,7 +9359,7 @@
+ ));
+
+ virtual void element_type_def (
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15069,269 +9380,46 @@
+ _TAO_SequenceDef_Proxy_Broker *the_TAO_SequenceDef_Proxy_Broker_;
+
+ protected:
+- SequenceDef (int collocated = 0);
++ IR_SequenceDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- SequenceDef (
++ IR_SequenceDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_SequenceDef_Remote_Proxy_Impl;
+- friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_SequenceDef_Direct_Proxy_Impl;
++ friend class _TAO_SequenceDef_Remote_Proxy_Impl;
++ friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_SequenceDef_Direct_Proxy_Impl;
+
+- virtual ~SequenceDef (void);
+- private:
+- SequenceDef (const SequenceDef &);
+- void operator= (const SequenceDef &);
++ virtual ~IR_SequenceDef (void);
++private:
++ IR_SequenceDef (const IR_SequenceDef &);
++ void operator= (const IR_SequenceDef &);
++};
+
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_SequenceDef_bound_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::SequenceDef;
+-
+- friend class _TAO_SequenceDef_Remote_Proxy_Impl;
+- friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_SequenceDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_SequenceDef_bound_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_SequenceDef_bound_get (const TAO_ClientRequestInfo_IR_SequenceDef_bound_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_bound_get &);
+- void result (CORBA::ULong result);
+- // update the result
+- CORBA::ULong result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_SequenceDef_bound_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::SequenceDef;
+-
+- friend class _TAO_SequenceDef_Remote_Proxy_Impl;
+- friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_SequenceDef_Direct_Proxy_Impl;
++
++// The Proxy Implementations are used by each interface to
++// perform a call. Each different implementation encapsulate
++// an invocation logics.
++
++
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
++
++class TAO_Export _TAO_SequenceDef_Proxy_Impl :
++ public virtual _TAO_IDLType_Proxy_Impl
++{
++public:
++ virtual ~_TAO_SequenceDef_Proxy_Impl (void) { }
+
+- TAO_ClientRequestInfo_IR_SequenceDef_bound_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & bound,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_SequenceDef_bound_set (const TAO_ClientRequestInfo_IR_SequenceDef_bound_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_bound_set &);
+- const CORBA::ULong & bound_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_SequenceDef_element_type_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::SequenceDef;
+-
+- friend class _TAO_SequenceDef_Remote_Proxy_Impl;
+- friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_SequenceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_SequenceDef_element_type_get (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::SequenceDef;
+-
+- friend class _TAO_SequenceDef_Remote_Proxy_Impl;
+- friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_SequenceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::SequenceDef;
+-
+- friend class _TAO_SequenceDef_Remote_Proxy_Impl;
+- friend class _TAO_SequenceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_SequenceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr element_type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_SequenceDef_element_type_def_set &);
+- IR::IDLType_ptr element_type_def_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+-};
+-
+-
+-// The Proxy Implementations are used by each interface to
+-// perform a call. Each different implementation encapsulate
+-// an invocation logics.
+-
+-
+-///////////////////////////////////////////////////////////////////////
+-// Base Impl. Declaration
+-//
+-
+-class TAO_Export _TAO_SequenceDef_Proxy_Impl :
+- public virtual IR::_TAO_IDLType_Proxy_Impl
+-{
+-public:
+- virtual ~_TAO_SequenceDef_Proxy_Impl (void) { }
+-
+- virtual CORBA::ULong bound (
++ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15356,7 +9444,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::IDLType_ptr element_type_def (
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15364,9 +9452,9 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual void element_type_def (
++ virtual void element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -15377,6 +9465,8 @@
+ _TAO_SequenceDef_Proxy_Impl (void);
+
+ };
++
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -15389,7 +9479,7 @@
+ class TAO_Export _TAO_SequenceDef_Remote_Proxy_Impl :
+ public virtual _TAO_SequenceDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -15397,7 +9487,7 @@
+
+ virtual ~_TAO_SequenceDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::ULong bound (
++ virtual CORBA::ULong bound (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15414,7 +9504,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual CORBA::TypeCode_ptr element_type (
++ virtual CORBA::TypeCode_ptr element_type(
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15422,7 +9512,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr element_type_def (
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15432,7 +9522,7 @@
+
+ virtual void element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -15461,8 +9551,9 @@
+ {
+ public:
+ virtual ~_TAO_SequenceDef_Proxy_Broker (void);
++
+ virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
+- SequenceDef *object,
++ IR_SequenceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -15487,9 +9578,9 @@
+ _TAO_SequenceDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_SequenceDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_SequenceDef_Proxy_Impl &select_proxy (
+- SequenceDef *object,
++ IR_SequenceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -15503,117 +9594,39 @@
+ static _TAO_SequenceDef_Remote_Proxy_Broker *the_TAO_SequenceDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SequenceDef;
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF___PTR_CH_)
+-#define _TAO_IR_ARRAYDEF___PTR_CH_
+-
+-class ArrayDef;
+-typedef ArrayDef *ArrayDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF___VAR_CH_)
+-#define _TAO_IR_ARRAYDEF___VAR_CH_
+-
+-class TAO_Export ArrayDef_var : public TAO_Base_var
+-{
+-public:
+- ArrayDef_var (void); // default constructor
+- ArrayDef_var (ArrayDef_ptr p) : ptr_ (p) {}
+- ArrayDef_var (const ArrayDef_var &); // copy constructor
+- ~ArrayDef_var (void); // destructor
+-
+- ArrayDef_var &operator= (ArrayDef_ptr);
+- ArrayDef_var &operator= (const ArrayDef_var &);
+- ArrayDef_ptr operator-> (void) const;
+-
+- operator const ArrayDef_ptr &() const;
+- operator ArrayDef_ptr &();
+- // in, inout, out, _retn
+- ArrayDef_ptr in (void) const;
+- ArrayDef_ptr &inout (void);
+- ArrayDef_ptr &out (void);
+- ArrayDef_ptr _retn (void);
+- ArrayDef_ptr ptr (void) const;
+-
+-private:
+- ArrayDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ArrayDef_var (const TAO_Base_var &rhs);
+- ArrayDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF___OUT_CH_)
+-#define _TAO_IR_ARRAYDEF___OUT_CH_
+-
+-class TAO_Export ArrayDef_out
+-{
+-public:
+- ArrayDef_out (ArrayDef_ptr &);
+- ArrayDef_out (ArrayDef_var &);
+- ArrayDef_out (const ArrayDef_out &);
+- ArrayDef_out &operator= (const ArrayDef_out &);
+- ArrayDef_out &operator= (const ArrayDef_var &);
+- ArrayDef_out &operator= (ArrayDef_ptr);
+- operator ArrayDef_ptr &();
+- ArrayDef_ptr &ptr (void);
+- ArrayDef_ptr operator-> (void);
+-
+-private:
+- ArrayDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF_CH_)
+-#define _TAO_IR_ARRAYDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_ArrayDef_Proxy_Impl;
+ class _TAO_ArrayDef_Remote_Proxy_Impl;
+ class _TAO_ArrayDef_Proxy_Broker;
+ class _TAO_ArrayDef_Remote_Proxy_Broker;
+
+-class TAO_Export ArrayDef: public virtual IDLType
++class TAO_Export IR_ArrayDef: public virtual IR_IDLType
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ArrayDef_ptr _ptr_type;
+- typedef ArrayDef_var _var_type;
++ typedef IR_ArrayDef_ptr _ptr_type;
++ typedef IR_ArrayDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ArrayDef_ptr _duplicate (ArrayDef_ptr obj);
+- static ArrayDef_ptr _narrow (
++ static IR_ArrayDef_ptr _duplicate (IR_ArrayDef_ptr obj);
++ static IR_ArrayDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ArrayDef_ptr _unchecked_narrow (
++ static IR_ArrayDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ArrayDef_ptr _nil (void)
++ static IR_ArrayDef_ptr _nil (void)
+ {
+- return (ArrayDef_ptr)0;
++ return (IR_ArrayDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -15643,7 +9656,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr element_type_def (
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15652,7 +9665,7 @@
+ ));
+
+ virtual void element_type_def (
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -15673,250 +9686,27 @@
+ _TAO_ArrayDef_Proxy_Broker *the_TAO_ArrayDef_Proxy_Broker_;
+
+ protected:
+- ArrayDef (int collocated = 0);
++ IR_ArrayDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ArrayDef (
++ IR_ArrayDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+- friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+-
+- virtual ~ArrayDef (void);
+- private:
+- ArrayDef (const ArrayDef &);
+- void operator= (const ArrayDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ArrayDef_length_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ArrayDef;
+-
+- friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+- friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ArrayDef_length_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_ArrayDef_length_get (const TAO_ClientRequestInfo_IR_ArrayDef_length_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_length_get &);
+- void result (CORBA::ULong result);
+- // update the result
+- CORBA::ULong result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_ArrayDef_length_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ArrayDef;
+-
+- friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+- friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ArrayDef_length_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::ULong & length,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ArrayDef_length_set (const TAO_ClientRequestInfo_IR_ArrayDef_length_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_length_set &);
+- const CORBA::ULong & length_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ArrayDef_element_type_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ArrayDef;
+-
+- friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+- friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ArrayDef_element_type_get (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ArrayDef;
+-
++
+ friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+ friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ArrayDef;
+
+- friend class _TAO_ArrayDef_Remote_Proxy_Impl;
+- friend class _TAO_ArrayDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ArrayDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr element_type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_ArrayDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ArrayDef_element_type_def_set &);
+- IR::IDLType_ptr element_type_def_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_ArrayDef (const IR_ArrayDef &);
++ void operator= (const IR_ArrayDef &);
+ };
+
+
+@@ -15930,12 +9720,12 @@
+ //
+
+ class TAO_Export _TAO_ArrayDef_Proxy_Impl :
+- public virtual IR::_TAO_IDLType_Proxy_Impl
++ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ArrayDef_Proxy_Impl (void) { }
+
+- virtual CORBA::ULong length (
++ virtual CORBA::ULong length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -15960,9 +9750,9 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::IDLType_ptr element_type_def (
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+@@ -15970,7 +9760,7 @@
+
+ virtual void element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -15981,6 +9771,7 @@
+ _TAO_ArrayDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -15993,7 +9784,7 @@
+ class TAO_Export _TAO_ArrayDef_Remote_Proxy_Impl :
+ public virtual _TAO_ArrayDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -16001,7 +9792,7 @@
+
+ virtual ~_TAO_ArrayDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::ULong length (
++ virtual CORBA::ULong length (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -16018,25 +9809,25 @@
+ CORBA::SystemException
+ ));
+
+- virtual CORBA::TypeCode_ptr element_type (
++ virtual CORBA::TypeCode_ptr element_type (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr element_type_def (
++ virtual IR_IDLType_ptr element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual void element_type_def (
++ virtual void element_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr element_type_def,
++ IR_IDLType_ptr element_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -16065,8 +9856,9 @@
+ {
+ public:
+ virtual ~_TAO_ArrayDef_Proxy_Broker (void);
++
+ virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
+- ArrayDef *object,
++ IR_ArrayDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -16091,9 +9883,9 @@
+ _TAO_ArrayDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ArrayDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ArrayDef_Proxy_Impl &select_proxy (
+- ArrayDef *object,
++ IR_ArrayDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -16107,117 +9899,41 @@
+ static _TAO_ArrayDef_Remote_Proxy_Broker *the_TAO_ArrayDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
++// Forward Classes Declaration
++class _TAO_ExceptionDef_Proxy_Impl;
++class _TAO_ExceptionDef_Remote_Proxy_Impl;
++class _TAO_ExceptionDef_Proxy_Broker;
++class _TAO_ExceptionDef_Remote_Proxy_Broker;
+
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ArrayDef;
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___PTR_CH_)
+-#define _TAO_IR_EXCEPTIONDEF___PTR_CH_
+-
+-class ExceptionDef;
+-typedef ExceptionDef *ExceptionDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___VAR_CH_)
+-#define _TAO_IR_EXCEPTIONDEF___VAR_CH_
+-
+-class TAO_Export ExceptionDef_var : public TAO_Base_var
++class TAO_Export IR_ExceptionDef
++ : public virtual IR_Contained,
++ public virtual IR_Container
+ {
+ public:
+- ExceptionDef_var (void); // default constructor
+- ExceptionDef_var (ExceptionDef_ptr p) : ptr_ (p) {}
+- ExceptionDef_var (const ExceptionDef_var &); // copy constructor
+- ~ExceptionDef_var (void); // destructor
+-
+- ExceptionDef_var &operator= (ExceptionDef_ptr);
+- ExceptionDef_var &operator= (const ExceptionDef_var &);
+- ExceptionDef_ptr operator-> (void) const;
+-
+- operator const ExceptionDef_ptr &() const;
+- operator ExceptionDef_ptr &();
+- // in, inout, out, _retn
+- ExceptionDef_ptr in (void) const;
+- ExceptionDef_ptr &inout (void);
+- ExceptionDef_ptr &out (void);
+- ExceptionDef_ptr _retn (void);
+- ExceptionDef_ptr ptr (void) const;
+-
+-private:
+- ExceptionDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ExceptionDef_var (const TAO_Base_var &rhs);
+- ExceptionDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___OUT_CH_)
+-#define _TAO_IR_EXCEPTIONDEF___OUT_CH_
+-
+-class TAO_Export ExceptionDef_out
+-{
+-public:
+- ExceptionDef_out (ExceptionDef_ptr &);
+- ExceptionDef_out (ExceptionDef_var &);
+- ExceptionDef_out (const ExceptionDef_out &);
+- ExceptionDef_out &operator= (const ExceptionDef_out &);
+- ExceptionDef_out &operator= (const ExceptionDef_var &);
+- ExceptionDef_out &operator= (ExceptionDef_ptr);
+- operator ExceptionDef_ptr &();
+- ExceptionDef_ptr &ptr (void);
+- ExceptionDef_ptr operator-> (void);
+-
+-private:
+- ExceptionDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF_CH_)
+-#define _TAO_IR_EXCEPTIONDEF_CH_
+-
+-// Forward Classes Declaration
+-class _TAO_ExceptionDef_Proxy_Impl;
+-class _TAO_ExceptionDef_Remote_Proxy_Impl;
+-class _TAO_ExceptionDef_Proxy_Broker;
+-class _TAO_ExceptionDef_Remote_Proxy_Broker;
+-
+-class TAO_Export ExceptionDef: public virtual Contained, public virtual Container
+-{
+-public:
+-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ExceptionDef_ptr _ptr_type;
+- typedef ExceptionDef_var _var_type;
+-#endif /* ! __GNUC__ || g++ >= 2.8 */
++#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
++ typedef IR_ExceptionDef_ptr _ptr_type;
++ typedef IR_ExceptionDef_var _var_type;
++#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ExceptionDef_ptr _duplicate (ExceptionDef_ptr obj);
+- static ExceptionDef_ptr _narrow (
++ static IR_ExceptionDef_ptr _duplicate (IR_ExceptionDef_ptr obj);
++ static IR_ExceptionDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ExceptionDef_ptr _unchecked_narrow (
++ static IR_ExceptionDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ExceptionDef_ptr _nil (void)
++ static IR_ExceptionDef_ptr _nil (void)
+ {
+- return (ExceptionDef_ptr)0;
++ return (IR_ExceptionDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -16230,7 +9946,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::StructMemberSeq * members (
++ virtual IR_StructMemberSeq * members (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16239,7 +9955,7 @@
+ ));
+
+ virtual void members (
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -16260,164 +9976,27 @@
+ _TAO_ExceptionDef_Proxy_Broker *the_TAO_ExceptionDef_Proxy_Broker_;
+
+ protected:
+- ExceptionDef (int collocated = 0);
++ IR_ExceptionDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ExceptionDef (
++ IR_ExceptionDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
+- friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
+-
+- virtual ~ExceptionDef (void);
+- private:
+- ExceptionDef (const ExceptionDef &);
+- void operator= (const ExceptionDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ExceptionDef_type_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ExceptionDef;
+-
+- friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
+- friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ExceptionDef_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_ExceptionDef_type_get (const TAO_ClientRequestInfo_IR_ExceptionDef_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_type_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_ExceptionDef_members_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ExceptionDef;
+-
+- friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
+- friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ExceptionDef_members_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ExceptionDef_members_get (const TAO_ClientRequestInfo_IR_ExceptionDef_members_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_members_get &);
+- void result (IR::StructMemberSeq * result);
+- // update the result
+- IR::StructMemberSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ExceptionDef_members_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ExceptionDef;
+-
++
+ friend class _TAO_ExceptionDef_Remote_Proxy_Impl;
+ friend class _TAO_ExceptionDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ExceptionDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ExceptionDef_members_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::StructMemberSeq & members,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ExceptionDef_members_set (const TAO_ClientRequestInfo_IR_ExceptionDef_members_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ExceptionDef_members_set &);
+- const IR::StructMemberSeq & members_;
+
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ virtual ~IR_ExceptionDef (void);
++private:
++ IR_ExceptionDef (const IR_ExceptionDef &);
++ void operator= (const IR_ExceptionDef &);
+ };
+
+
+@@ -16431,13 +10010,13 @@
+ //
+
+ class TAO_Export _TAO_ExceptionDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl,
+- public virtual IR::_TAO_Container_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl,
++ public virtual _TAO_Container_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ExceptionDef_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -16445,17 +10024,17 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::StructMemberSeq * members (
++ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual void members (
++ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -16466,6 +10045,7 @@
+ _TAO_ExceptionDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -16478,8 +10058,8 @@
+ class TAO_Export _TAO_ExceptionDef_Remote_Proxy_Impl :
+ public virtual _TAO_ExceptionDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl,
+- public virtual IR::_TAO_Container_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl,
++ public virtual _TAO_Container_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -16487,7 +10067,7 @@
+
+ virtual ~_TAO_ExceptionDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -16495,7 +10075,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::StructMemberSeq * members (
++ virtual IR_StructMemberSeq * members (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -16505,7 +10085,7 @@
+
+ virtual void members (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::StructMemberSeq & members,
++ const IR_StructMemberSeq & members,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -16534,8 +10114,9 @@
+ {
+ public:
+ virtual ~_TAO_ExceptionDef_Proxy_Broker (void);
++
+ virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
+- ExceptionDef *object,
++ IR_ExceptionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -16560,9 +10141,9 @@
+ _TAO_ExceptionDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ExceptionDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ExceptionDef_Proxy_Impl &select_proxy (
+- ExceptionDef *object,
++ IR_ExceptionDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -16576,24 +10157,15 @@
+ static _TAO_ExceptionDef_Remote_Proxy_Broker *the_TAO_ExceptionDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDef;
+-
+-struct ExceptionDescription;
+-class ExceptionDescription_var;
+-
+-struct TAO_Export ExceptionDescription
++struct TAO_Export IR_ExceptionDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ExceptionDescription_var _var_type;
++ typedef IR_ExceptionDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -16605,61 +10177,55 @@
+ CORBA::TypeCode_var type;
+ };
+
+-class TAO_Export ExceptionDescription_var
++class TAO_Export IR_ExceptionDescription_var
+ {
+ public:
+- ExceptionDescription_var (void); // default constructor
+- ExceptionDescription_var (ExceptionDescription *);
+- ExceptionDescription_var (const ExceptionDescription_var &); // copy constructor
+- ~ExceptionDescription_var (void); // destructor
+-
+- ExceptionDescription_var &operator= (ExceptionDescription *);
+- ExceptionDescription_var &operator= (const ExceptionDescription_var &);
+- ExceptionDescription *operator-> (void);
+- const ExceptionDescription *operator-> (void) const;
+-
+- operator const ExceptionDescription &() const;
+- operator ExceptionDescription &();
+- operator ExceptionDescription &() const;
+- operator ExceptionDescription *&(); // variable-size types only
++ IR_ExceptionDescription_var (void); // default constructor
++ IR_ExceptionDescription_var (IR_ExceptionDescription *);
++ IR_ExceptionDescription_var (const IR_ExceptionDescription_var &); // copy constructor
++ ~IR_ExceptionDescription_var (void); // destructor
++
++ IR_ExceptionDescription_var &operator= (IR_ExceptionDescription *);
++ IR_ExceptionDescription_var &operator= (const IR_ExceptionDescription_var &);
++ IR_ExceptionDescription *operator-> (void);
++ const IR_ExceptionDescription *operator-> (void) const;
++
++ operator const IR_ExceptionDescription &() const;
++ operator IR_ExceptionDescription &();
++ operator IR_ExceptionDescription &() const;
++ operator IR_ExceptionDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const ExceptionDescription &in (void) const;
+- ExceptionDescription &inout (void);
+- ExceptionDescription *&out (void);
+- ExceptionDescription *_retn (void);
+- ExceptionDescription *ptr (void) const;
++ const IR_ExceptionDescription &in (void) const;
++ IR_ExceptionDescription &inout (void);
++ IR_ExceptionDescription *&out (void);
++ IR_ExceptionDescription *_retn (void);
++ IR_ExceptionDescription *ptr (void) const;
+
+ private:
+- ExceptionDescription *ptr_;
++ IR_ExceptionDescription *ptr_;
+ };
+
+-class TAO_Export ExceptionDescription_out
++class TAO_Export IR_ExceptionDescription_out
+ {
+ public:
+- ExceptionDescription_out (ExceptionDescription *&);
+- ExceptionDescription_out (ExceptionDescription_var &);
+- ExceptionDescription_out (const ExceptionDescription_out &);
+- ExceptionDescription_out &operator= (const ExceptionDescription_out &);
+- ExceptionDescription_out &operator= (ExceptionDescription *);
+- operator ExceptionDescription *&();
+- ExceptionDescription *&ptr (void);
+- ExceptionDescription *operator-> (void);
++ IR_ExceptionDescription_out (IR_ExceptionDescription *&);
++ IR_ExceptionDescription_out (IR_ExceptionDescription_var &);
++ IR_ExceptionDescription_out (const IR_ExceptionDescription_out &);
++ IR_ExceptionDescription_out &operator= (const IR_ExceptionDescription_out &);
++ IR_ExceptionDescription_out &operator= (IR_ExceptionDescription *);
++ operator IR_ExceptionDescription *&();
++ IR_ExceptionDescription *&ptr (void);
++ IR_ExceptionDescription *operator-> (void);
+
+ private:
+- ExceptionDescription *&ptr_;
++ IR_ExceptionDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ExceptionDescription_var &);
++ void operator= (const IR_ExceptionDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDescription;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CH_
+-
+ class _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -16669,19 +10235,19 @@
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ExceptionDef* *value,
++ IR_ExceptionDef* *value,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs);
+ virtual ~_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void);
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs);
+- TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var> operator[] (CORBA::ULong index) const;
+- static ExceptionDef **allocbuf (CORBA::ULong nelems);
+- static void freebuf (ExceptionDef **buffer);
++ TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var> operator[] (CORBA::ULong index) const;
++ static IR_ExceptionDef **allocbuf (CORBA::ULong nelems);
++ static void freebuf (IR_ExceptionDef **buffer);
+ // The Base_Sequence functions, please see tao/Sequence.h
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+- ExceptionDef* *get_buffer (CORBA::Boolean orphan = 0);
+- const ExceptionDef* *get_buffer (void) const;
++ IR_ExceptionDef* *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ExceptionDef* *get_buffer (void) const;
+ virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);
+ virtual void _downcast (
+ void* target,
+@@ -16693,125 +10259,94 @@
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EXCEPTIONDEFSEQ_CH_)
+-#define _TAO_IR_EXCEPTIONDEFSEQ_CH_
+-
+-class ExceptionDefSeq;
+-class ExceptionDefSeq_var;
+-
+ // *************************************************************
+-// ExceptionDefSeq
++// IR_ExceptionDefSeq
+ // *************************************************************
+
+-class TAO_Export ExceptionDefSeq : public
++class TAO_Export IR_ExceptionDefSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Object_Sequence<ExceptionDef,ExceptionDef_var>
++ TAO_Unbounded_Object_Sequence<IR_ExceptionDef,IR_ExceptionDef_var>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ExceptionDefSeq (void); // default ctor
+- ExceptionDefSeq (CORBA::ULong max); // uses max size
+- ExceptionDefSeq (
++ IR_ExceptionDefSeq (void); // default ctor
++ IR_ExceptionDefSeq (CORBA::ULong max); // uses max size
++ IR_ExceptionDefSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ExceptionDef_ptr *buffer,
++ IR_ExceptionDef_ptr *buffer,
+ CORBA::Boolean release = 0
+ );
+- ExceptionDefSeq (const ExceptionDefSeq &); // copy ctor
+- ~ExceptionDefSeq (void);
++ IR_ExceptionDefSeq (const IR_ExceptionDefSeq &); // copy ctor
++ ~IR_ExceptionDefSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ExceptionDefSeq_var _var_type;
++ typedef IR_ExceptionDefSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEFSEQ___VAR_CH_)
+-#define _TAO_IR_EXCEPTIONDEFSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ExceptionDefSeq_var
++// class IR_ExceptionDefSeq_var
+ // *************************************************************
+
+-class TAO_Export ExceptionDefSeq_var
++class TAO_Export IR_ExceptionDefSeq_var
+ {
+ public:
+- ExceptionDefSeq_var (void); // default constructor
+- ExceptionDefSeq_var (ExceptionDefSeq *);
+- ExceptionDefSeq_var (const ExceptionDefSeq_var &); // copy constructor
+- ~ExceptionDefSeq_var (void); // destructor
++ IR_ExceptionDefSeq_var (void); // default constructor
++ IR_ExceptionDefSeq_var (IR_ExceptionDefSeq *);
++ IR_ExceptionDefSeq_var (const IR_ExceptionDefSeq_var &); // copy constructor
++ ~IR_ExceptionDefSeq_var (void); // destructor
+
+- ExceptionDefSeq_var &operator= (ExceptionDefSeq *);
+- ExceptionDefSeq_var &operator= (const ExceptionDefSeq_var &);
+- ExceptionDefSeq *operator-> (void);
+- const ExceptionDefSeq *operator-> (void) const;
++ IR_ExceptionDefSeq_var &operator= (IR_ExceptionDefSeq *);
++ IR_ExceptionDefSeq_var &operator= (const IR_ExceptionDefSeq_var &);
++ IR_ExceptionDefSeq *operator-> (void);
++ const IR_ExceptionDefSeq *operator-> (void) const;
+
+- operator const ExceptionDefSeq &() const;
+- operator ExceptionDefSeq &();
+- operator ExceptionDefSeq &() const;
+- operator ExceptionDefSeq *&(); // variable-size base types only
++ operator const IR_ExceptionDefSeq &() const;
++ operator IR_ExceptionDefSeq &();
++ operator IR_ExceptionDefSeq &() const;
++ operator IR_ExceptionDefSeq *&(); // variable-size base types only
+
+- TAO_Object_Manager<ExceptionDef, ExceptionDef_var> operator[] (CORBA::ULong index);
++ TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const ExceptionDefSeq &in (void) const;
+- ExceptionDefSeq &inout (void);
+- ExceptionDefSeq *&out (void);
+- ExceptionDefSeq *_retn (void);
+- ExceptionDefSeq *ptr (void) const;
++ const IR_ExceptionDefSeq &in (void) const;
++ IR_ExceptionDefSeq &inout (void);
++ IR_ExceptionDefSeq *&out (void);
++ IR_ExceptionDefSeq *_retn (void);
++ IR_ExceptionDefSeq *ptr (void) const;
+
+ private:
+- ExceptionDefSeq *ptr_;
++ IR_ExceptionDefSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEFSEQ___OUT_CH_)
+-#define _TAO_IR_EXCEPTIONDEFSEQ___OUT_CH_
+-
+-class TAO_Export ExceptionDefSeq_out
++class TAO_Export IR_ExceptionDefSeq_out
+ {
+ public:
+- ExceptionDefSeq_out (ExceptionDefSeq *&);
+- ExceptionDefSeq_out (ExceptionDefSeq_var &);
+- ExceptionDefSeq_out (const ExceptionDefSeq_out &);
+- ExceptionDefSeq_out &operator= (const ExceptionDefSeq_out &);
+- ExceptionDefSeq_out &operator= (ExceptionDefSeq *);
+- operator ExceptionDefSeq *&();
+- ExceptionDefSeq *&ptr (void);
+- ExceptionDefSeq *operator-> (void);
+- TAO_Object_Manager<ExceptionDef, ExceptionDef_var> operator[] (CORBA::ULong index);
++ IR_ExceptionDefSeq_out (IR_ExceptionDefSeq *&);
++ IR_ExceptionDefSeq_out (IR_ExceptionDefSeq_var &);
++ IR_ExceptionDefSeq_out (const IR_ExceptionDefSeq_out &);
++ IR_ExceptionDefSeq_out &operator= (const IR_ExceptionDefSeq_out &);
++ IR_ExceptionDefSeq_out &operator= (IR_ExceptionDefSeq *);
++ operator IR_ExceptionDefSeq *&();
++ IR_ExceptionDefSeq *&ptr (void);
++ IR_ExceptionDefSeq *operator-> (void);
++ TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var> operator[] (CORBA::ULong index);
+
+ private:
+- ExceptionDefSeq *&ptr_;
++ IR_ExceptionDefSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ExceptionDefSeq_var &);
++ void operator= (const IR_ExceptionDefSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -16821,252 +10356,196 @@
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ExceptionDescription *data,
++ IR_ExceptionDescription *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void); // Dtor.
+ // = Accessors.
+- ExceptionDescription &operator[] (CORBA::ULong i);
+- const ExceptionDescription &operator[] (CORBA::ULong i) const;
++ IR_ExceptionDescription &operator[] (CORBA::ULong i);
++ const IR_ExceptionDescription &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static ExceptionDescription *allocbuf (CORBA::ULong size);
+- static void freebuf (ExceptionDescription *buffer);
++ static IR_ExceptionDescription *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_ExceptionDescription *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
+- const ExceptionDescription *get_buffer (void) const;
++ IR_ExceptionDescription *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ExceptionDescription *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- ExceptionDescription *data,
++ IR_ExceptionDescription *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EXCDESCRIPTIONSEQ_CH_)
+-#define _TAO_IR_EXCDESCRIPTIONSEQ_CH_
+-
+-class ExcDescriptionSeq;
+-class ExcDescriptionSeq_var;
+-
+ // *************************************************************
+-// ExcDescriptionSeq
++// IR_ExcDescriptionSeq
+ // *************************************************************
+
+-class TAO_Export ExcDescriptionSeq : public
++class TAO_Export IR_ExcDescriptionSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<ExceptionDescription>
++ TAO_Unbounded_Sequence<IR_ExceptionDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ExcDescriptionSeq (void); // default ctor
+- ExcDescriptionSeq (CORBA::ULong max); // uses max size
+- ExcDescriptionSeq (
++ IR_ExcDescriptionSeq (void); // default ctor
++ IR_ExcDescriptionSeq (CORBA::ULong max); // uses max size
++ IR_ExcDescriptionSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ExceptionDescription *buffer,
++ IR_ExceptionDescription *buffer,
+ CORBA::Boolean release = 0
+ );
+- ExcDescriptionSeq (const ExcDescriptionSeq &); // copy ctor
+- ~ExcDescriptionSeq (void);
++ IR_ExcDescriptionSeq (const IR_ExcDescriptionSeq &); // copy ctor
++ ~IR_ExcDescriptionSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ExcDescriptionSeq_var _var_type;
++ typedef IR_ExcDescriptionSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCDESCRIPTIONSEQ___VAR_CH_)
+-#define _TAO_IR_EXCDESCRIPTIONSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ExcDescriptionSeq_var
++// class IR_ExcDescriptionSeq_var
+ // *************************************************************
+
+-class TAO_Export ExcDescriptionSeq_var
++class TAO_Export IR_ExcDescriptionSeq_var
+ {
+ public:
+- ExcDescriptionSeq_var (void); // default constructor
+- ExcDescriptionSeq_var (ExcDescriptionSeq *);
+- ExcDescriptionSeq_var (const ExcDescriptionSeq_var &); // copy constructor
+- ~ExcDescriptionSeq_var (void); // destructor
++ IR_ExcDescriptionSeq_var (void); // default constructor
++ IR_ExcDescriptionSeq_var (IR_ExcDescriptionSeq *);
++ IR_ExcDescriptionSeq_var (const IR_ExcDescriptionSeq_var &); // copy constructor
++ ~IR_ExcDescriptionSeq_var (void); // destructor
+
+- ExcDescriptionSeq_var &operator= (ExcDescriptionSeq *);
+- ExcDescriptionSeq_var &operator= (const ExcDescriptionSeq_var &);
+- ExcDescriptionSeq *operator-> (void);
+- const ExcDescriptionSeq *operator-> (void) const;
++ IR_ExcDescriptionSeq_var &operator= (IR_ExcDescriptionSeq *);
++ IR_ExcDescriptionSeq_var &operator= (const IR_ExcDescriptionSeq_var &);
++ IR_ExcDescriptionSeq *operator-> (void);
++ const IR_ExcDescriptionSeq *operator-> (void) const;
+
+- operator const ExcDescriptionSeq &() const;
+- operator ExcDescriptionSeq &();
+- operator ExcDescriptionSeq &() const;
+- operator ExcDescriptionSeq *&(); // variable-size base types only
++ operator const IR_ExcDescriptionSeq &() const;
++ operator IR_ExcDescriptionSeq &();
++ operator IR_ExcDescriptionSeq &() const;
++ operator IR_ExcDescriptionSeq *&(); // variable-size base types only
+
+- ExceptionDescription & operator[] (CORBA::ULong index);
+- const ExceptionDescription & operator[] (CORBA::ULong index) const;
++ IR_ExceptionDescription & operator[] (CORBA::ULong index);
++ const IR_ExceptionDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const ExcDescriptionSeq &in (void) const;
+- ExcDescriptionSeq &inout (void);
+- ExcDescriptionSeq *&out (void);
+- ExcDescriptionSeq *_retn (void);
+- ExcDescriptionSeq *ptr (void) const;
++ const IR_ExcDescriptionSeq &in (void) const;
++ IR_ExcDescriptionSeq &inout (void);
++ IR_ExcDescriptionSeq *&out (void);
++ IR_ExcDescriptionSeq *_retn (void);
++ IR_ExcDescriptionSeq *ptr (void) const;
+
+ private:
+- ExcDescriptionSeq *ptr_;
++ IR_ExcDescriptionSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCDESCRIPTIONSEQ___OUT_CH_)
+-#define _TAO_IR_EXCDESCRIPTIONSEQ___OUT_CH_
+-
+-class TAO_Export ExcDescriptionSeq_out
++class TAO_Export IR_ExcDescriptionSeq_out
+ {
+ public:
+- ExcDescriptionSeq_out (ExcDescriptionSeq *&);
+- ExcDescriptionSeq_out (ExcDescriptionSeq_var &);
+- ExcDescriptionSeq_out (const ExcDescriptionSeq_out &);
+- ExcDescriptionSeq_out &operator= (const ExcDescriptionSeq_out &);
+- ExcDescriptionSeq_out &operator= (ExcDescriptionSeq *);
+- operator ExcDescriptionSeq *&();
+- ExcDescriptionSeq *&ptr (void);
+- ExcDescriptionSeq *operator-> (void);
+- ExceptionDescription & operator[] (CORBA::ULong index);
++ IR_ExcDescriptionSeq_out (IR_ExcDescriptionSeq *&);
++ IR_ExcDescriptionSeq_out (IR_ExcDescriptionSeq_var &);
++ IR_ExcDescriptionSeq_out (const IR_ExcDescriptionSeq_out &);
++ IR_ExcDescriptionSeq_out &operator= (const IR_ExcDescriptionSeq_out &);
++ IR_ExcDescriptionSeq_out &operator= (IR_ExcDescriptionSeq *);
++ operator IR_ExcDescriptionSeq *&();
++ IR_ExcDescriptionSeq *&ptr (void);
++ IR_ExcDescriptionSeq *operator-> (void);
++ IR_ExceptionDescription & operator[] (CORBA::ULong index);
+
+ private:
+- ExcDescriptionSeq *&ptr_;
++ IR_ExcDescriptionSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ExcDescriptionSeq_var &);
++ void operator= (const IR_ExcDescriptionSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
+-
+-enum AttributeMode
++enum IR_AttributeMode
+ {
+- ATTR_NORMAL,
+- ATTR_READONLY
++ ATTR_NORMAL,
++ ATTR_READONLY
+ };
+-typedef AttributeMode &AttributeMode_out;
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeMode;
+-
+
+-#if !defined (_TAO_IR_ATTRIBUTEDEF___PTR_CH_)
+-#define _TAO_IR_ATTRIBUTEDEF___PTR_CH_
+-
+-class AttributeDef;
+-typedef AttributeDef *AttributeDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ATTRIBUTEDEF___VAR_CH_)
+-#define _TAO_IR_ATTRIBUTEDEF___VAR_CH_
+-
+-class TAO_Export AttributeDef_var : public TAO_Base_var
++class TAO_Export IR_AttributeDef_var : public TAO_Base_var
+ {
+ public:
+- AttributeDef_var (void); // default constructor
+- AttributeDef_var (AttributeDef_ptr p) : ptr_ (p) {}
+- AttributeDef_var (const AttributeDef_var &); // copy constructor
+- ~AttributeDef_var (void); // destructor
++ IR_AttributeDef_var (void); // default constructor
++ IR_AttributeDef_var (IR_AttributeDef_ptr p) : ptr_ (p) {}
++ IR_AttributeDef_var (const IR_AttributeDef_var &); // copy constructor
++ ~IR_AttributeDef_var (void); // destructor
+
+- AttributeDef_var &operator= (AttributeDef_ptr);
+- AttributeDef_var &operator= (const AttributeDef_var &);
+- AttributeDef_ptr operator-> (void) const;
++ IR_AttributeDef_var &operator= (IR_AttributeDef_ptr);
++ IR_AttributeDef_var &operator= (const IR_AttributeDef_var &);
++ IR_AttributeDef_ptr operator-> (void) const;
+
+- operator const AttributeDef_ptr &() const;
+- operator AttributeDef_ptr &();
++ operator const IR_AttributeDef_ptr &() const;
++ operator IR_AttributeDef_ptr &();
+ // in, inout, out, _retn
+- AttributeDef_ptr in (void) const;
+- AttributeDef_ptr &inout (void);
+- AttributeDef_ptr &out (void);
+- AttributeDef_ptr _retn (void);
+- AttributeDef_ptr ptr (void) const;
++ IR_AttributeDef_ptr in (void) const;
++ IR_AttributeDef_ptr &inout (void);
++ IR_AttributeDef_ptr &out (void);
++ IR_AttributeDef_ptr _retn (void);
++ IR_AttributeDef_ptr ptr (void) const;
+
+ private:
+- AttributeDef_ptr ptr_;
++ IR_AttributeDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- AttributeDef_var (const TAO_Base_var &rhs);
+- AttributeDef_var &operator= (const TAO_Base_var &rhs);
++ IR_AttributeDef_var (const TAO_Base_var &rhs);
++ IR_AttributeDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ATTRIBUTEDEF___OUT_CH_)
+-#define _TAO_IR_ATTRIBUTEDEF___OUT_CH_
+-
+-class TAO_Export AttributeDef_out
++class TAO_Export IR_AttributeDef_out
+ {
+ public:
+- AttributeDef_out (AttributeDef_ptr &);
+- AttributeDef_out (AttributeDef_var &);
+- AttributeDef_out (const AttributeDef_out &);
+- AttributeDef_out &operator= (const AttributeDef_out &);
+- AttributeDef_out &operator= (const AttributeDef_var &);
+- AttributeDef_out &operator= (AttributeDef_ptr);
+- operator AttributeDef_ptr &();
+- AttributeDef_ptr &ptr (void);
+- AttributeDef_ptr operator-> (void);
++ IR_AttributeDef_out (IR_AttributeDef_ptr &);
++ IR_AttributeDef_out (IR_AttributeDef_var &);
++ IR_AttributeDef_out (const IR_AttributeDef_out &);
++ IR_AttributeDef_out &operator= (const IR_AttributeDef_out &);
++ IR_AttributeDef_out &operator= (const IR_AttributeDef_var &);
++ IR_AttributeDef_out &operator= (IR_AttributeDef_ptr);
++ operator IR_AttributeDef_ptr &();
++ IR_AttributeDef_ptr &ptr (void);
++ IR_AttributeDef_ptr operator-> (void);
+
+ private:
+- AttributeDef_ptr &ptr_;
++ IR_AttributeDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ATTRIBUTEDEF_CH_)
+-#define _TAO_IR_ATTRIBUTEDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_AttributeDef_Proxy_Impl;
+ class _TAO_AttributeDef_Remote_Proxy_Impl;
+ class _TAO_AttributeDef_Proxy_Broker;
+ class _TAO_AttributeDef_Remote_Proxy_Broker;
+
+-class TAO_Export AttributeDef: public virtual Contained
++class TAO_Export IR_AttributeDef: public virtual IR_Contained
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef AttributeDef_ptr _ptr_type;
+- typedef AttributeDef_var _var_type;
++ typedef IR_AttributeDef_ptr _ptr_type;
++ typedef IR_AttributeDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static AttributeDef_ptr _duplicate (AttributeDef_ptr obj);
+- static AttributeDef_ptr _narrow (
++ static IR_AttributeDef_ptr _duplicate (IR_AttributeDef_ptr obj);
++ static IR_AttributeDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static AttributeDef_ptr _unchecked_narrow (
++ static IR_AttributeDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static AttributeDef_ptr _nil (void)
++ static IR_AttributeDef_ptr _nil (void)
+ {
+- return (AttributeDef_ptr)0;
++ return (IR_AttributeDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -17079,7 +10558,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17088,7 +10567,7 @@
+ ));
+
+ virtual void type_def (
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17096,7 +10575,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::AttributeMode mode (
++ virtual IR_AttributeMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17105,7 +10584,7 @@
+ ));
+
+ virtual void mode (
+- IR::AttributeMode mode,
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -17126,250 +10605,27 @@
+ _TAO_AttributeDef_Proxy_Broker *the_TAO_AttributeDef_Proxy_Broker_;
+
+ protected:
+- AttributeDef (int collocated = 0);
++ IR_AttributeDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- AttributeDef (
++ IR_AttributeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+- friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+-
+- virtual ~AttributeDef (void);
+- private:
+- AttributeDef (const AttributeDef &);
+- void operator= (const AttributeDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_AttributeDef_type_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::AttributeDef;
+-
+- friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+- friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_AttributeDef_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_AttributeDef_type_get (const TAO_ClientRequestInfo_IR_AttributeDef_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_type_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_AttributeDef_type_def_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::AttributeDef;
+-
+- friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+- friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_AttributeDef_type_def_get (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_AttributeDef_type_def_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::AttributeDef;
+-
+- friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+- friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_AttributeDef_type_def_set (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_type_def_set &);
+- IR::IDLType_ptr type_def_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_AttributeDef_mode_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::AttributeDef;
+-
++
+ friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+ friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_AttributeDef_mode_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_AttributeDef_mode_get (const TAO_ClientRequestInfo_IR_AttributeDef_mode_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_mode_get &);
+- void result (IR::AttributeMode result);
+- // update the result
+- IR::AttributeMode result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_AttributeDef_mode_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::AttributeDef;
+
+- friend class _TAO_AttributeDef_Remote_Proxy_Impl;
+- friend class _TAO_AttributeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_AttributeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_AttributeDef_mode_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::AttributeMode & mode,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_AttributeDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_AttributeDef_mode_set (const TAO_ClientRequestInfo_IR_AttributeDef_mode_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_AttributeDef_mode_set &);
+- const IR::AttributeMode & mode_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_AttributeDef (const IR_AttributeDef &);
++ void operator= (const IR_AttributeDef &);
+ };
+
+
+@@ -17383,12 +10639,12 @@
+ //
+
+ class TAO_Export _TAO_AttributeDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_AttributeDef_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17396,7 +10652,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::IDLType_ptr type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17406,14 +10662,14 @@
+
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::AttributeMode mode (
++ virtual IR_AttributeMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17423,7 +10679,7 @@
+
+ virtual void mode (
+ CORBA_Object *_collocated_tao_target_,
+- IR::AttributeMode mode,
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -17434,6 +10690,7 @@
+ _TAO_AttributeDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -17446,7 +10703,7 @@
+ class TAO_Export _TAO_AttributeDef_Remote_Proxy_Impl :
+ public virtual _TAO_AttributeDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -17454,7 +10711,7 @@
+
+ virtual ~_TAO_AttributeDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17462,7 +10719,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17472,14 +10729,14 @@
+
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::AttributeMode mode (
++ virtual IR_AttributeMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -17489,7 +10746,7 @@
+
+ virtual void mode (
+ CORBA_Object *_collocated_tao_target_,
+- IR::AttributeMode mode,
++ IR_AttributeMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -17518,8 +10775,9 @@
+ {
+ public:
+ virtual ~_TAO_AttributeDef_Proxy_Broker (void);
++
+ virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
+- AttributeDef *object,
++ IR_AttributeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -17544,9 +10802,9 @@
+ _TAO_AttributeDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_AttributeDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_AttributeDef_Proxy_Impl &select_proxy (
+- AttributeDef *object,
++ IR_AttributeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -17560,24 +10818,15 @@
+ static _TAO_AttributeDef_Remote_Proxy_Broker *the_TAO_AttributeDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDef;
+-
+-struct AttributeDescription;
+-class AttributeDescription_var;
+-
+-struct TAO_Export AttributeDescription
++struct TAO_Export IR_AttributeDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef AttributeDescription_var _var_type;
++ typedef IR_AttributeDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -17587,150 +10836,135 @@
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+ CORBA::TypeCode_var type;
+- ACE_NESTED_CLASS (IR, AttributeMode) mode;
+- ACE_NESTED_CLASS (IR, ExcDescriptionSeq) get_exceptions;
+- ACE_NESTED_CLASS (IR, ExcDescriptionSeq) put_exceptions;
++ IR_AttributeMode mode;
++ IR_ExcDescriptionSeq get_exceptions;
++ IR_ExcDescriptionSeq put_exceptions;
+ };
+
+-class TAO_Export AttributeDescription_var
++class TAO_Export IR_AttributeDescription_var
+ {
+ public:
+- AttributeDescription_var (void); // default constructor
+- AttributeDescription_var (AttributeDescription *);
+- AttributeDescription_var (const AttributeDescription_var &); // copy constructor
+- ~AttributeDescription_var (void); // destructor
++ IR_AttributeDescription_var (void); // default constructor
++ IR_AttributeDescription_var (IR_AttributeDescription *);
++ IR_AttributeDescription_var (const IR_AttributeDescription_var &); // copy constructor
++ ~IR_AttributeDescription_var (void); // destructor
+
+- AttributeDescription_var &operator= (AttributeDescription *);
+- AttributeDescription_var &operator= (const AttributeDescription_var &);
+- AttributeDescription *operator-> (void);
+- const AttributeDescription *operator-> (void) const;
++ IR_AttributeDescription_var &operator= (IR_AttributeDescription *);
++ IR_AttributeDescription_var &operator= (const IR_AttributeDescription_var &);
++ IR_AttributeDescription *operator-> (void);
++ const IR_AttributeDescription *operator-> (void) const;
+
+- operator const AttributeDescription &() const;
+- operator AttributeDescription &();
+- operator AttributeDescription &() const;
+- operator AttributeDescription *&(); // variable-size types only
++ operator const IR_AttributeDescription &() const;
++ operator IR_AttributeDescription &();
++ operator IR_AttributeDescription &() const;
++ operator IR_AttributeDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const AttributeDescription &in (void) const;
+- AttributeDescription &inout (void);
+- AttributeDescription *&out (void);
+- AttributeDescription *_retn (void);
+- AttributeDescription *ptr (void) const;
++ const IR_AttributeDescription &in (void) const;
++ IR_AttributeDescription &inout (void);
++ IR_AttributeDescription *&out (void);
++ IR_AttributeDescription *_retn (void);
++ IR_AttributeDescription *ptr (void) const;
+
+ private:
+- AttributeDescription *ptr_;
++ IR_AttributeDescription *ptr_;
+ };
+
+-class TAO_Export AttributeDescription_out
++class TAO_Export IR_AttributeDescription_out
+ {
+ public:
+- AttributeDescription_out (AttributeDescription *&);
+- AttributeDescription_out (AttributeDescription_var &);
+- AttributeDescription_out (const AttributeDescription_out &);
+- AttributeDescription_out &operator= (const AttributeDescription_out &);
+- AttributeDescription_out &operator= (AttributeDescription *);
+- operator AttributeDescription *&();
+- AttributeDescription *&ptr (void);
+- AttributeDescription *operator-> (void);
++ IR_AttributeDescription_out (IR_AttributeDescription *&);
++ IR_AttributeDescription_out (IR_AttributeDescription_var &);
++ IR_AttributeDescription_out (const IR_AttributeDescription_out &);
++ IR_AttributeDescription_out &operator= (const IR_AttributeDescription_out &);
++ IR_AttributeDescription_out &operator= (IR_AttributeDescription *);
++ operator IR_AttributeDescription *&();
++ IR_AttributeDescription *&ptr (void);
++ IR_AttributeDescription *operator-> (void);
+
+ private:
+- AttributeDescription *&ptr_;
++ IR_AttributeDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const AttributeDescription_var &);
++ void operator= (const IR_AttributeDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDescription;
+-
+-enum OperationMode
+-{
++enum IR_OperationMode
++ {
+ OP_NORMAL,
+- OP_ONEWAY
+-};
+-typedef OperationMode &OperationMode_out;
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
++ OP_ONEWAY
++ };
+
+-enum ParameterMode
+-{
++enum IR_ParameterMode
++ {
+ PARAM_IN,
+ PARAM_OUT,
+- PARAM_INOUT
+-};
+-typedef ParameterMode &ParameterMode_out;
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
+-
+-struct ParameterDescription;
+-class ParameterDescription_var;
++ PARAM_INOUT
++ };
+
+-struct TAO_Export ParameterDescription
++struct TAO_Export IR_ParameterDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ParameterDescription_var _var_type;
++ typedef IR_ParameterDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+
+ TAO_String_Manager name;
+ CORBA::TypeCode_var type;
+- ACE_NESTED_CLASS (IR, IDLType_var) type_def;
+- ACE_NESTED_CLASS (IR, ParameterMode) mode;
++ IR_IDLType_var type_def;
++ IR_ParameterMode mode;
+ };
+
+-class TAO_Export ParameterDescription_var
++class TAO_Export IR_ParameterDescription_var
+ {
+ public:
+- ParameterDescription_var (void); // default constructor
+- ParameterDescription_var (ParameterDescription *);
+- ParameterDescription_var (const ParameterDescription_var &); // copy constructor
+- ~ParameterDescription_var (void); // destructor
++ IR_ParameterDescription_var (void); // default constructor
++ IR_ParameterDescription_var (IR_ParameterDescription *);
++ IR_ParameterDescription_var (const IR_ParameterDescription_var &); // copy constructor
++ ~IR_ParameterDescription_var (void); // destructor
+
+- ParameterDescription_var &operator= (ParameterDescription *);
+- ParameterDescription_var &operator= (const ParameterDescription_var &);
+- ParameterDescription *operator-> (void);
+- const ParameterDescription *operator-> (void) const;
++ IR_ParameterDescription_var &operator= (IR_ParameterDescription *);
++ IR_ParameterDescription_var &operator= (const IR_ParameterDescription_var &);
++ IR_ParameterDescription *operator-> (void);
++ const IR_ParameterDescription *operator-> (void) const;
+
+- operator const ParameterDescription &() const;
+- operator ParameterDescription &();
+- operator ParameterDescription &() const;
+- operator ParameterDescription *&(); // variable-size types only
++ operator const IR_ParameterDescription &() const;
++ operator IR_ParameterDescription &();
++ operator IR_ParameterDescription &() const;
++ operator IR_ParameterDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const ParameterDescription &in (void) const;
+- ParameterDescription &inout (void);
+- ParameterDescription *&out (void);
+- ParameterDescription *_retn (void);
+- ParameterDescription *ptr (void) const;
++ const IR_ParameterDescription &in (void) const;
++ IR_ParameterDescription &inout (void);
++ IR_ParameterDescription *&out (void);
++ IR_ParameterDescription *_retn (void);
++ IR_ParameterDescription *ptr (void) const;
+
+ private:
+- ParameterDescription *ptr_;
++ IR_ParameterDescription *ptr_;
+ };
+
+-class TAO_Export ParameterDescription_out
++class TAO_Export IR_ParameterDescription_out
+ {
+ public:
+- ParameterDescription_out (ParameterDescription *&);
+- ParameterDescription_out (ParameterDescription_var &);
+- ParameterDescription_out (const ParameterDescription_out &);
+- ParameterDescription_out &operator= (const ParameterDescription_out &);
+- ParameterDescription_out &operator= (ParameterDescription *);
+- operator ParameterDescription *&();
+- ParameterDescription *&ptr (void);
+- ParameterDescription *operator-> (void);
++ IR_ParameterDescription_out (IR_ParameterDescription *&);
++ IR_ParameterDescription_out (IR_ParameterDescription_var &);
++ IR_ParameterDescription_out (const IR_ParameterDescription_out &);
++ IR_ParameterDescription_out &operator= (const IR_ParameterDescription_out &);
++ IR_ParameterDescription_out &operator= (IR_ParameterDescription *);
++ operator IR_ParameterDescription *&();
++ IR_ParameterDescription *&ptr (void);
++ IR_ParameterDescription *operator-> (void);
+
+ private:
+- ParameterDescription *&ptr_;
++ IR_ParameterDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ParameterDescription_var &);
++ void operator= (const IR_ParameterDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterDescription;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ParDescriptionSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -17740,160 +10974,121 @@
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ParameterDescription *data,
++ IR_ParameterDescription *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void); // Dtor.
+ // = Accessors.
+- ParameterDescription &operator[] (CORBA::ULong i);
+- const ParameterDescription &operator[] (CORBA::ULong i) const;
++ IR_ParameterDescription &operator[] (CORBA::ULong i);
++ const IR_ParameterDescription &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static ParameterDescription *allocbuf (CORBA::ULong size);
+- static void freebuf (ParameterDescription *buffer);
++ static IR_ParameterDescription *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_ParameterDescription *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
+- const ParameterDescription *get_buffer (void) const;
++ IR_ParameterDescription *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ParameterDescription *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- ParameterDescription *data,
++ IR_ParameterDescription *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PARDESCRIPTIONSEQ_CH_)
+-#define _TAO_IR_PARDESCRIPTIONSEQ_CH_
+-
+-class ParDescriptionSeq;
+-class ParDescriptionSeq_var;
+-
+ // *************************************************************
+-// ParDescriptionSeq
++// IR_ParDescriptionSeq
+ // *************************************************************
+
+-class TAO_Export ParDescriptionSeq : public
++class TAO_Export IR_ParDescriptionSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<ParameterDescription>
++ TAO_Unbounded_Sequence<IR_ParameterDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ParDescriptionSeq (void); // default ctor
+- ParDescriptionSeq (CORBA::ULong max); // uses max size
+- ParDescriptionSeq (
++ IR_ParDescriptionSeq (void); // default ctor
++ IR_ParDescriptionSeq (CORBA::ULong max); // uses max size
++ IR_ParDescriptionSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ParameterDescription *buffer,
++ IR_ParameterDescription *buffer,
+ CORBA::Boolean release = 0
+ );
+- ParDescriptionSeq (const ParDescriptionSeq &); // copy ctor
+- ~ParDescriptionSeq (void);
++ IR_ParDescriptionSeq (const IR_ParDescriptionSeq &); // copy ctor
++ ~IR_ParDescriptionSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ParDescriptionSeq_var _var_type;
++ typedef IR_ParDescriptionSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PARDESCRIPTIONSEQ___VAR_CH_)
+-#define _TAO_IR_PARDESCRIPTIONSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ParDescriptionSeq_var
++// class IR_ParDescriptionSeq_var
+ // *************************************************************
+
+-class TAO_Export ParDescriptionSeq_var
++class TAO_Export IR_ParDescriptionSeq_var
+ {
+ public:
+- ParDescriptionSeq_var (void); // default constructor
+- ParDescriptionSeq_var (ParDescriptionSeq *);
+- ParDescriptionSeq_var (const ParDescriptionSeq_var &); // copy constructor
+- ~ParDescriptionSeq_var (void); // destructor
++ IR_ParDescriptionSeq_var (void); // default constructor
++ IR_ParDescriptionSeq_var (IR_ParDescriptionSeq *);
++ IR_ParDescriptionSeq_var (const IR_ParDescriptionSeq_var &); // copy constructor
++ ~IR_ParDescriptionSeq_var (void); // destructor
+
+- ParDescriptionSeq_var &operator= (ParDescriptionSeq *);
+- ParDescriptionSeq_var &operator= (const ParDescriptionSeq_var &);
+- ParDescriptionSeq *operator-> (void);
+- const ParDescriptionSeq *operator-> (void) const;
++ IR_ParDescriptionSeq_var &operator= (IR_ParDescriptionSeq *);
++ IR_ParDescriptionSeq_var &operator= (const IR_ParDescriptionSeq_var &);
++ IR_ParDescriptionSeq *operator-> (void);
++ const IR_ParDescriptionSeq *operator-> (void) const;
+
+- operator const ParDescriptionSeq &() const;
+- operator ParDescriptionSeq &();
+- operator ParDescriptionSeq &() const;
+- operator ParDescriptionSeq *&(); // variable-size base types only
++ operator const IR_ParDescriptionSeq &() const;
++ operator IR_ParDescriptionSeq &();
++ operator IR_ParDescriptionSeq &() const;
++ operator IR_ParDescriptionSeq *&(); // variable-size base types only
+
+- ParameterDescription & operator[] (CORBA::ULong index);
+- const ParameterDescription & operator[] (CORBA::ULong index) const;
++ IR_ParameterDescription & operator[] (CORBA::ULong index);
++ const IR_ParameterDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const ParDescriptionSeq &in (void) const;
+- ParDescriptionSeq &inout (void);
+- ParDescriptionSeq *&out (void);
+- ParDescriptionSeq *_retn (void);
+- ParDescriptionSeq *ptr (void) const;
++ const IR_ParDescriptionSeq &in (void) const;
++ IR_ParDescriptionSeq &inout (void);
++ IR_ParDescriptionSeq *&out (void);
++ IR_ParDescriptionSeq *_retn (void);
++ IR_ParDescriptionSeq *ptr (void) const;
+
+ private:
+- ParDescriptionSeq *ptr_;
++ IR_ParDescriptionSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PARDESCRIPTIONSEQ___OUT_CH_)
+-#define _TAO_IR_PARDESCRIPTIONSEQ___OUT_CH_
+-
+-class TAO_Export ParDescriptionSeq_out
++class TAO_Export IR_ParDescriptionSeq_out
+ {
+ public:
+- ParDescriptionSeq_out (ParDescriptionSeq *&);
+- ParDescriptionSeq_out (ParDescriptionSeq_var &);
+- ParDescriptionSeq_out (const ParDescriptionSeq_out &);
+- ParDescriptionSeq_out &operator= (const ParDescriptionSeq_out &);
+- ParDescriptionSeq_out &operator= (ParDescriptionSeq *);
+- operator ParDescriptionSeq *&();
+- ParDescriptionSeq *&ptr (void);
+- ParDescriptionSeq *operator-> (void);
+- ParameterDescription & operator[] (CORBA::ULong index);
++ IR_ParDescriptionSeq_out (IR_ParDescriptionSeq *&);
++ IR_ParDescriptionSeq_out (IR_ParDescriptionSeq_var &);
++ IR_ParDescriptionSeq_out (const IR_ParDescriptionSeq_out &);
++ IR_ParDescriptionSeq_out &operator= (const IR_ParDescriptionSeq_out &);
++ IR_ParDescriptionSeq_out &operator= (IR_ParDescriptionSeq *);
++ operator IR_ParDescriptionSeq *&();
++ IR_ParDescriptionSeq *&ptr (void);
++ IR_ParDescriptionSeq *operator-> (void);
++ IR_ParameterDescription & operator[] (CORBA::ULong index);
+
+ private:
+- ParDescriptionSeq *&ptr_;
++ IR_ParDescriptionSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ParDescriptionSeq_var &);
++ void operator= (const IR_ParDescriptionSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
+-
+-typedef char * ContextIdentifier;
+-typedef CORBA::String_var ContextIdentifier_var;
+-typedef CORBA::String_out ContextIdentifier_out;
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdentifier;
+-
+-
+-#if !defined (_TAO_IR_CONTEXTIDSEQ_CH_)
+-#define _TAO_IR_CONTEXTIDSEQ_CH_
+-
+-class ContextIdSeq;
+-class ContextIdSeq_var;
+-
+ // *************************************************************
+-// ContextIdSeq
++// IR_ContextIdSeq
+ // *************************************************************
+
+-class TAO_Export ContextIdSeq : public
++class TAO_Export IR_ContextIdSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+@@ -17901,210 +11096,165 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ContextIdSeq (void); // default ctor
+- ContextIdSeq (CORBA::ULong max); // uses max size
+- ContextIdSeq (
++ IR_ContextIdSeq (void); // default ctor
++ IR_ContextIdSeq (CORBA::ULong max); // uses max size
++ IR_ContextIdSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
+ CORBA::Boolean release = 0
+ );
+- ContextIdSeq (const ContextIdSeq &); // copy ctor
+- ~ContextIdSeq (void);
++ IR_ContextIdSeq (const IR_ContextIdSeq &); // copy ctor
++ ~IR_ContextIdSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ContextIdSeq_var _var_type;
++ typedef IR_ContextIdSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTEXTIDSEQ___VAR_CH_)
+-#define _TAO_IR_CONTEXTIDSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ContextIdSeq_var
++// class IR_ContextIdSeq_var
+ // *************************************************************
+
+-class TAO_Export ContextIdSeq_var
++class TAO_Export IR_ContextIdSeq_var
+ {
+ public:
+- ContextIdSeq_var (void); // default constructor
+- ContextIdSeq_var (ContextIdSeq *);
+- ContextIdSeq_var (const ContextIdSeq_var &); // copy constructor
+- ~ContextIdSeq_var (void); // destructor
++ IR_ContextIdSeq_var (void); // default constructor
++ IR_ContextIdSeq_var (IR_ContextIdSeq *);
++ IR_ContextIdSeq_var (const IR_ContextIdSeq_var &); // copy constructor
++ ~IR_ContextIdSeq_var (void); // destructor
+
+- ContextIdSeq_var &operator= (ContextIdSeq *);
+- ContextIdSeq_var &operator= (const ContextIdSeq_var &);
+- ContextIdSeq *operator-> (void);
+- const ContextIdSeq *operator-> (void) const;
++ IR_ContextIdSeq_var &operator= (IR_ContextIdSeq *);
++ IR_ContextIdSeq_var &operator= (const IR_ContextIdSeq_var &);
++ IR_ContextIdSeq *operator-> (void);
++ const IR_ContextIdSeq *operator-> (void) const;
+
+- operator const ContextIdSeq &() const;
+- operator ContextIdSeq &();
+- operator ContextIdSeq &() const;
+- operator ContextIdSeq *&(); // variable-size base types only
++ operator const IR_ContextIdSeq &() const;
++ operator IR_ContextIdSeq &();
++ operator IR_ContextIdSeq &() const;
++ operator IR_ContextIdSeq *&(); // variable-size base types only
+
+ TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const ContextIdSeq &in (void) const;
+- ContextIdSeq &inout (void);
+- ContextIdSeq *&out (void);
+- ContextIdSeq *_retn (void);
+- ContextIdSeq *ptr (void) const;
++ const IR_ContextIdSeq &in (void) const;
++ IR_ContextIdSeq &inout (void);
++ IR_ContextIdSeq *&out (void);
++ IR_ContextIdSeq *_retn (void);
++ IR_ContextIdSeq *ptr (void) const;
+
+ private:
+- ContextIdSeq *ptr_;
++ IR_ContextIdSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTEXTIDSEQ___OUT_CH_)
+-#define _TAO_IR_CONTEXTIDSEQ___OUT_CH_
+-
+-class TAO_Export ContextIdSeq_out
++class TAO_Export IR_ContextIdSeq_out
+ {
+ public:
+- ContextIdSeq_out (ContextIdSeq *&);
+- ContextIdSeq_out (ContextIdSeq_var &);
+- ContextIdSeq_out (const ContextIdSeq_out &);
+- ContextIdSeq_out &operator= (const ContextIdSeq_out &);
+- ContextIdSeq_out &operator= (ContextIdSeq *);
+- operator ContextIdSeq *&();
+- ContextIdSeq *&ptr (void);
+- ContextIdSeq *operator-> (void);
++ IR_ContextIdSeq_out (IR_ContextIdSeq *&);
++ IR_ContextIdSeq_out (IR_ContextIdSeq_var &);
++ IR_ContextIdSeq_out (const IR_ContextIdSeq_out &);
++ IR_ContextIdSeq_out &operator= (const IR_ContextIdSeq_out &);
++ IR_ContextIdSeq_out &operator= (IR_ContextIdSeq *);
++ operator IR_ContextIdSeq *&();
++ IR_ContextIdSeq *&ptr (void);
++ IR_ContextIdSeq *operator-> (void);
+ TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+ private:
+- ContextIdSeq *&ptr_;
++ IR_ContextIdSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ContextIdSeq_var &);
++ void operator= (const IR_ContextIdSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdSeq;
+-
+-
+-#if !defined (_TAO_IR_OPERATIONDEF___PTR_CH_)
+-#define _TAO_IR_OPERATIONDEF___PTR_CH_
+-
+-class OperationDef;
+-typedef OperationDef *OperationDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_OPERATIONDEF___VAR_CH_)
+-#define _TAO_IR_OPERATIONDEF___VAR_CH_
+-
+-class TAO_Export OperationDef_var : public TAO_Base_var
++class TAO_Export IR_OperationDef_var : public TAO_Base_var
+ {
+ public:
+- OperationDef_var (void); // default constructor
+- OperationDef_var (OperationDef_ptr p) : ptr_ (p) {}
+- OperationDef_var (const OperationDef_var &); // copy constructor
+- ~OperationDef_var (void); // destructor
++ IR_OperationDef_var (void); // default constructor
++ IR_OperationDef_var (IR_OperationDef_ptr p) : ptr_ (p) {}
++ IR_OperationDef_var (const IR_OperationDef_var &); // copy constructor
++ ~IR_OperationDef_var (void); // destructor
+
+- OperationDef_var &operator= (OperationDef_ptr);
+- OperationDef_var &operator= (const OperationDef_var &);
+- OperationDef_ptr operator-> (void) const;
++ IR_OperationDef_var &operator= (IR_OperationDef_ptr);
++ IR_OperationDef_var &operator= (const IR_OperationDef_var &);
++ IR_OperationDef_ptr operator-> (void) const;
+
+- operator const OperationDef_ptr &() const;
+- operator OperationDef_ptr &();
++ operator const IR_OperationDef_ptr &() const;
++ operator IR_OperationDef_ptr &();
+ // in, inout, out, _retn
+- OperationDef_ptr in (void) const;
+- OperationDef_ptr &inout (void);
+- OperationDef_ptr &out (void);
+- OperationDef_ptr _retn (void);
+- OperationDef_ptr ptr (void) const;
++ IR_OperationDef_ptr in (void) const;
++ IR_OperationDef_ptr &inout (void);
++ IR_OperationDef_ptr &out (void);
++ IR_OperationDef_ptr _retn (void);
++ IR_OperationDef_ptr ptr (void) const;
+
+ private:
+- OperationDef_ptr ptr_;
++ IR_OperationDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- OperationDef_var (const TAO_Base_var &rhs);
+- OperationDef_var &operator= (const TAO_Base_var &rhs);
++ IR_OperationDef_var (const TAO_Base_var &rhs);
++ IR_OperationDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_OPERATIONDEF___OUT_CH_)
+-#define _TAO_IR_OPERATIONDEF___OUT_CH_
+-
+-class TAO_Export OperationDef_out
++class TAO_Export IR_OperationDef_out
+ {
+ public:
+- OperationDef_out (OperationDef_ptr &);
+- OperationDef_out (OperationDef_var &);
+- OperationDef_out (const OperationDef_out &);
+- OperationDef_out &operator= (const OperationDef_out &);
+- OperationDef_out &operator= (const OperationDef_var &);
+- OperationDef_out &operator= (OperationDef_ptr);
+- operator OperationDef_ptr &();
+- OperationDef_ptr &ptr (void);
+- OperationDef_ptr operator-> (void);
++ IR_OperationDef_out (IR_OperationDef_ptr &);
++ IR_OperationDef_out (IR_OperationDef_var &);
++ IR_OperationDef_out (const IR_OperationDef_out &);
++ IR_OperationDef_out &operator= (const IR_OperationDef_out &);
++ IR_OperationDef_out &operator= (const IR_OperationDef_var &);
++ IR_OperationDef_out &operator= (IR_OperationDef_ptr);
++ operator IR_OperationDef_ptr &();
++ IR_OperationDef_ptr &ptr (void);
++ IR_OperationDef_ptr operator-> (void);
+
+ private:
+- OperationDef_ptr &ptr_;
++ IR_OperationDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_OPERATIONDEF_CH_)
+-#define _TAO_IR_OPERATIONDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_OperationDef_Proxy_Impl;
+ class _TAO_OperationDef_Remote_Proxy_Impl;
+ class _TAO_OperationDef_Proxy_Broker;
+ class _TAO_OperationDef_Remote_Proxy_Broker;
+
+-class TAO_Export OperationDef: public virtual Contained
++class TAO_Export IR_OperationDef: public virtual IR_Contained
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef OperationDef_ptr _ptr_type;
+- typedef OperationDef_var _var_type;
++ typedef IR_OperationDef_ptr _ptr_type;
++ typedef IR_OperationDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static OperationDef_ptr _duplicate (OperationDef_ptr obj);
+- static OperationDef_ptr _narrow (
++ static IR_OperationDef_ptr _duplicate (IR_OperationDef_ptr obj);
++ static IR_OperationDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static OperationDef_ptr _unchecked_narrow (
++ static IR_OperationDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static OperationDef_ptr _nil (void)
++ static IR_OperationDef_ptr _nil (void)
+ {
+- return (OperationDef_ptr)0;
++ return (IR_OperationDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual CORBA::TypeCode_ptr result (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual CORBA::TypeCode_ptr result (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr result_def (
++ virtual IR_IDLType_ptr result_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18113,7 +11263,7 @@
+ ));
+
+ virtual void result_def (
+- IR::IDLType_ptr result_def,
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18121,7 +11271,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ParDescriptionSeq * params (
++ virtual IR_ParDescriptionSeq * params (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18130,7 +11280,7 @@
+ ));
+
+ virtual void params (
+- const IR::ParDescriptionSeq & params,
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18138,7 +11288,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::OperationMode mode (
++ virtual IR_OperationMode mode (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18147,7 +11297,7 @@
+ ));
+
+ virtual void mode (
+- IR::OperationMode mode,
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18155,7 +11305,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ContextIdSeq * contexts (
++ virtual IR_ContextIdSeq * contexts (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18164,7 +11314,7 @@
+ ));
+
+ virtual void contexts (
+- const IR::ContextIdSeq & contexts,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18172,7 +11322,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ExceptionDefSeq * exceptions (
++ virtual IR_ExceptionDefSeq * exceptions (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18181,7 +11331,7 @@
+ ));
+
+ virtual void exceptions (
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -18202,652 +11352,172 @@
+ _TAO_OperationDef_Proxy_Broker *the_TAO_OperationDef_Proxy_Broker_;
+
+ protected:
+- OperationDef (int collocated = 0);
++ IR_OperationDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- OperationDef (
++ IR_OperationDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+- virtual ~OperationDef (void);
+- private:
+- OperationDef (const OperationDef &);
+- void operator= (const OperationDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_OperationDef_result_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_OperationDef_result_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_OperationDef_result_get (const TAO_ClientRequestInfo_IR_OperationDef_result_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_result_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_OperationDef_result_def_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_OperationDef_result_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_result_def_get (const TAO_ClientRequestInfo_IR_OperationDef_result_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_result_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_OperationDef_result_def_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::OperationDef;
+-
++
+ friend class _TAO_OperationDef_Remote_Proxy_Impl;
+ friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_OperationDef_Direct_Proxy_Impl;
++
++ virtual ~IR_OperationDef (void);
++private:
++ IR_OperationDef (const IR_OperationDef &);
++ void operator= (const IR_OperationDef &);
++};
+
+-TAO_ClientRequestInfo_IR_OperationDef_result_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr result_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++// The Proxy Implementations are used by each interface to
++// perform a call. Each different implementation encapsulate
++// an invocation logics.
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_result_def_set (const TAO_ClientRequestInfo_IR_OperationDef_result_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_result_def_set &);
+- IR::IDLType_ptr result_def_;
+-
+-};
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
+
+-class TAO_ClientRequestInfo_IR_OperationDef_params_get : public TAO_ClientRequestInfo
++class TAO_Export _TAO_OperationDef_Proxy_Impl :
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+- friend class IR::OperationDef;
++ virtual ~_TAO_OperationDef_Proxy_Impl (void) { }
+
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_OperationDef_params_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual CORBA::TypeCode_ptr result (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual IR_IDLType_ptr result_def (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual void result_def (
++ CORBA_Object *_collocated_tao_target_,
++ IR_IDLType_ptr result_def,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_params_get (const TAO_ClientRequestInfo_IR_OperationDef_params_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_params_get &);
+- void result (IR::ParDescriptionSeq * result);
+- // update the result
+- IR::ParDescriptionSeq * result_;
+-};
++ virtual IR_ParDescriptionSeq * params (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-class TAO_ClientRequestInfo_IR_OperationDef_params_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
++ virtual void params (
++ CORBA_Object *_collocated_tao_target_,
++ const IR_ParDescriptionSeq & params,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-TAO_ClientRequestInfo_IR_OperationDef_params_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::ParDescriptionSeq & params,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
++ virtual IR_OperationMode mode (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual void mode (
++ CORBA_Object *_collocated_tao_target_,
++ IR_OperationMode mode,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual IR_ContextIdSeq * contexts (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual void contexts (
++ CORBA_Object *_collocated_tao_target_,
++ const IR_ContextIdSeq & contexts,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_params_set (const TAO_ClientRequestInfo_IR_OperationDef_params_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_params_set &);
+- const IR::ParDescriptionSeq & params_;
+-
+-};
++ virtual IR_ExceptionDefSeq * exceptions (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-class TAO_ClientRequestInfo_IR_OperationDef_mode_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
++ virtual void exceptions (
++ CORBA_Object *_collocated_tao_target_,
++ const IR_ExceptionDefSeq & exceptions,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-TAO_ClientRequestInfo_IR_OperationDef_mode_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
++protected:
++ _TAO_OperationDef_Proxy_Impl (void);
+
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++};
+
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++//
++// Base Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_mode_get (const TAO_ClientRequestInfo_IR_OperationDef_mode_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_mode_get &);
+- void result (IR::OperationMode result);
+- // update the result
+- IR::OperationMode result_;
+-};
++///////////////////////////////////////////////////////////////////////
++// Remote Impl. Declaration
++//
+
+-class TAO_ClientRequestInfo_IR_OperationDef_mode_set : public TAO_ClientRequestInfo
++class TAO_Export _TAO_OperationDef_Remote_Proxy_Impl :
++ public virtual _TAO_OperationDef_Proxy_Impl,
++ public virtual TAO_Remote_Object_Proxy_Impl,
++ public virtual _TAO_Contained_Remote_Proxy_Impl
++
+ {
+ public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_OperationDef_mode_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::OperationMode & mode,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_mode_set (const TAO_ClientRequestInfo_IR_OperationDef_mode_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_mode_set &);
+- const IR::OperationMode & mode_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_OperationDef_contexts_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_OperationDef_contexts_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_contexts_get (const TAO_ClientRequestInfo_IR_OperationDef_contexts_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_contexts_get &);
+- void result (IR::ContextIdSeq * result);
+- // update the result
+- IR::ContextIdSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_OperationDef_contexts_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_OperationDef_contexts_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_contexts_set (const TAO_ClientRequestInfo_IR_OperationDef_contexts_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_contexts_set &);
+- const IR::ContextIdSeq & contexts_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_OperationDef_exceptions_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_exceptions_get (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_get &);
+- void result (IR::ExceptionDefSeq * result);
+- // update the result
+- IR::ExceptionDefSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_OperationDef_exceptions_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::OperationDef;
+-
+- friend class _TAO_OperationDef_Remote_Proxy_Impl;
+- friend class _TAO_OperationDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_OperationDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::ExceptionDefSeq & exceptions,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_OperationDef_exceptions_set (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_OperationDef_exceptions_set &);
+- const IR::ExceptionDefSeq & exceptions_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+-};
+-
+-
+-// The Proxy Implementations are used by each interface to
+-// perform a call. Each different implementation encapsulate
+-// an invocation logics.
+-
+-
+-///////////////////////////////////////////////////////////////////////
+-// Base Impl. Declaration
+-//
+-
+-class TAO_Export _TAO_OperationDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl
+-{
+-public:
+- virtual ~_TAO_OperationDef_Proxy_Impl (void) { }
+-
+- virtual CORBA::TypeCode_ptr result (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual IR::IDLType_ptr result_def (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void result_def (
+- CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr result_def,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual IR::ParDescriptionSeq * params (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void params (
+- CORBA_Object *_collocated_tao_target_,
+- const IR::ParDescriptionSeq & params,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual IR::OperationMode mode (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void mode (
+- CORBA_Object *_collocated_tao_target_,
+- IR::OperationMode mode,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual IR::ContextIdSeq * contexts (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void contexts (
+- CORBA_Object *_collocated_tao_target_,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual IR::ExceptionDefSeq * exceptions (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void exceptions (
+- CORBA_Object *_collocated_tao_target_,
+- const IR::ExceptionDefSeq & exceptions,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+-protected:
+- _TAO_OperationDef_Proxy_Impl (void);
+-
+-};
+-//
+-// Base Proxy Impl. Declaration
+-///////////////////////////////////////////////////////////////////////
+-
+-
+-///////////////////////////////////////////////////////////////////////
+-// Remote Impl. Declaration
+-//
+-
+-class TAO_Export _TAO_OperationDef_Remote_Proxy_Impl :
+- public virtual _TAO_OperationDef_Proxy_Impl,
+- public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
+-
+-{
+-public:
+- _TAO_OperationDef_Remote_Proxy_Impl (void);
++ _TAO_OperationDef_Remote_Proxy_Impl (void);
+
+ virtual ~_TAO_OperationDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr result (
++ virtual CORBA::TypeCode_ptr result (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr result_def (
++ virtual IR_IDLType_ptr result_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18857,14 +11527,14 @@
+
+ virtual void result_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr result_def,
++ IR_IDLType_ptr result_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ParDescriptionSeq * params (
++ virtual IR_ParDescriptionSeq * params (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18874,14 +11544,14 @@
+
+ virtual void params (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ParDescriptionSeq & params,
++ const IR_ParDescriptionSeq & params,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::OperationMode mode (
++ virtual IR_OperationMode mode (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18891,14 +11561,14 @@
+
+ virtual void mode (
+ CORBA_Object *_collocated_tao_target_,
+- IR::OperationMode mode,
++ IR_OperationMode mode,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ContextIdSeq * contexts (
++ virtual IR_ContextIdSeq * contexts (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18908,14 +11578,14 @@
+
+ virtual void contexts (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ContextIdSeq & contexts,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ExceptionDefSeq * exceptions (
++ virtual IR_ExceptionDefSeq * exceptions (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -18925,7 +11595,7 @@
+
+ virtual void exceptions (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -18954,8 +11624,9 @@
+ {
+ public:
+ virtual ~_TAO_OperationDef_Proxy_Broker (void);
++
+ virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
+- OperationDef *object,
++ IR_OperationDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -18980,9 +11651,9 @@
+ _TAO_OperationDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_OperationDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_OperationDef_Proxy_Impl &select_proxy (
+- OperationDef *object,
++ IR_OperationDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -18996,24 +11667,15 @@
+ static _TAO_OperationDef_Remote_Proxy_Broker *the_TAO_OperationDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDef;
+-
+-struct OperationDescription;
+-class OperationDescription_var;
+-
+-struct TAO_Export OperationDescription
++struct TAO_Export IR_OperationDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef OperationDescription_var _var_type;
++ typedef IR_OperationDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -19023,73 +11685,64 @@
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+ CORBA::TypeCode_var result;
+- ACE_NESTED_CLASS (IR, OperationMode) mode;
+- ACE_NESTED_CLASS (IR, ContextIdSeq) contexts;
+- ACE_NESTED_CLASS (IR, ParDescriptionSeq) parameters;
+- ACE_NESTED_CLASS (IR, ExcDescriptionSeq) exceptions;
++ IR_OperationMode mode;
++ IR_ContextIdSeq contexts;
++ IR_ParDescriptionSeq parameters;
++ IR_ExcDescriptionSeq exceptions;
+ };
+
+-class TAO_Export OperationDescription_var
++class TAO_Export IR_OperationDescription_var
+ {
+ public:
+- OperationDescription_var (void); // default constructor
+- OperationDescription_var (OperationDescription *);
+- OperationDescription_var (const OperationDescription_var &); // copy constructor
+- ~OperationDescription_var (void); // destructor
++ IR_OperationDescription_var (void); // default constructor
++ IR_OperationDescription_var (IR_OperationDescription *);
++ IR_OperationDescription_var (const IR_OperationDescription_var &); // copy constructor
++ ~IR_OperationDescription_var (void); // destructor
+
+- OperationDescription_var &operator= (OperationDescription *);
+- OperationDescription_var &operator= (const OperationDescription_var &);
+- OperationDescription *operator-> (void);
+- const OperationDescription *operator-> (void) const;
++ IR_OperationDescription_var &operator= (IR_OperationDescription *);
++ IR_OperationDescription_var &operator= (const IR_OperationDescription_var &);
++ IR_OperationDescription *operator-> (void);
++ const IR_OperationDescription *operator-> (void) const;
+
+- operator const OperationDescription &() const;
+- operator OperationDescription &();
+- operator OperationDescription &() const;
+- operator OperationDescription *&(); // variable-size types only
++ operator const IR_OperationDescription &() const;
++ operator IR_OperationDescription &();
++ operator IR_OperationDescription &() const;
++ operator IR_OperationDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const OperationDescription &in (void) const;
+- OperationDescription &inout (void);
+- OperationDescription *&out (void);
+- OperationDescription *_retn (void);
+- OperationDescription *ptr (void) const;
++ const IR_OperationDescription &in (void) const;
++ IR_OperationDescription &inout (void);
++ IR_OperationDescription *&out (void);
++ IR_OperationDescription *_retn (void);
++ IR_OperationDescription *ptr (void) const;
+
+ private:
+- OperationDescription *ptr_;
++ IR_OperationDescription *ptr_;
+ };
+
+-class TAO_Export OperationDescription_out
++class TAO_Export IR_OperationDescription_out
+ {
+ public:
+- OperationDescription_out (OperationDescription *&);
+- OperationDescription_out (OperationDescription_var &);
+- OperationDescription_out (const OperationDescription_out &);
+- OperationDescription_out &operator= (const OperationDescription_out &);
+- OperationDescription_out &operator= (OperationDescription *);
+- operator OperationDescription *&();
+- OperationDescription *&ptr (void);
+- OperationDescription *operator-> (void);
++ IR_OperationDescription_out (IR_OperationDescription *&);
++ IR_OperationDescription_out (IR_OperationDescription_var &);
++ IR_OperationDescription_out (const IR_OperationDescription_out &);
++ IR_OperationDescription_out &operator= (const IR_OperationDescription_out &);
++ IR_OperationDescription_out &operator= (IR_OperationDescription *);
++ operator IR_OperationDescription *&();
++ IR_OperationDescription *&ptr (void);
++ IR_OperationDescription *operator-> (void);
+
+ private:
+- OperationDescription *&ptr_;
++ IR_OperationDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const OperationDescription_var &);
++ void operator= (const IR_OperationDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDescription;
+-
+-
+-#if !defined (_TAO_IR_REPOSITORYIDSEQ_CH_)
+-#define _TAO_IR_REPOSITORYIDSEQ_CH_
+-
+-class RepositoryIdSeq;
+-class RepositoryIdSeq_var;
+-
+ // *************************************************************
+-// RepositoryIdSeq
++// IR_RepositoryIdSeq
+ // *************************************************************
+
+-class TAO_Export RepositoryIdSeq : public
++class TAO_Export IR_RepositoryIdSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ TAO_Unbounded_String_Sequence
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+@@ -19097,102 +11750,80 @@
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- RepositoryIdSeq (void); // default ctor
+- RepositoryIdSeq (CORBA::ULong max); // uses max size
+- RepositoryIdSeq (
++ IR_RepositoryIdSeq (void); // default ctor
++ IR_RepositoryIdSeq (CORBA::ULong max); // uses max size
++ IR_RepositoryIdSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+ char * *buffer,
+ CORBA::Boolean release = 0
+ );
+- RepositoryIdSeq (const RepositoryIdSeq &); // copy ctor
+- ~RepositoryIdSeq (void);
++ IR_RepositoryIdSeq (const IR_RepositoryIdSeq &); // copy ctor
++ ~IR_RepositoryIdSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef RepositoryIdSeq_var _var_type;
++ typedef IR_RepositoryIdSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORYIDSEQ___VAR_CH_)
+-#define _TAO_IR_REPOSITORYIDSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::RepositoryIdSeq_var
++// class IR_RepositoryIdSeq_var
+ // *************************************************************
+
+-class TAO_Export RepositoryIdSeq_var
++class TAO_Export IR_RepositoryIdSeq_var
+ {
+ public:
+- RepositoryIdSeq_var (void); // default constructor
+- RepositoryIdSeq_var (RepositoryIdSeq *);
+- RepositoryIdSeq_var (const RepositoryIdSeq_var &); // copy constructor
+- ~RepositoryIdSeq_var (void); // destructor
++ IR_RepositoryIdSeq_var (void); // default constructor
++ IR_RepositoryIdSeq_var (IR_RepositoryIdSeq *);
++ IR_RepositoryIdSeq_var (const IR_RepositoryIdSeq_var &); // copy constructor
++ ~IR_RepositoryIdSeq_var (void); // destructor
+
+- RepositoryIdSeq_var &operator= (RepositoryIdSeq *);
+- RepositoryIdSeq_var &operator= (const RepositoryIdSeq_var &);
+- RepositoryIdSeq *operator-> (void);
+- const RepositoryIdSeq *operator-> (void) const;
++ IR_RepositoryIdSeq_var &operator= (IR_RepositoryIdSeq *);
++ IR_RepositoryIdSeq_var &operator= (const IR_RepositoryIdSeq_var &);
++ IR_RepositoryIdSeq *operator-> (void);
++ const IR_RepositoryIdSeq *operator-> (void) const;
+
+- operator const RepositoryIdSeq &() const;
+- operator RepositoryIdSeq &();
+- operator RepositoryIdSeq &() const;
+- operator RepositoryIdSeq *&(); // variable-size base types only
++ operator const IR_RepositoryIdSeq &() const;
++ operator IR_RepositoryIdSeq &();
++ operator IR_RepositoryIdSeq &() const;
++ operator IR_RepositoryIdSeq *&(); // variable-size base types only
+
+ TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+ // in, inout, out, _retn
+- const RepositoryIdSeq &in (void) const;
+- RepositoryIdSeq &inout (void);
+- RepositoryIdSeq *&out (void);
+- RepositoryIdSeq *_retn (void);
+- RepositoryIdSeq *ptr (void) const;
++ const IR_RepositoryIdSeq &in (void) const;
++ IR_RepositoryIdSeq &inout (void);
++ IR_RepositoryIdSeq *&out (void);
++ IR_RepositoryIdSeq *_retn (void);
++ IR_RepositoryIdSeq *ptr (void) const;
+
+ private:
+- RepositoryIdSeq *ptr_;
++ IR_RepositoryIdSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORYIDSEQ___OUT_CH_)
+-#define _TAO_IR_REPOSITORYIDSEQ___OUT_CH_
+-
+-class TAO_Export RepositoryIdSeq_out
++class TAO_Export IR_RepositoryIdSeq_out
+ {
+ public:
+- RepositoryIdSeq_out (RepositoryIdSeq *&);
+- RepositoryIdSeq_out (RepositoryIdSeq_var &);
+- RepositoryIdSeq_out (const RepositoryIdSeq_out &);
+- RepositoryIdSeq_out &operator= (const RepositoryIdSeq_out &);
+- RepositoryIdSeq_out &operator= (RepositoryIdSeq *);
+- operator RepositoryIdSeq *&();
+- RepositoryIdSeq *&ptr (void);
+- RepositoryIdSeq *operator-> (void);
++ IR_RepositoryIdSeq_out (IR_RepositoryIdSeq *&);
++ IR_RepositoryIdSeq_out (IR_RepositoryIdSeq_var &);
++ IR_RepositoryIdSeq_out (const IR_RepositoryIdSeq_out &);
++ IR_RepositoryIdSeq_out &operator= (const IR_RepositoryIdSeq_out &);
++ IR_RepositoryIdSeq_out &operator= (IR_RepositoryIdSeq *);
++ operator IR_RepositoryIdSeq *&();
++ IR_RepositoryIdSeq *&ptr (void);
++ IR_RepositoryIdSeq *operator-> (void);
+ TAO_SeqElem_String_Manager operator[] (CORBA::ULong index);
+
+ private:
+- RepositoryIdSeq *&ptr_;
++ IR_RepositoryIdSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const RepositoryIdSeq_var &);
++ void operator= (const IR_RepositoryIdSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_OpDescriptionSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -19202,149 +11833,118 @@
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- OperationDescription *data,
++ IR_OperationDescription *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void); // Dtor.
+ // = Accessors.
+- OperationDescription &operator[] (CORBA::ULong i);
+- const OperationDescription &operator[] (CORBA::ULong i) const;
++ IR_OperationDescription &operator[] (CORBA::ULong i);
++ const IR_OperationDescription &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static OperationDescription *allocbuf (CORBA::ULong size);
+- static void freebuf (OperationDescription *buffer);
++ static IR_OperationDescription *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_OperationDescription *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
+- const OperationDescription *get_buffer (void) const;
++ IR_OperationDescription *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_OperationDescription *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- OperationDescription *data,
++ IR_OperationDescription *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_OPDESCRIPTIONSEQ_CH_)
+-#define _TAO_IR_OPDESCRIPTIONSEQ_CH_
+-
+-class OpDescriptionSeq;
+-class OpDescriptionSeq_var;
+-
+ // *************************************************************
+-// OpDescriptionSeq
++// IR_OpDescriptionSeq
+ // *************************************************************
+
+-class TAO_Export OpDescriptionSeq : public
++class TAO_Export IR_OpDescriptionSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<OperationDescription>
++ TAO_Unbounded_Sequence<IR_OperationDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- OpDescriptionSeq (void); // default ctor
+- OpDescriptionSeq (CORBA::ULong max); // uses max size
+- OpDescriptionSeq (
++ IR_OpDescriptionSeq (void); // default ctor
++ IR_OpDescriptionSeq (CORBA::ULong max); // uses max size
++ IR_OpDescriptionSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- OperationDescription *buffer,
++ IR_OperationDescription *buffer,
+ CORBA::Boolean release = 0
+ );
+- OpDescriptionSeq (const OpDescriptionSeq &); // copy ctor
+- ~OpDescriptionSeq (void);
++ IR_OpDescriptionSeq (const IR_OpDescriptionSeq &); // copy ctor
++ ~IR_OpDescriptionSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef OpDescriptionSeq_var _var_type;
++ typedef IR_OpDescriptionSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_OPDESCRIPTIONSEQ___VAR_CH_)
+-#define _TAO_IR_OPDESCRIPTIONSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::OpDescriptionSeq_var
++// class IR_OpDescriptionSeq_var
+ // *************************************************************
+
+-class TAO_Export OpDescriptionSeq_var
++class TAO_Export IR_OpDescriptionSeq_var
+ {
+ public:
+- OpDescriptionSeq_var (void); // default constructor
+- OpDescriptionSeq_var (OpDescriptionSeq *);
+- OpDescriptionSeq_var (const OpDescriptionSeq_var &); // copy constructor
+- ~OpDescriptionSeq_var (void); // destructor
++ IR_OpDescriptionSeq_var (void); // default constructor
++ IR_OpDescriptionSeq_var (IR_OpDescriptionSeq *);
++ IR_OpDescriptionSeq_var (const IR_OpDescriptionSeq_var &); // copy constructor
++ ~IR_OpDescriptionSeq_var (void); // destructor
+
+- OpDescriptionSeq_var &operator= (OpDescriptionSeq *);
+- OpDescriptionSeq_var &operator= (const OpDescriptionSeq_var &);
+- OpDescriptionSeq *operator-> (void);
+- const OpDescriptionSeq *operator-> (void) const;
++ IR_OpDescriptionSeq_var &operator= (IR_OpDescriptionSeq *);
++ IR_OpDescriptionSeq_var &operator= (const IR_OpDescriptionSeq_var &);
++ IR_OpDescriptionSeq *operator-> (void);
++ const IR_OpDescriptionSeq *operator-> (void) const;
+
+- operator const OpDescriptionSeq &() const;
+- operator OpDescriptionSeq &();
+- operator OpDescriptionSeq &() const;
+- operator OpDescriptionSeq *&(); // variable-size base types only
++ operator const IR_OpDescriptionSeq &() const;
++ operator IR_OpDescriptionSeq &();
++ operator IR_OpDescriptionSeq &() const;
++ operator IR_OpDescriptionSeq *&(); // variable-size base types only
+
+- OperationDescription & operator[] (CORBA::ULong index);
+- const OperationDescription & operator[] (CORBA::ULong index) const;
++ IR_OperationDescription & operator[] (CORBA::ULong index);
++ const IR_OperationDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const OpDescriptionSeq &in (void) const;
+- OpDescriptionSeq &inout (void);
+- OpDescriptionSeq *&out (void);
+- OpDescriptionSeq *_retn (void);
+- OpDescriptionSeq *ptr (void) const;
++ const IR_OpDescriptionSeq &in (void) const;
++ IR_OpDescriptionSeq &inout (void);
++ IR_OpDescriptionSeq *&out (void);
++ IR_OpDescriptionSeq *_retn (void);
++ IR_OpDescriptionSeq *ptr (void) const;
+
+ private:
+- OpDescriptionSeq *ptr_;
++ IR_OpDescriptionSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_OPDESCRIPTIONSEQ___OUT_CH_)
+-#define _TAO_IR_OPDESCRIPTIONSEQ___OUT_CH_
+-
+-class TAO_Export OpDescriptionSeq_out
++class TAO_Export IR_OpDescriptionSeq_out
+ {
+ public:
+- OpDescriptionSeq_out (OpDescriptionSeq *&);
+- OpDescriptionSeq_out (OpDescriptionSeq_var &);
+- OpDescriptionSeq_out (const OpDescriptionSeq_out &);
+- OpDescriptionSeq_out &operator= (const OpDescriptionSeq_out &);
+- OpDescriptionSeq_out &operator= (OpDescriptionSeq *);
+- operator OpDescriptionSeq *&();
+- OpDescriptionSeq *&ptr (void);
+- OpDescriptionSeq *operator-> (void);
+- OperationDescription & operator[] (CORBA::ULong index);
++ IR_OpDescriptionSeq_out (IR_OpDescriptionSeq *&);
++ IR_OpDescriptionSeq_out (IR_OpDescriptionSeq_var &);
++ IR_OpDescriptionSeq_out (const IR_OpDescriptionSeq_out &);
++ IR_OpDescriptionSeq_out &operator= (const IR_OpDescriptionSeq_out &);
++ IR_OpDescriptionSeq_out &operator= (IR_OpDescriptionSeq *);
++ operator IR_OpDescriptionSeq *&();
++ IR_OpDescriptionSeq *&ptr (void);
++ IR_OpDescriptionSeq *operator-> (void);
++ IR_OperationDescription & operator[] (CORBA::ULong index);
+
+ private:
+- OpDescriptionSeq *&ptr_;
++ IR_OpDescriptionSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const OpDescriptionSeq_var &);
++ void operator= (const IR_OpDescriptionSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -19354,249 +11954,151 @@
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- AttributeDescription *data,
++ IR_AttributeDescription *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void); // Dtor.
+ // = Accessors.
+- AttributeDescription &operator[] (CORBA::ULong i);
+- const AttributeDescription &operator[] (CORBA::ULong i) const;
++ IR_AttributeDescription &operator[] (CORBA::ULong i);
++ const IR_AttributeDescription &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static AttributeDescription *allocbuf (CORBA::ULong size);
+- static void freebuf (AttributeDescription *buffer);
++ static IR_AttributeDescription *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_AttributeDescription *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
+- const AttributeDescription *get_buffer (void) const;
++ IR_AttributeDescription *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_AttributeDescription *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- AttributeDescription *data,
++ IR_AttributeDescription *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_ATTRDESCRIPTIONSEQ_CH_)
+-#define _TAO_IR_ATTRDESCRIPTIONSEQ_CH_
+-
+-class AttrDescriptionSeq;
+-class AttrDescriptionSeq_var;
+-
+ // *************************************************************
+-// AttrDescriptionSeq
++// IR_AttrDescriptionSeq
+ // *************************************************************
+
+-class TAO_Export AttrDescriptionSeq : public
++class TAO_Export IR_AttrDescriptionSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<AttributeDescription>
++ TAO_Unbounded_Sequence<IR_AttributeDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- AttrDescriptionSeq (void); // default ctor
+- AttrDescriptionSeq (CORBA::ULong max); // uses max size
+- AttrDescriptionSeq (
++ IR_AttrDescriptionSeq (void); // default ctor
++ IR_AttrDescriptionSeq (CORBA::ULong max); // uses max size
++ IR_AttrDescriptionSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- AttributeDescription *buffer,
++ IR_AttributeDescription *buffer,
+ CORBA::Boolean release = 0
+ );
+- AttrDescriptionSeq (const AttrDescriptionSeq &); // copy ctor
+- ~AttrDescriptionSeq (void);
++ IR_AttrDescriptionSeq (const IR_AttrDescriptionSeq &); // copy ctor
++ ~IR_AttrDescriptionSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef AttrDescriptionSeq_var _var_type;
++ typedef IR_AttrDescriptionSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ATTRDESCRIPTIONSEQ___VAR_CH_)
+-#define _TAO_IR_ATTRDESCRIPTIONSEQ___VAR_CH_
+
+ // *************************************************************
+-// class IR::AttrDescriptionSeq_var
++// class IR_AttrDescriptionSeq_var
+ // *************************************************************
+
+-class TAO_Export AttrDescriptionSeq_var
++class TAO_Export IR_AttrDescriptionSeq_var
+ {
+ public:
+- AttrDescriptionSeq_var (void); // default constructor
+- AttrDescriptionSeq_var (AttrDescriptionSeq *);
+- AttrDescriptionSeq_var (const AttrDescriptionSeq_var &); // copy constructor
+- ~AttrDescriptionSeq_var (void); // destructor
++ IR_AttrDescriptionSeq_var (void); // default constructor
++ IR_AttrDescriptionSeq_var (IR_AttrDescriptionSeq *);
++ IR_AttrDescriptionSeq_var (const IR_AttrDescriptionSeq_var &); // copy constructor
++ ~IR_AttrDescriptionSeq_var (void); // destructor
+
+- AttrDescriptionSeq_var &operator= (AttrDescriptionSeq *);
+- AttrDescriptionSeq_var &operator= (const AttrDescriptionSeq_var &);
+- AttrDescriptionSeq *operator-> (void);
+- const AttrDescriptionSeq *operator-> (void) const;
++ IR_AttrDescriptionSeq_var &operator= (IR_AttrDescriptionSeq *);
++ IR_AttrDescriptionSeq_var &operator= (const IR_AttrDescriptionSeq_var &);
++ IR_AttrDescriptionSeq *operator-> (void);
++ const IR_AttrDescriptionSeq *operator-> (void) const;
+
+- operator const AttrDescriptionSeq &() const;
+- operator AttrDescriptionSeq &();
+- operator AttrDescriptionSeq &() const;
+- operator AttrDescriptionSeq *&(); // variable-size base types only
++ operator const IR_AttrDescriptionSeq &() const;
++ operator IR_AttrDescriptionSeq &();
++ operator IR_AttrDescriptionSeq &() const;
++ operator IR_AttrDescriptionSeq *&(); // variable-size base types only
+
+- AttributeDescription & operator[] (CORBA::ULong index);
+- const AttributeDescription & operator[] (CORBA::ULong index) const;
++ IR_AttributeDescription & operator[] (CORBA::ULong index);
++ const IR_AttributeDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const AttrDescriptionSeq &in (void) const;
+- AttrDescriptionSeq &inout (void);
+- AttrDescriptionSeq *&out (void);
+- AttrDescriptionSeq *_retn (void);
+- AttrDescriptionSeq *ptr (void) const;
++ const IR_AttrDescriptionSeq &in (void) const;
++ IR_AttrDescriptionSeq &inout (void);
++ IR_AttrDescriptionSeq *&out (void);
++ IR_AttrDescriptionSeq *_retn (void);
++ IR_AttrDescriptionSeq *ptr (void) const;
+
+ private:
+- AttrDescriptionSeq *ptr_;
++ IR_AttrDescriptionSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ATTRDESCRIPTIONSEQ___OUT_CH_)
+-#define _TAO_IR_ATTRDESCRIPTIONSEQ___OUT_CH_
+-
+-class TAO_Export AttrDescriptionSeq_out
++class TAO_Export IR_AttrDescriptionSeq_out
+ {
+ public:
+- AttrDescriptionSeq_out (AttrDescriptionSeq *&);
+- AttrDescriptionSeq_out (AttrDescriptionSeq_var &);
+- AttrDescriptionSeq_out (const AttrDescriptionSeq_out &);
+- AttrDescriptionSeq_out &operator= (const AttrDescriptionSeq_out &);
+- AttrDescriptionSeq_out &operator= (AttrDescriptionSeq *);
+- operator AttrDescriptionSeq *&();
+- AttrDescriptionSeq *&ptr (void);
+- AttrDescriptionSeq *operator-> (void);
+- AttributeDescription & operator[] (CORBA::ULong index);
++ IR_AttrDescriptionSeq_out (IR_AttrDescriptionSeq *&);
++ IR_AttrDescriptionSeq_out (IR_AttrDescriptionSeq_var &);
++ IR_AttrDescriptionSeq_out (const IR_AttrDescriptionSeq_out &);
++ IR_AttrDescriptionSeq_out &operator= (const IR_AttrDescriptionSeq_out &);
++ IR_AttrDescriptionSeq_out &operator= (IR_AttrDescriptionSeq *);
++ operator IR_AttrDescriptionSeq *&();
++ IR_AttrDescriptionSeq *&ptr (void);
++ IR_AttrDescriptionSeq *operator-> (void);
++ IR_AttributeDescription & operator[] (CORBA::ULong index);
+
+ private:
+- AttrDescriptionSeq *&ptr_;
++ IR_AttrDescriptionSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const AttrDescriptionSeq_var &);
++ void operator= (const IR_AttrDescriptionSeq_var &);
+ };
+
++// Forward Classes Declaration
++class _TAO_InterfaceDef_Proxy_Impl;
++class _TAO_InterfaceDef_Remote_Proxy_Impl;
++class _TAO_InterfaceDef_Proxy_Broker;
++class _TAO_InterfaceDef_Remote_Proxy_Broker;
+
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___PTR_CH_)
+-#define _TAO_IR_INTERFACEDEF___PTR_CH_
+-
+-class InterfaceDef;
+-typedef InterfaceDef *InterfaceDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___VAR_CH_)
+-#define _TAO_IR_INTERFACEDEF___VAR_CH_
+-
+-class TAO_Export InterfaceDef_var : public TAO_Base_var
+-{
+-public:
+- InterfaceDef_var (void); // default constructor
+- InterfaceDef_var (InterfaceDef_ptr p) : ptr_ (p) {}
+- InterfaceDef_var (const InterfaceDef_var &); // copy constructor
+- ~InterfaceDef_var (void); // destructor
+-
+- InterfaceDef_var &operator= (InterfaceDef_ptr);
+- InterfaceDef_var &operator= (const InterfaceDef_var &);
+- InterfaceDef_ptr operator-> (void) const;
+-
+- operator const InterfaceDef_ptr &() const;
+- operator InterfaceDef_ptr &();
+- // in, inout, out, _retn
+- InterfaceDef_ptr in (void) const;
+- InterfaceDef_ptr &inout (void);
+- InterfaceDef_ptr &out (void);
+- InterfaceDef_ptr _retn (void);
+- InterfaceDef_ptr ptr (void) const;
+-
+-private:
+- InterfaceDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- InterfaceDef_var (const TAO_Base_var &rhs);
+- InterfaceDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___OUT_CH_)
+-#define _TAO_IR_INTERFACEDEF___OUT_CH_
+-
+-class TAO_Export InterfaceDef_out
+-{
+-public:
+- InterfaceDef_out (InterfaceDef_ptr &);
+- InterfaceDef_out (InterfaceDef_var &);
+- InterfaceDef_out (const InterfaceDef_out &);
+- InterfaceDef_out &operator= (const InterfaceDef_out &);
+- InterfaceDef_out &operator= (const InterfaceDef_var &);
+- InterfaceDef_out &operator= (InterfaceDef_ptr);
+- operator InterfaceDef_ptr &();
+- InterfaceDef_ptr &ptr (void);
+- InterfaceDef_ptr operator-> (void);
+-
+-private:
+- InterfaceDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF_CH_)
+-#define _TAO_IR_INTERFACEDEF_CH_
+-
+-// Forward Classes Declaration
+-class _TAO_InterfaceDef_Proxy_Impl;
+-class _TAO_InterfaceDef_Remote_Proxy_Impl;
+-class _TAO_InterfaceDef_Proxy_Broker;
+-class _TAO_InterfaceDef_Remote_Proxy_Broker;
+-
+-class TAO_Export InterfaceDef: public virtual Container, public virtual Contained, public virtual IDLType
+-{
+-public:
+-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef InterfaceDef_ptr _ptr_type;
+- typedef InterfaceDef_var _var_type;
+-#endif /* ! __GNUC__ || g++ >= 2.8 */
++class TAO_Export IR_InterfaceDef: public virtual IR_Container, public virtual IR_Contained, public virtual IR_IDLType
++{
++public:
++#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
++ typedef IR_InterfaceDef_ptr _ptr_type;
++ typedef IR_InterfaceDef_var _var_type;
++#endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static InterfaceDef_ptr _duplicate (InterfaceDef_ptr obj);
+- static InterfaceDef_ptr _narrow (
++ static IR_InterfaceDef_ptr _duplicate (IR_InterfaceDef_ptr obj);
++ static IR_InterfaceDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static InterfaceDef_ptr _unchecked_narrow (
++ static IR_InterfaceDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static InterfaceDef_ptr _nil (void)
++ static IR_InterfaceDef_ptr _nil (void)
+ {
+- return (InterfaceDef_ptr)0;
++ return (IR_InterfaceDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::InterfaceDefSeq * base_interfaces (
++ virtual IR_InterfaceDefSeq * base_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19605,7 +12107,7 @@
+ ));
+
+ virtual void base_interfaces (
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19656,14 +12158,14 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::AttributeDef_ptr create_attribute (
++ virtual IR_AttributeDef_ptr create_attribute (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19671,15 +12173,15 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::OperationDef_ptr create_operation (
++ virtual IR_OperationDef_ptr create_operation (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -19700,454 +12202,27 @@
+ _TAO_InterfaceDef_Proxy_Broker *the_TAO_InterfaceDef_Proxy_Broker_;
+
+ protected:
+- InterfaceDef (int collocated = 0);
++ IR_InterfaceDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- InterfaceDef (
++ IR_InterfaceDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+- virtual ~InterfaceDef (void);
+- private:
+- InterfaceDef (const InterfaceDef &);
+- void operator= (const InterfaceDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::InterfaceDef;
+-
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_get &);
+- void result (IR::InterfaceDefSeq * result);
+- // update the result
+- IR::InterfaceDefSeq * result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::InterfaceDef;
+-
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::InterfaceDefSeq & base_interfaces,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_base_interfaces_set &);
+- const IR::InterfaceDefSeq & base_interfaces_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::InterfaceDef;
+-
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get (const TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_get &);
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::InterfaceDef;
+-
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_abstract,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set (const TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_abstract_set &);
+- const CORBA::Boolean & is_abstract_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::InterfaceDef;
+-
++
+ friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+ friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get (const TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_local_get &);
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::InterfaceDef;
+
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_local,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_InterfaceDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set (const TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_local_set &);
+- const CORBA::Boolean & is_local_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_InterfaceDef_is_a : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::InterfaceDef;
+-
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_InterfaceDef_is_a (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * interface_id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_is_a (const TAO_ClientRequestInfo_IR_InterfaceDef_is_a &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_is_a &);
+- const char * interface_id_;
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::InterfaceDef;
+-
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode & mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute (const TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_create_attribute &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr type_;
+- const IR::AttributeMode & mode_;
+- const IR::ExceptionDefSeq & get_exceptions_;
+- const IR::ExceptionDefSeq & put_exceptions_;
+- void result (IR::AttributeDef_ptr result);
+- // update the result
+- IR::AttributeDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_InterfaceDef_create_operation : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::InterfaceDef;
+-
+- friend class _TAO_InterfaceDef_Remote_Proxy_Impl;
+- friend class _TAO_InterfaceDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_InterfaceDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode & mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_InterfaceDef_create_operation (const TAO_ClientRequestInfo_IR_InterfaceDef_create_operation &);
+- void operator= (const TAO_ClientRequestInfo_IR_InterfaceDef_create_operation &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr result_;
+- const IR::OperationMode & mode_;
+- const IR::ParDescriptionSeq & params_;
+- const IR::ExceptionDefSeq & exceptions_;
+- const IR::ContextIdSeq & contexts_;
+- void result (IR::OperationDef_ptr result);
+- // update the result
+- IR::OperationDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_InterfaceDef (const IR_InterfaceDef &);
++ void operator= (const IR_InterfaceDef &);
+ };
+
+
+@@ -20161,14 +12236,14 @@
+ //
+
+ class TAO_Export _TAO_InterfaceDef_Proxy_Impl :
+- public virtual IR::_TAO_Container_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Proxy_Impl
++ public virtual _TAO_Container_Proxy_Impl,
++ public virtual _TAO_Contained_Proxy_Impl,
++ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_InterfaceDef_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDefSeq * base_interfaces (
++ virtual IR_InterfaceDefSeq * base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -20178,7 +12253,7 @@
+
+ virtual void base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -20228,31 +12303,31 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::AttributeDef_ptr create_attribute (
++ virtual IR_AttributeDef_ptr create_attribute (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::OperationDef_ptr create_operation (
++ virtual IR_OperationDef_ptr create_operation (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -20263,6 +12338,7 @@
+ _TAO_InterfaceDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -20275,9 +12351,9 @@
+ class TAO_Export _TAO_InterfaceDef_Remote_Proxy_Impl :
+ public virtual _TAO_InterfaceDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Container_Remote_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_Container_Remote_Proxy_Impl,
++ public virtual _TAO_Contained_Remote_Proxy_Impl,
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -20285,7 +12361,7 @@
+
+ virtual ~_TAO_InterfaceDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDefSeq * base_interfaces (
++ virtual IR_InterfaceDefSeq * base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -20295,7 +12371,7 @@
+
+ virtual void base_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & base_interfaces,
++ const IR_InterfaceDefSeq & base_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -20345,31 +12421,31 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::AttributeDef_ptr create_attribute (
++ virtual IR_AttributeDef_ptr create_attribute (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::OperationDef_ptr create_operation (
++ virtual IR_OperationDef_ptr create_operation (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -20398,8 +12474,9 @@
+ {
+ public:
+ virtual ~_TAO_InterfaceDef_Proxy_Broker (void);
++
+ virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
+- InterfaceDef *object,
++ IR_InterfaceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -20424,9 +12501,9 @@
+ _TAO_InterfaceDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_InterfaceDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_InterfaceDef_Proxy_Impl &select_proxy (
+- InterfaceDef *object,
++ IR_InterfaceDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -20440,24 +12517,15 @@
+ static _TAO_InterfaceDef_Remote_Proxy_Broker *the_TAO_InterfaceDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDef;
+-
+-struct InterfaceDescription;
+-class InterfaceDescription_var;
+-
+-struct TAO_Export InterfaceDescription
++struct TAO_Export IR_InterfaceDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef InterfaceDescription_var _var_type;
++ typedef IR_InterfaceDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -20466,71 +12534,66 @@
+ TAO_String_Manager id;
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+- ACE_NESTED_CLASS (IR, OpDescriptionSeq) operations;
+- ACE_NESTED_CLASS (IR, AttrDescriptionSeq) attributes;
+- ACE_NESTED_CLASS (IR, RepositoryIdSeq) base_interfaces;
++ IR_OpDescriptionSeq operations;
++ IR_AttrDescriptionSeq attributes;
++ IR_RepositoryIdSeq base_interfaces;
+ CORBA::TypeCode_var type;
+ CORBA::Boolean is_abstract;
+ CORBA::Boolean is_local;
+ };
+
+-class TAO_Export InterfaceDescription_var
++class TAO_Export IR_InterfaceDescription_var
+ {
+ public:
+- InterfaceDescription_var (void); // default constructor
+- InterfaceDescription_var (InterfaceDescription *);
+- InterfaceDescription_var (const InterfaceDescription_var &); // copy constructor
+- ~InterfaceDescription_var (void); // destructor
+-
+- InterfaceDescription_var &operator= (InterfaceDescription *);
+- InterfaceDescription_var &operator= (const InterfaceDescription_var &);
+- InterfaceDescription *operator-> (void);
+- const InterfaceDescription *operator-> (void) const;
+-
+- operator const InterfaceDescription &() const;
+- operator InterfaceDescription &();
+- operator InterfaceDescription &() const;
+- operator InterfaceDescription *&(); // variable-size types only
++ IR_InterfaceDescription_var (void); // default constructor
++ IR_InterfaceDescription_var (IR_InterfaceDescription *);
++ IR_InterfaceDescription_var (const IR_InterfaceDescription_var &); // copy constructor
++ ~IR_InterfaceDescription_var (void); // destructor
++
++ IR_InterfaceDescription_var &operator= (IR_InterfaceDescription *);
++ IR_InterfaceDescription_var &operator= (const IR_InterfaceDescription_var &);
++ IR_InterfaceDescription *operator-> (void);
++ const IR_InterfaceDescription *operator-> (void) const;
++
++ operator const IR_InterfaceDescription &() const;
++ operator IR_InterfaceDescription &();
++ operator IR_InterfaceDescription &() const;
++ operator IR_InterfaceDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const InterfaceDescription &in (void) const;
+- InterfaceDescription &inout (void);
+- InterfaceDescription *&out (void);
+- InterfaceDescription *_retn (void);
+- InterfaceDescription *ptr (void) const;
++ const IR_InterfaceDescription &in (void) const;
++ IR_InterfaceDescription &inout (void);
++ IR_InterfaceDescription *&out (void);
++ IR_InterfaceDescription *_retn (void);
++ IR_InterfaceDescription *ptr (void) const;
+
+ private:
+- InterfaceDescription *ptr_;
++ IR_InterfaceDescription *ptr_;
+ };
+
+-class TAO_Export InterfaceDescription_out
++class TAO_Export IR_InterfaceDescription_out
+ {
+ public:
+- InterfaceDescription_out (InterfaceDescription *&);
+- InterfaceDescription_out (InterfaceDescription_var &);
+- InterfaceDescription_out (const InterfaceDescription_out &);
+- InterfaceDescription_out &operator= (const InterfaceDescription_out &);
+- InterfaceDescription_out &operator= (InterfaceDescription *);
+- operator InterfaceDescription *&();
+- InterfaceDescription *&ptr (void);
+- InterfaceDescription *operator-> (void);
++ IR_InterfaceDescription_out (IR_InterfaceDescription *&);
++ IR_InterfaceDescription_out (IR_InterfaceDescription_var &);
++ IR_InterfaceDescription_out (const IR_InterfaceDescription_out &);
++ IR_InterfaceDescription_out &operator= (const IR_InterfaceDescription_out &);
++ IR_InterfaceDescription_out &operator= (IR_InterfaceDescription *);
++ operator IR_InterfaceDescription *&();
++ IR_InterfaceDescription *&ptr (void);
++ IR_InterfaceDescription *operator-> (void);
+
+ private:
+- InterfaceDescription *&ptr_;
++ IR_InterfaceDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const InterfaceDescription_var &);
++ void operator= (const IR_InterfaceDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDescription;
+-
+-struct ValueMember;
+-class ValueMember_var;
+-
+-struct TAO_Export ValueMember
++struct TAO_Export IR_ValueMember
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ValueMember_var _var_type;
++ typedef IR_ValueMember_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -20540,65 +12603,59 @@
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+ CORBA::TypeCode_var type;
+- ACE_NESTED_CLASS (IR, IDLType_var) type_def;
++ IR_IDLType_var type_def;
+ CORBA::Visibility access;
+ };
+
+-class TAO_Export ValueMember_var
++class TAO_Export IR_ValueMember_var
+ {
+ public:
+- ValueMember_var (void); // default constructor
+- ValueMember_var (ValueMember *);
+- ValueMember_var (const ValueMember_var &); // copy constructor
+- ~ValueMember_var (void); // destructor
+-
+- ValueMember_var &operator= (ValueMember *);
+- ValueMember_var &operator= (const ValueMember_var &);
+- ValueMember *operator-> (void);
+- const ValueMember *operator-> (void) const;
+-
+- operator const ValueMember &() const;
+- operator ValueMember &();
+- operator ValueMember &() const;
+- operator ValueMember *&(); // variable-size types only
++ IR_ValueMember_var (void); // default constructor
++ IR_ValueMember_var (IR_ValueMember *);
++ IR_ValueMember_var (const IR_ValueMember_var &); // copy constructor
++ ~IR_ValueMember_var (void); // destructor
++
++ IR_ValueMember_var &operator= (IR_ValueMember *);
++ IR_ValueMember_var &operator= (const IR_ValueMember_var &);
++ IR_ValueMember *operator-> (void);
++ const IR_ValueMember *operator-> (void) const;
++
++ operator const IR_ValueMember &() const;
++ operator IR_ValueMember &();
++ operator IR_ValueMember &() const;
++ operator IR_ValueMember *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const ValueMember &in (void) const;
+- ValueMember &inout (void);
+- ValueMember *&out (void);
+- ValueMember *_retn (void);
+- ValueMember *ptr (void) const;
++ const IR_ValueMember &in (void) const;
++ IR_ValueMember &inout (void);
++ IR_ValueMember *&out (void);
++ IR_ValueMember *_retn (void);
++ IR_ValueMember *ptr (void) const;
+
+ private:
+- ValueMember *ptr_;
++ IR_ValueMember *ptr_;
+ };
+
+-class TAO_Export ValueMember_out
++class TAO_Export IR_ValueMember_out
+ {
+ public:
+- ValueMember_out (ValueMember *&);
+- ValueMember_out (ValueMember_var &);
+- ValueMember_out (const ValueMember_out &);
+- ValueMember_out &operator= (const ValueMember_out &);
+- ValueMember_out &operator= (ValueMember *);
+- operator ValueMember *&();
+- ValueMember *&ptr (void);
+- ValueMember *operator-> (void);
++ IR_ValueMember_out (IR_ValueMember *&);
++ IR_ValueMember_out (IR_ValueMember_var &);
++ IR_ValueMember_out (const IR_ValueMember_out &);
++ IR_ValueMember_out &operator= (const IR_ValueMember_out &);
++ IR_ValueMember_out &operator= (IR_ValueMember *);
++ operator IR_ValueMember *&();
++ IR_ValueMember *&ptr (void);
++ IR_ValueMember *operator-> (void);
+
+ private:
+- ValueMember *&ptr_;
++ IR_ValueMember *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ValueMember_var &);
++ void operator= (const IR_ValueMember_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMember;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ValueMemberSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -20608,258 +12665,204 @@
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ValueMember *data,
++ IR_ValueMember *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq &operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void); // Dtor.
+ // = Accessors.
+- ValueMember &operator[] (CORBA::ULong i);
+- const ValueMember &operator[] (CORBA::ULong i) const;
++ IR_ValueMember &operator[] (CORBA::ULong i);
++ const IR_ValueMember &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static ValueMember *allocbuf (CORBA::ULong size);
+- static void freebuf (ValueMember *buffer);
++ static IR_ValueMember *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_ValueMember *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ValueMember *get_buffer (CORBA::Boolean orphan = 0);
+- const ValueMember *get_buffer (void) const;
++ IR_ValueMember *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ValueMember *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- ValueMember *data,
++ IR_ValueMember *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_VALUEMEMBERSEQ_CH_)
+-#define _TAO_IR_VALUEMEMBERSEQ_CH_
+-
+-class ValueMemberSeq;
+-class ValueMemberSeq_var;
+-
+ // *************************************************************
+-// ValueMemberSeq
++// IR_ValueMemberSeq
+ // *************************************************************
+
+-class TAO_Export ValueMemberSeq : public
++class TAO_Export IR_ValueMemberSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<ValueMember>
++ TAO_Unbounded_Sequence<IR_ValueMember>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ValueMemberSeq (void); // default ctor
+- ValueMemberSeq (CORBA::ULong max); // uses max size
+- ValueMemberSeq (
++ IR_ValueMemberSeq (void); // default ctor
++ IR_ValueMemberSeq (CORBA::ULong max); // uses max size
++ IR_ValueMemberSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ValueMember *buffer,
++ IR_ValueMember *buffer,
+ CORBA::Boolean release = 0
+ );
+- ValueMemberSeq (const ValueMemberSeq &); // copy ctor
+- ~ValueMemberSeq (void);
++ IR_ValueMemberSeq (const IR_ValueMemberSeq &); // copy ctor
++ ~IR_ValueMemberSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ValueMemberSeq_var _var_type;
++ typedef IR_ValueMemberSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERSEQ___VAR_CH_)
+-#define _TAO_IR_VALUEMEMBERSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ValueMemberSeq_var
++// class IR_ValueMemberSeq_var
+ // *************************************************************
+
+-class TAO_Export ValueMemberSeq_var
++class TAO_Export IR_ValueMemberSeq_var
+ {
+ public:
+- ValueMemberSeq_var (void); // default constructor
+- ValueMemberSeq_var (ValueMemberSeq *);
+- ValueMemberSeq_var (const ValueMemberSeq_var &); // copy constructor
+- ~ValueMemberSeq_var (void); // destructor
++ IR_ValueMemberSeq_var (void); // default constructor
++ IR_ValueMemberSeq_var (IR_ValueMemberSeq *);
++ IR_ValueMemberSeq_var (const IR_ValueMemberSeq_var &); // copy constructor
++ ~IR_ValueMemberSeq_var (void); // destructor
+
+- ValueMemberSeq_var &operator= (ValueMemberSeq *);
+- ValueMemberSeq_var &operator= (const ValueMemberSeq_var &);
+- ValueMemberSeq *operator-> (void);
+- const ValueMemberSeq *operator-> (void) const;
++ IR_ValueMemberSeq_var &operator= (IR_ValueMemberSeq *);
++ IR_ValueMemberSeq_var &operator= (const IR_ValueMemberSeq_var &);
++ IR_ValueMemberSeq *operator-> (void);
++ const IR_ValueMemberSeq *operator-> (void) const;
+
+- operator const ValueMemberSeq &() const;
+- operator ValueMemberSeq &();
+- operator ValueMemberSeq &() const;
+- operator ValueMemberSeq *&(); // variable-size base types only
++ operator const IR_ValueMemberSeq &() const;
++ operator IR_ValueMemberSeq &();
++ operator IR_ValueMemberSeq &() const;
++ operator IR_ValueMemberSeq *&(); // variable-size base types only
+
+- ValueMember & operator[] (CORBA::ULong index);
+- const ValueMember & operator[] (CORBA::ULong index) const;
++ IR_ValueMember & operator[] (CORBA::ULong index);
++ const IR_ValueMember & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const ValueMemberSeq &in (void) const;
+- ValueMemberSeq &inout (void);
+- ValueMemberSeq *&out (void);
+- ValueMemberSeq *_retn (void);
+- ValueMemberSeq *ptr (void) const;
++ const IR_ValueMemberSeq &in (void) const;
++ IR_ValueMemberSeq &inout (void);
++ IR_ValueMemberSeq *&out (void);
++ IR_ValueMemberSeq *_retn (void);
++ IR_ValueMemberSeq *ptr (void) const;
+
+ private:
+- ValueMemberSeq *ptr_;
++ IR_ValueMemberSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERSEQ___OUT_CH_)
+-#define _TAO_IR_VALUEMEMBERSEQ___OUT_CH_
+-
+-class TAO_Export ValueMemberSeq_out
++class TAO_Export IR_ValueMemberSeq_out
+ {
+ public:
+- ValueMemberSeq_out (ValueMemberSeq *&);
+- ValueMemberSeq_out (ValueMemberSeq_var &);
+- ValueMemberSeq_out (const ValueMemberSeq_out &);
+- ValueMemberSeq_out &operator= (const ValueMemberSeq_out &);
+- ValueMemberSeq_out &operator= (ValueMemberSeq *);
+- operator ValueMemberSeq *&();
+- ValueMemberSeq *&ptr (void);
+- ValueMemberSeq *operator-> (void);
+- ValueMember & operator[] (CORBA::ULong index);
++ IR_ValueMemberSeq_out (IR_ValueMemberSeq *&);
++ IR_ValueMemberSeq_out (IR_ValueMemberSeq_var &);
++ IR_ValueMemberSeq_out (const IR_ValueMemberSeq_out &);
++ IR_ValueMemberSeq_out &operator= (const IR_ValueMemberSeq_out &);
++ IR_ValueMemberSeq_out &operator= (IR_ValueMemberSeq *);
++ operator IR_ValueMemberSeq *&();
++ IR_ValueMemberSeq *&ptr (void);
++ IR_ValueMemberSeq *operator-> (void);
++ IR_ValueMember & operator[] (CORBA::ULong index);
+
+ private:
+- ValueMemberSeq *&ptr_;
++ IR_ValueMemberSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ValueMemberSeq_var &);
++ void operator= (const IR_ValueMemberSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberSeq;
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERDEF___PTR_CH_)
+-#define _TAO_IR_VALUEMEMBERDEF___PTR_CH_
+-
+-class ValueMemberDef;
+-typedef ValueMemberDef *ValueMemberDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERDEF___VAR_CH_)
+-#define _TAO_IR_VALUEMEMBERDEF___VAR_CH_
+-
+-class TAO_Export ValueMemberDef_var : public TAO_Base_var
++class TAO_Export IR_ValueMemberDef_var : public TAO_Base_var
+ {
+ public:
+- ValueMemberDef_var (void); // default constructor
+- ValueMemberDef_var (ValueMemberDef_ptr p) : ptr_ (p) {}
+- ValueMemberDef_var (const ValueMemberDef_var &); // copy constructor
+- ~ValueMemberDef_var (void); // destructor
++ IR_ValueMemberDef_var (void); // default constructor
++ IR_ValueMemberDef_var (IR_ValueMemberDef_ptr p) : ptr_ (p) {}
++ IR_ValueMemberDef_var (const IR_ValueMemberDef_var &); // copy constructor
++ ~IR_ValueMemberDef_var (void); // destructor
+
+- ValueMemberDef_var &operator= (ValueMemberDef_ptr);
+- ValueMemberDef_var &operator= (const ValueMemberDef_var &);
+- ValueMemberDef_ptr operator-> (void) const;
++ IR_ValueMemberDef_var &operator= (IR_ValueMemberDef_ptr);
++ IR_ValueMemberDef_var &operator= (const IR_ValueMemberDef_var &);
++ IR_ValueMemberDef_ptr operator-> (void) const;
+
+- operator const ValueMemberDef_ptr &() const;
+- operator ValueMemberDef_ptr &();
++ operator const IR_ValueMemberDef_ptr &() const;
++ operator IR_ValueMemberDef_ptr &();
+ // in, inout, out, _retn
+- ValueMemberDef_ptr in (void) const;
+- ValueMemberDef_ptr &inout (void);
+- ValueMemberDef_ptr &out (void);
+- ValueMemberDef_ptr _retn (void);
+- ValueMemberDef_ptr ptr (void) const;
++ IR_ValueMemberDef_ptr in (void) const;
++ IR_ValueMemberDef_ptr &inout (void);
++ IR_ValueMemberDef_ptr &out (void);
++ IR_ValueMemberDef_ptr _retn (void);
++ IR_ValueMemberDef_ptr ptr (void) const;
+
+ private:
+- ValueMemberDef_ptr ptr_;
++ IR_ValueMemberDef_ptr ptr_;
+ // Unimplemented - prevents widening assignment.
+- ValueMemberDef_var (const TAO_Base_var &rhs);
+- ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ValueMemberDef_var (const TAO_Base_var &rhs);
++ IR_ValueMemberDef_var &operator= (const TAO_Base_var &rhs);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERDEF___OUT_CH_)
+-#define _TAO_IR_VALUEMEMBERDEF___OUT_CH_
+-
+-class TAO_Export ValueMemberDef_out
++class TAO_Export IR_ValueMemberDef_out
+ {
+ public:
+- ValueMemberDef_out (ValueMemberDef_ptr &);
+- ValueMemberDef_out (ValueMemberDef_var &);
+- ValueMemberDef_out (const ValueMemberDef_out &);
+- ValueMemberDef_out &operator= (const ValueMemberDef_out &);
+- ValueMemberDef_out &operator= (const ValueMemberDef_var &);
+- ValueMemberDef_out &operator= (ValueMemberDef_ptr);
+- operator ValueMemberDef_ptr &();
+- ValueMemberDef_ptr &ptr (void);
+- ValueMemberDef_ptr operator-> (void);
++ IR_ValueMemberDef_out (IR_ValueMemberDef_ptr &);
++ IR_ValueMemberDef_out (IR_ValueMemberDef_var &);
++ IR_ValueMemberDef_out (const IR_ValueMemberDef_out &);
++ IR_ValueMemberDef_out &operator= (const IR_ValueMemberDef_out &);
++ IR_ValueMemberDef_out &operator= (const IR_ValueMemberDef_var &);
++ IR_ValueMemberDef_out &operator= (IR_ValueMemberDef_ptr);
++ operator IR_ValueMemberDef_ptr &();
++ IR_ValueMemberDef_ptr &ptr (void);
++ IR_ValueMemberDef_ptr operator-> (void);
+
+ private:
+- ValueMemberDef_ptr &ptr_;
++ IR_ValueMemberDef_ptr &ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERDEF_CH_)
+-#define _TAO_IR_VALUEMEMBERDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_ValueMemberDef_Proxy_Impl;
+ class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+ class _TAO_ValueMemberDef_Proxy_Broker;
+ class _TAO_ValueMemberDef_Remote_Proxy_Broker;
+
+-class TAO_Export ValueMemberDef: public virtual Contained
++class TAO_Export IR_ValueMemberDef: public virtual IR_Contained
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ValueMemberDef_ptr _ptr_type;
+- typedef ValueMemberDef_var _var_type;
++ typedef IR_ValueMemberDef_ptr _ptr_type;
++ typedef IR_ValueMemberDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ValueMemberDef_ptr _duplicate (ValueMemberDef_ptr obj);
+- static ValueMemberDef_ptr _narrow (
++ static IR_ValueMemberDef_ptr _duplicate (IR_ValueMemberDef_ptr obj);
++ static IR_ValueMemberDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ValueMemberDef_ptr _unchecked_narrow (
++ static IR_ValueMemberDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ValueMemberDef_ptr _nil (void)
++ static IR_ValueMemberDef_ptr _nil (void)
+ {
+- return (ValueMemberDef_ptr)0;
++ return (IR_ValueMemberDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual CORBA::TypeCode_ptr type (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual CORBA::TypeCode_ptr type (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr type_def (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual IR_IDLType_ptr type_def (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+@@ -20867,7 +12870,7 @@
+ ));
+
+ virtual void type_def (
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -20905,251 +12908,28 @@
+ _TAO_ValueMemberDef_Proxy_Broker *the_TAO_ValueMemberDef_Proxy_Broker_;
+
+ protected:
+- ValueMemberDef (int collocated = 0);
++ IR_ValueMemberDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ValueMemberDef (
++ IR_ValueMemberDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
++ friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
++ friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+
+- virtual ~ValueMemberDef (void);
+- private:
+- ValueMemberDef (const ValueMemberDef &);
+- void operator= (const ValueMemberDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ValueMemberDef_type_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ValueMemberDef;
+-
+- friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_ValueMemberDef_type_get (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_get &);
+- void result (CORBA::TypeCode_ptr result);
+- // update the result
+- CORBA::TypeCode_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ValueMemberDef;
+-
+- friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueMemberDef;
+-
+- friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_type_def_set &);
+- IR::IDLType_ptr type_def_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueMemberDef_access_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueMemberDef;
+-
+- friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueMemberDef_access_get (const TAO_ClientRequestInfo_IR_ValueMemberDef_access_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_access_get &);
+- void result (CORBA::Visibility result);
+- // update the result
+- CORBA::Visibility result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueMemberDef_access_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueMemberDef;
+-
+- friend class _TAO_ValueMemberDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueMemberDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Visibility & access,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueMemberDef_access_set (const TAO_ClientRequestInfo_IR_ValueMemberDef_access_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueMemberDef_access_set &);
+- const CORBA::Visibility & access_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+-};
++ virtual ~IR_ValueMemberDef (void);
++private:
++ IR_ValueMemberDef (const IR_ValueMemberDef &);
++ void operator= (const IR_ValueMemberDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+@@ -21162,12 +12942,12 @@
+ //
+
+ class TAO_Export _TAO_ValueMemberDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ValueMemberDef_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21175,7 +12955,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::IDLType_ptr type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21185,7 +12965,7 @@
+
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -21213,6 +12993,7 @@
+ _TAO_ValueMemberDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -21225,7 +13006,7 @@
+ class TAO_Export _TAO_ValueMemberDef_Remote_Proxy_Impl :
+ public virtual _TAO_ValueMemberDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -21233,15 +13014,15 @@
+
+ virtual ~_TAO_ValueMemberDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::TypeCode_ptr type (
++ virtual CORBA::TypeCode_ptr type (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::IDLType_ptr type_def (
++ virtual IR_IDLType_ptr type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -21251,7 +13032,7 @@
+
+ virtual void type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr type_def,
++ IR_IDLType_ptr type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -21297,8 +13078,9 @@
+ {
+ public:
+ virtual ~_TAO_ValueMemberDef_Proxy_Broker (void);
++
+ virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
+- ValueMemberDef *object,
++ IR_ValueMemberDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -21323,9 +13105,9 @@
+ _TAO_ValueMemberDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ValueMemberDef_Proxy_Impl &select_proxy (
+- ValueMemberDef *object,
++ IR_ValueMemberDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -21339,122 +13121,44 @@
+ static _TAO_ValueMemberDef_Remote_Proxy_Broker *the_TAO_ValueMemberDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberDef;
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF___PTR_CH_)
+-#define _TAO_IR_VALUEDEF___PTR_CH_
+-
+-class ValueDef;
+-typedef ValueDef *ValueDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF___VAR_CH_)
+-#define _TAO_IR_VALUEDEF___VAR_CH_
+-
+-class TAO_Export ValueDef_var : public TAO_Base_var
+-{
+-public:
+- ValueDef_var (void); // default constructor
+- ValueDef_var (ValueDef_ptr p) : ptr_ (p) {}
+- ValueDef_var (const ValueDef_var &); // copy constructor
+- ~ValueDef_var (void); // destructor
+-
+- ValueDef_var &operator= (ValueDef_ptr);
+- ValueDef_var &operator= (const ValueDef_var &);
+- ValueDef_ptr operator-> (void) const;
+-
+- operator const ValueDef_ptr &() const;
+- operator ValueDef_ptr &();
+- // in, inout, out, _retn
+- ValueDef_ptr in (void) const;
+- ValueDef_ptr &inout (void);
+- ValueDef_ptr &out (void);
+- ValueDef_ptr _retn (void);
+- ValueDef_ptr ptr (void) const;
+-
+-private:
+- ValueDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ValueDef_var (const TAO_Base_var &rhs);
+- ValueDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF___OUT_CH_)
+-#define _TAO_IR_VALUEDEF___OUT_CH_
+-
+-class TAO_Export ValueDef_out
+-{
+-public:
+- ValueDef_out (ValueDef_ptr &);
+- ValueDef_out (ValueDef_var &);
+- ValueDef_out (const ValueDef_out &);
+- ValueDef_out &operator= (const ValueDef_out &);
+- ValueDef_out &operator= (const ValueDef_var &);
+- ValueDef_out &operator= (ValueDef_ptr);
+- operator ValueDef_ptr &();
+- ValueDef_ptr &ptr (void);
+- ValueDef_ptr operator-> (void);
+-
+-private:
+- ValueDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF_CH_)
+-#define _TAO_IR_VALUEDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_ValueDef_Proxy_Impl;
+ class _TAO_ValueDef_Remote_Proxy_Impl;
+ class _TAO_ValueDef_Proxy_Broker;
+ class _TAO_ValueDef_Remote_Proxy_Broker;
+
+-class TAO_Export ValueDef: public virtual Container, public virtual Contained, public virtual IDLType
++class TAO_Export IR_ValueDef: public virtual IR_Container, public virtual IR_Contained, public virtual IR_IDLType
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ValueDef_ptr _ptr_type;
+- typedef ValueDef_var _var_type;
++ typedef IR_ValueDef_ptr _ptr_type;
++ typedef IR_ValueDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ValueDef_ptr _duplicate (ValueDef_ptr obj);
+- static ValueDef_ptr _narrow (
++ static IR_ValueDef_ptr _duplicate (IR_ValueDef_ptr obj);
++ static IR_ValueDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ValueDef_ptr _unchecked_narrow (
++ static IR_ValueDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ValueDef_ptr _nil (void)
++ static IR_ValueDef_ptr _nil (void)
+ {
+- return (ValueDef_ptr)0;
++ return (IR_ValueDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::InterfaceDefSeq * supported_interfaces (
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21463,7 +13167,7 @@
+ ));
+
+ virtual void supported_interfaces (
+- const IR::InterfaceDefSeq & supported_interfaces,
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21471,7 +13175,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::InitializerSeq * initializers (
++ virtual IR_InitializerSeq * initializers (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21480,7 +13184,7 @@
+ ));
+
+ virtual void initializers (
+- const IR::InitializerSeq & initializers,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21488,7 +13192,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDef_ptr base_value (
++ virtual IR_ValueDef_ptr base_value (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21497,7 +13201,7 @@
+ ));
+
+ virtual void base_value (
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21505,7 +13209,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDefSeq * abstract_base_values (
++ virtual IR_ValueDefSeq * abstract_base_values (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21514,7 +13218,7 @@
+ ));
+
+ virtual void abstract_base_values (
+- const IR::ValueDefSeq & abstract_base_values,
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21582,11 +13286,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueMemberDef_ptr create_value_member (
++ virtual IR_ValueMemberDef_ptr create_value_member (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+@@ -21595,14 +13299,14 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::AttributeDef_ptr create_attribute (
++ virtual IR_AttributeDef_ptr create_attribute (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21610,15 +13314,15 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::OperationDef_ptr create_operation (
++ virtual IR_OperationDef_ptr create_operation (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -21639,923 +13343,99 @@
+ _TAO_ValueDef_Proxy_Broker *the_TAO_ValueDef_Proxy_Broker_;
+
+ protected:
+- ValueDef (int collocated = 0);
++ IR_ValueDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ValueDef (
++ IR_ValueDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+- virtual ~ValueDef (void);
+- private:
+- ValueDef (const ValueDef &);
+- void operator= (const ValueDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_get &);
+- void result (IR::InterfaceDefSeq * result);
+- // update the result
+- IR::InterfaceDefSeq * result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_supported_interfaces_set &);
+- const IR::InterfaceDefSeq & supported_interfaces_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_initializers_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
++
+ friend class _TAO_ValueDef_Remote_Proxy_Impl;
+ friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_initializers_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++
++ virtual ~IR_ValueDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_ValueDef_initializers_get (const TAO_ClientRequestInfo_IR_ValueDef_initializers_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_initializers_get &);
+- void result (IR::InitializerSeq * result);
+- // update the result
+- IR::InitializerSeq * result_;
++ IR_ValueDef (const IR_ValueDef &);
++ void operator= (const IR_ValueDef &);
+ };
+
+-class TAO_ClientRequestInfo_IR_ValueDef_initializers_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_initializers_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::InitializerSeq & initializers,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++// The Proxy Implementations are used by each interface to
++// perform a call. Each different implementation encapsulate
++// an invocation logics.
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_initializers_set (const TAO_ClientRequestInfo_IR_ValueDef_initializers_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_initializers_set &);
+- const IR::InitializerSeq & initializers_;
+-
+-};
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
+
+-class TAO_ClientRequestInfo_IR_ValueDef_base_value_get : public TAO_ClientRequestInfo
++class TAO_Export _TAO_ValueDef_Proxy_Impl :
++ public virtual _TAO_Container_Proxy_Impl,
++ public virtual _TAO_Contained_Proxy_Impl,
++ public virtual _TAO_IDLType_Proxy_Impl
+ {
+ public:
+- friend class IR::ValueDef;
++ virtual ~_TAO_ValueDef_Proxy_Impl (void) { }
+
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
++ virtual IR_InterfaceDefSeq * supported_interfaces (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-TAO_ClientRequestInfo_IR_ValueDef_base_value_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
++ virtual void supported_interfaces (
++ CORBA_Object *_collocated_tao_target_,
++ const IR_InterfaceDefSeq & supported_interfaces,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual IR_InitializerSeq * initializers (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual void initializers (
++ CORBA_Object *_collocated_tao_target_,
++ const IR_InitializerSeq & initializers,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual IR_ValueDef_ptr base_value (
++ CORBA_Object *_collocated_tao_target_,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_base_value_get (const TAO_ClientRequestInfo_IR_ValueDef_base_value_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_base_value_get &);
+- void result (IR::ValueDef_ptr result);
+- // update the result
+- IR::ValueDef_ptr result_;
+-};
++ virtual void base_value (
++ CORBA_Object *_collocated_tao_target_,
++ IR_ValueDef_ptr base_value,
++ CORBA::Environment &ACE_TRY_ENV
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ )) = 0;
+
+-class TAO_ClientRequestInfo_IR_ValueDef_base_value_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_base_value_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::ValueDef_ptr base_value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_base_value_set (const TAO_ClientRequestInfo_IR_ValueDef_base_value_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_base_value_set &);
+- IR::ValueDef_ptr base_value_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_get &);
+- void result (IR::ValueDefSeq * result);
+- // update the result
+- IR::ValueDefSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::ValueDefSeq & abstract_base_values,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_abstract_base_values_set &);
+- const IR::ValueDefSeq & abstract_base_values_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get (const TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_abstract_get &);
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_abstract,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set (const TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_abstract_set &);
+- const CORBA::Boolean & is_abstract_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_is_custom_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_is_custom_get (const TAO_ClientRequestInfo_IR_ValueDef_is_custom_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_custom_get &);
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_is_custom_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_custom,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_is_custom_set (const TAO_ClientRequestInfo_IR_ValueDef_is_custom_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_custom_set &);
+- const CORBA::Boolean & is_custom_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get (const TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_get &);
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const CORBA::Boolean & is_truncatable,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set (const TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_truncatable_set &);
+- const CORBA::Boolean & is_truncatable_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_is_a : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_is_a (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_is_a (const TAO_ClientRequestInfo_IR_ValueDef_is_a &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_is_a &);
+- const char * id_;
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_create_value_member : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_create_value_member (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- const CORBA::Visibility & access,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_create_value_member (const TAO_ClientRequestInfo_IR_ValueDef_create_value_member &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_create_value_member &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr type_;
+- const CORBA::Visibility & access_;
+- void result (IR::ValueMemberDef_ptr result);
+- // update the result
+- IR::ValueMemberDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_create_attribute : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_create_attribute (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode & mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_create_attribute (const TAO_ClientRequestInfo_IR_ValueDef_create_attribute &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_create_attribute &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr type_;
+- const IR::AttributeMode & mode_;
+- const IR::ExceptionDefSeq & get_exceptions_;
+- const IR::ExceptionDefSeq & put_exceptions_;
+- void result (IR::AttributeDef_ptr result);
+- // update the result
+- IR::AttributeDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ValueDef_create_operation : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ValueDef;
+-
+- friend class _TAO_ValueDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ValueDef_create_operation (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode & mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ValueDef_create_operation (const TAO_ClientRequestInfo_IR_ValueDef_create_operation &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueDef_create_operation &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::IDLType_ptr result_;
+- const IR::OperationMode & mode_;
+- const IR::ParDescriptionSeq & params_;
+- const IR::ExceptionDefSeq & exceptions_;
+- const IR::ContextIdSeq & contexts_;
+- void result (IR::OperationDef_ptr result);
+- // update the result
+- IR::OperationDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
+-};
+-
+-
+-// The Proxy Implementations are used by each interface to
+-// perform a call. Each different implementation encapsulate
+-// an invocation logics.
+-
+-
+-///////////////////////////////////////////////////////////////////////
+-// Base Impl. Declaration
+-//
+-
+-class TAO_Export _TAO_ValueDef_Proxy_Impl :
+- public virtual IR::_TAO_Container_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Proxy_Impl
+-{
+-public:
+- virtual ~_TAO_ValueDef_Proxy_Impl (void) { }
+-
+- virtual IR::InterfaceDefSeq * supported_interfaces (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void supported_interfaces (
+- CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual IR::InitializerSeq * initializers (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void initializers (
+- CORBA_Object *_collocated_tao_target_,
+- const IR::InitializerSeq & initializers,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual IR::ValueDef_ptr base_value (
+- CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual void base_value (
+- CORBA_Object *_collocated_tao_target_,
+- IR::ValueDef_ptr base_value,
+- CORBA::Environment &ACE_TRY_ENV
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- )) = 0;
+-
+- virtual IR::ValueDefSeq * abstract_base_values (
++ virtual IR_ValueDefSeq * abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22565,7 +13445,7 @@
+
+ virtual void abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ValueDefSeq & abstract_base_values,
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22632,12 +13512,12 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ValueMemberDef_ptr create_value_member (
++ virtual IR_ValueMemberDef_ptr create_value_member (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22645,31 +13525,31 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::AttributeDef_ptr create_attribute (
++ virtual IR_AttributeDef_ptr create_attribute (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::OperationDef_ptr create_operation (
++ virtual IR_OperationDef_ptr create_operation (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22680,6 +13560,7 @@
+ _TAO_ValueDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -22692,9 +13573,9 @@
+ class TAO_Export _TAO_ValueDef_Remote_Proxy_Impl :
+ public virtual _TAO_ValueDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Container_Remote_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl,
+- public virtual IR::_TAO_IDLType_Remote_Proxy_Impl
++ public virtual _TAO_Container_Remote_Proxy_Impl,
++ public virtual _TAO_Contained_Remote_Proxy_Impl,
++ public virtual _TAO_IDLType_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -22702,7 +13583,7 @@
+
+ virtual ~_TAO_ValueDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDefSeq * supported_interfaces (
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22712,14 +13593,14 @@
+
+ virtual void supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & supported_interfaces,
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::InitializerSeq * initializers (
++ virtual IR_InitializerSeq * initializers (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22729,14 +13610,14 @@
+
+ virtual void initializers (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InitializerSeq & initializers,
++ const IR_InitializerSeq & initializers,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDef_ptr base_value (
++ virtual IR_ValueDef_ptr base_value (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22746,14 +13627,14 @@
+
+ virtual void base_value (
+ CORBA_Object *_collocated_tao_target_,
+- IR::ValueDef_ptr base_value,
++ IR_ValueDef_ptr base_value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDefSeq * abstract_base_values (
++ virtual IR_ValueDefSeq * abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22763,7 +13644,7 @@
+
+ virtual void abstract_base_values (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::ValueDefSeq & abstract_base_values,
++ const IR_ValueDefSeq & abstract_base_values,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22830,12 +13711,12 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueMemberDef_ptr create_value_member (
++ virtual IR_ValueMemberDef_ptr create_value_member (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
++ IR_IDLType_ptr type,
+ CORBA::Visibility access,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -22843,31 +13724,31 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::AttributeDef_ptr create_attribute (
++ virtual IR_AttributeDef_ptr create_attribute (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr type,
+- IR::AttributeMode mode,
+- const IR::ExceptionDefSeq & get_exceptions,
+- const IR::ExceptionDefSeq & put_exceptions,
++ IR_IDLType_ptr type,
++ IR_AttributeMode mode,
++ const IR_ExceptionDefSeq & get_exceptions,
++ const IR_ExceptionDefSeq & put_exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::OperationDef_ptr create_operation (
++ virtual IR_OperationDef_ptr create_operation (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::IDLType_ptr result,
+- IR::OperationMode mode,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- const IR::ContextIdSeq & contexts,
++ IR_IDLType_ptr result,
++ IR_OperationMode mode,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
++ const IR_ContextIdSeq & contexts,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -22896,8 +13777,9 @@
+ {
+ public:
+ virtual ~_TAO_ValueDef_Proxy_Broker (void);
++
+ virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
+- ValueDef *object,
++ IR_ValueDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -22922,9 +13804,9 @@
+ _TAO_ValueDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ValueDef_Proxy_Impl &select_proxy (
+- ValueDef *object,
++ IR_ValueDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -22938,24 +13820,15 @@
+ static _TAO_ValueDef_Remote_Proxy_Broker *the_TAO_ValueDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDef;
+-
+-struct ValueDescription;
+-class ValueDescription_var;
+-
+-struct TAO_Export ValueDescription
++struct TAO_Export IR_ValueDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ValueDescription_var _var_type;
++ typedef IR_ValueDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -22966,172 +13839,98 @@
+ CORBA::Boolean is_custom;
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+- ACE_NESTED_CLASS (IR, OpDescriptionSeq) operations;
+- ACE_NESTED_CLASS (IR, AttrDescriptionSeq) attributes;
+- ACE_NESTED_CLASS (IR, ValueMemberSeq) members;
+- ACE_NESTED_CLASS (IR, InitializerSeq) initializers;
+- ACE_NESTED_CLASS (IR, RepositoryIdSeq) supported_interfaces;
+- ACE_NESTED_CLASS (IR, RepositoryIdSeq) abstract_base_values;
++ IR_OpDescriptionSeq operations;
++ IR_AttrDescriptionSeq attributes;
++ IR_ValueMemberSeq members;
++ IR_InitializerSeq initializers;
++ IR_RepositoryIdSeq supported_interfaces;
++ IR_RepositoryIdSeq abstract_base_values;
+ CORBA::Boolean is_truncatable;
+ TAO_String_Manager base_value;
+ CORBA::TypeCode_var type;
+ };
+
+-class TAO_Export ValueDescription_var
++class TAO_Export IR_ValueDescription_var
+ {
+ public:
+- ValueDescription_var (void); // default constructor
+- ValueDescription_var (ValueDescription *);
+- ValueDescription_var (const ValueDescription_var &); // copy constructor
+- ~ValueDescription_var (void); // destructor
+-
+- ValueDescription_var &operator= (ValueDescription *);
+- ValueDescription_var &operator= (const ValueDescription_var &);
+- ValueDescription *operator-> (void);
+- const ValueDescription *operator-> (void) const;
+-
+- operator const ValueDescription &() const;
+- operator ValueDescription &();
+- operator ValueDescription &() const;
+- operator ValueDescription *&(); // variable-size types only
++ IR_ValueDescription_var (void); // default constructor
++ IR_ValueDescription_var (IR_ValueDescription *);
++ IR_ValueDescription_var (const IR_ValueDescription_var &); // copy constructor
++ ~IR_ValueDescription_var (void); // destructor
++
++ IR_ValueDescription_var &operator= (IR_ValueDescription *);
++ IR_ValueDescription_var &operator= (const IR_ValueDescription_var &);
++ IR_ValueDescription *operator-> (void);
++ const IR_ValueDescription *operator-> (void) const;
++
++ operator const IR_ValueDescription &() const;
++ operator IR_ValueDescription &();
++ operator IR_ValueDescription &() const;
++ operator IR_ValueDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const ValueDescription &in (void) const;
+- ValueDescription &inout (void);
+- ValueDescription *&out (void);
+- ValueDescription *_retn (void);
+- ValueDescription *ptr (void) const;
++ const IR_ValueDescription &in (void) const;
++ IR_ValueDescription &inout (void);
++ IR_ValueDescription *&out (void);
++ IR_ValueDescription *_retn (void);
++ IR_ValueDescription *ptr (void) const;
+
+ private:
+- ValueDescription *ptr_;
++ IR_ValueDescription *ptr_;
+ };
+
+-class TAO_Export ValueDescription_out
++class TAO_Export IR_ValueDescription_out
+ {
+ public:
+- ValueDescription_out (ValueDescription *&);
+- ValueDescription_out (ValueDescription_var &);
+- ValueDescription_out (const ValueDescription_out &);
+- ValueDescription_out &operator= (const ValueDescription_out &);
+- ValueDescription_out &operator= (ValueDescription *);
+- operator ValueDescription *&();
+- ValueDescription *&ptr (void);
+- ValueDescription *operator-> (void);
++ IR_ValueDescription_out (IR_ValueDescription *&);
++ IR_ValueDescription_out (IR_ValueDescription_var &);
++ IR_ValueDescription_out (const IR_ValueDescription_out &);
++ IR_ValueDescription_out &operator= (const IR_ValueDescription_out &);
++ IR_ValueDescription_out &operator= (IR_ValueDescription *);
++ operator IR_ValueDescription *&();
++ IR_ValueDescription *&ptr (void);
++ IR_ValueDescription *operator-> (void);
+
+ private:
+- ValueDescription *&ptr_;
++ IR_ValueDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ValueDescription_var &);
++ void operator= (const IR_ValueDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDescription;
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___PTR_CH_)
+-#define _TAO_IR_VALUEBOXDEF___PTR_CH_
++// Forward Classes Declaration
++class _TAO_ValueBoxDef_Proxy_Impl;
++class _TAO_ValueBoxDef_Remote_Proxy_Impl;
++class _TAO_ValueBoxDef_Proxy_Broker;
++class _TAO_ValueBoxDef_Remote_Proxy_Broker;
+
+-class ValueBoxDef;
+-typedef ValueBoxDef *ValueBoxDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___VAR_CH_)
+-#define _TAO_IR_VALUEBOXDEF___VAR_CH_
+-
+-class TAO_Export ValueBoxDef_var : public TAO_Base_var
+-{
+-public:
+- ValueBoxDef_var (void); // default constructor
+- ValueBoxDef_var (ValueBoxDef_ptr p) : ptr_ (p) {}
+- ValueBoxDef_var (const ValueBoxDef_var &); // copy constructor
+- ~ValueBoxDef_var (void); // destructor
+-
+- ValueBoxDef_var &operator= (ValueBoxDef_ptr);
+- ValueBoxDef_var &operator= (const ValueBoxDef_var &);
+- ValueBoxDef_ptr operator-> (void) const;
+-
+- operator const ValueBoxDef_ptr &() const;
+- operator ValueBoxDef_ptr &();
+- // in, inout, out, _retn
+- ValueBoxDef_ptr in (void) const;
+- ValueBoxDef_ptr &inout (void);
+- ValueBoxDef_ptr &out (void);
+- ValueBoxDef_ptr _retn (void);
+- ValueBoxDef_ptr ptr (void) const;
+-
+-private:
+- ValueBoxDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ValueBoxDef_var (const TAO_Base_var &rhs);
+- ValueBoxDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___OUT_CH_)
+-#define _TAO_IR_VALUEBOXDEF___OUT_CH_
+-
+-class TAO_Export ValueBoxDef_out
+-{
+-public:
+- ValueBoxDef_out (ValueBoxDef_ptr &);
+- ValueBoxDef_out (ValueBoxDef_var &);
+- ValueBoxDef_out (const ValueBoxDef_out &);
+- ValueBoxDef_out &operator= (const ValueBoxDef_out &);
+- ValueBoxDef_out &operator= (const ValueBoxDef_var &);
+- ValueBoxDef_out &operator= (ValueBoxDef_ptr);
+- operator ValueBoxDef_ptr &();
+- ValueBoxDef_ptr &ptr (void);
+- ValueBoxDef_ptr operator-> (void);
+-
+-private:
+- ValueBoxDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF_CH_)
+-#define _TAO_IR_VALUEBOXDEF_CH_
+-
+-// Forward Classes Declaration
+-class _TAO_ValueBoxDef_Proxy_Impl;
+-class _TAO_ValueBoxDef_Remote_Proxy_Impl;
+-class _TAO_ValueBoxDef_Proxy_Broker;
+-class _TAO_ValueBoxDef_Remote_Proxy_Broker;
+-
+-class TAO_Export ValueBoxDef: public virtual TypedefDef
++class TAO_Export IR_ValueBoxDef: public virtual IR_TypedefDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ValueBoxDef_ptr _ptr_type;
+- typedef ValueBoxDef_var _var_type;
++ typedef IR_ValueBoxDef_ptr _ptr_type;
++ typedef IR_ValueBoxDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ValueBoxDef_ptr _duplicate (ValueBoxDef_ptr obj);
+- static ValueBoxDef_ptr _narrow (
++ static IR_ValueBoxDef_ptr _duplicate (IR_ValueBoxDef_ptr obj);
++ static IR_ValueBoxDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ValueBoxDef_ptr _unchecked_narrow (
++ static IR_ValueBoxDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ValueBoxDef_ptr _nil (void)
++ static IR_ValueBoxDef_ptr _nil (void)
+ {
+- return (ValueBoxDef_ptr)0;
++ return (IR_ValueBoxDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::IDLType_ptr original_type_def (
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23140,7 +13939,7 @@
+ ));
+
+ virtual void original_type_def (
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23161,121 +13960,27 @@
+ _TAO_ValueBoxDef_Proxy_Broker *the_TAO_ValueBoxDef_Proxy_Broker_;
+
+ protected:
+- ValueBoxDef (int collocated = 0);
++ IR_ValueBoxDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ValueBoxDef (
++ IR_ValueBoxDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
+-
+- virtual ~ValueBoxDef (void);
+- private:
+- ValueBoxDef (const ValueBoxDef &);
+- void operator= (const ValueBoxDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ValueBoxDef;
+-
+- friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_get &);
+- void result (IR::IDLType_ptr result);
+- // update the result
+- IR::IDLType_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ValueBoxDef;
+-
+- friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
+- friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- IR::IDLType_ptr original_type_def,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_ValueBoxDef_Remote_Proxy_Impl;
++ friend class _TAO_ValueBoxDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_ValueBoxDef_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_ValueBoxDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ValueBoxDef_original_type_def_set &);
+- IR::IDLType_ptr original_type_def_;
+-
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_ValueBoxDef (const IR_ValueBoxDef &);
++ void operator= (const IR_ValueBoxDef &);
+ };
+
+
+@@ -23289,12 +13994,12 @@
+ //
+
+ class TAO_Export _TAO_ValueBoxDef_Proxy_Impl :
+- public virtual IR::_TAO_TypedefDef_Proxy_Impl
++ public virtual _TAO_TypedefDef_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ValueBoxDef_Proxy_Impl (void) { }
+
+- virtual IR::IDLType_ptr original_type_def (
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23304,7 +14009,7 @@
+
+ virtual void original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -23315,6 +14020,7 @@
+ _TAO_ValueBoxDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -23327,7 +14033,7 @@
+ class TAO_Export _TAO_ValueBoxDef_Remote_Proxy_Impl :
+ public virtual _TAO_ValueBoxDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_TypedefDef_Remote_Proxy_Impl
++ public virtual _TAO_TypedefDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -23335,9 +14041,9 @@
+
+ virtual ~_TAO_ValueBoxDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::IDLType_ptr original_type_def (
++ virtual IR_IDLType_ptr original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+@@ -23345,7 +14051,7 @@
+
+ virtual void original_type_def (
+ CORBA_Object *_collocated_tao_target_,
+- IR::IDLType_ptr original_type_def,
++ IR_IDLType_ptr original_type_def,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -23374,8 +14080,9 @@
+ {
+ public:
+ virtual ~_TAO_ValueBoxDef_Proxy_Broker (void);
++
+ virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
+- ValueBoxDef *object,
++ IR_ValueBoxDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -23400,9 +14107,9 @@
+ _TAO_ValueBoxDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ValueBoxDef_Proxy_Impl &select_proxy (
+- ValueBoxDef *object,
++ IR_ValueBoxDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -23416,122 +14123,44 @@
+ static _TAO_ValueBoxDef_Remote_Proxy_Broker *the_TAO_ValueBoxDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueBoxDef;
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___PTR_CH_)
+-#define _TAO_IR_PROVIDESDEF___PTR_CH_
+-
+-class ProvidesDef;
+-typedef ProvidesDef *ProvidesDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___VAR_CH_)
+-#define _TAO_IR_PROVIDESDEF___VAR_CH_
+-
+-class TAO_Export ProvidesDef_var : public TAO_Base_var
+-{
+-public:
+- ProvidesDef_var (void); // default constructor
+- ProvidesDef_var (ProvidesDef_ptr p) : ptr_ (p) {}
+- ProvidesDef_var (const ProvidesDef_var &); // copy constructor
+- ~ProvidesDef_var (void); // destructor
+-
+- ProvidesDef_var &operator= (ProvidesDef_ptr);
+- ProvidesDef_var &operator= (const ProvidesDef_var &);
+- ProvidesDef_ptr operator-> (void) const;
+-
+- operator const ProvidesDef_ptr &() const;
+- operator ProvidesDef_ptr &();
+- // in, inout, out, _retn
+- ProvidesDef_ptr in (void) const;
+- ProvidesDef_ptr &inout (void);
+- ProvidesDef_ptr &out (void);
+- ProvidesDef_ptr _retn (void);
+- ProvidesDef_ptr ptr (void) const;
+-
+-private:
+- ProvidesDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ProvidesDef_var (const TAO_Base_var &rhs);
+- ProvidesDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___OUT_CH_)
+-#define _TAO_IR_PROVIDESDEF___OUT_CH_
+-
+-class TAO_Export ProvidesDef_out
+-{
+-public:
+- ProvidesDef_out (ProvidesDef_ptr &);
+- ProvidesDef_out (ProvidesDef_var &);
+- ProvidesDef_out (const ProvidesDef_out &);
+- ProvidesDef_out &operator= (const ProvidesDef_out &);
+- ProvidesDef_out &operator= (const ProvidesDef_var &);
+- ProvidesDef_out &operator= (ProvidesDef_ptr);
+- operator ProvidesDef_ptr &();
+- ProvidesDef_ptr &ptr (void);
+- ProvidesDef_ptr operator-> (void);
+-
+-private:
+- ProvidesDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF_CH_)
+-#define _TAO_IR_PROVIDESDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_ProvidesDef_Proxy_Impl;
+ class _TAO_ProvidesDef_Remote_Proxy_Impl;
+ class _TAO_ProvidesDef_Proxy_Broker;
+ class _TAO_ProvidesDef_Remote_Proxy_Broker;
+
+-class TAO_Export ProvidesDef: public virtual Contained
++class TAO_Export IR_ProvidesDef: public virtual IR_Contained
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ProvidesDef_ptr _ptr_type;
+- typedef ProvidesDef_var _var_type;
++ typedef IR_ProvidesDef_ptr _ptr_type;
++ typedef IR_ProvidesDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ProvidesDef_ptr _duplicate (ProvidesDef_ptr obj);
+- static ProvidesDef_ptr _narrow (
++ static IR_ProvidesDef_ptr _duplicate (IR_ProvidesDef_ptr obj);
++ static IR_ProvidesDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ProvidesDef_ptr _unchecked_narrow (
++ static IR_ProvidesDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ProvidesDef_ptr _nil (void)
++ static IR_ProvidesDef_ptr _nil (void)
+ {
+- return (ProvidesDef_ptr)0;
++ return (IR_ProvidesDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::InterfaceDef_ptr interface_type (
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23552,78 +14181,27 @@
+ _TAO_ProvidesDef_Proxy_Broker *the_TAO_ProvidesDef_Proxy_Broker_;
+
+ protected:
+- ProvidesDef (int collocated = 0);
++ IR_ProvidesDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ProvidesDef (
++ IR_ProvidesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
+- friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
+-
+- virtual ~ProvidesDef (void);
+- private:
+- ProvidesDef (const ProvidesDef &);
+- void operator= (const ProvidesDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ProvidesDef;
+-
+- friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
+- friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ );
+
+- private:
+- TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ProvidesDef_interface_type_get &);
+- void result (IR::InterfaceDef_ptr result);
+- // update the result
+- IR::InterfaceDef_ptr result_;
+- };
++ friend class _TAO_ProvidesDef_Remote_Proxy_Impl;
++ friend class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_ProvidesDef_Direct_Proxy_Impl;
+
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
++ virtual ~IR_ProvidesDef (void);
++private:
++ IR_ProvidesDef (const IR_ProvidesDef &);
++ void operator= (const IR_ProvidesDef &);
+ };
+
+
+@@ -23637,12 +14215,12 @@
+ //
+
+ class TAO_Export _TAO_ProvidesDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ProvidesDef_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDef_ptr interface_type (
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23654,6 +14232,7 @@
+ _TAO_ProvidesDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -23666,7 +14245,7 @@
+ class TAO_Export _TAO_ProvidesDef_Remote_Proxy_Impl :
+ public virtual _TAO_ProvidesDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -23674,7 +14253,7 @@
+
+ virtual ~_TAO_ProvidesDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDef_ptr interface_type (
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -23704,8 +14283,9 @@
+ {
+ public:
+ virtual ~_TAO_ProvidesDef_Proxy_Broker (void);
++
+ virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
+- ProvidesDef *object,
++ IR_ProvidesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -23730,9 +14310,9 @@
+ _TAO_ProvidesDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ProvidesDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ProvidesDef_Proxy_Impl &select_proxy (
+- ProvidesDef *object,
++ IR_ProvidesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -23746,24 +14326,15 @@
+ static _TAO_ProvidesDef_Remote_Proxy_Broker *the_TAO_ProvidesDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDef;
+-
+-struct ProvidesDescription;
+-class ProvidesDescription_var;
+-
+-struct TAO_Export ProvidesDescription
++struct TAO_Export IR_ProvidesDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ProvidesDescription_var _var_type;
++ typedef IR_ProvidesDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -23772,164 +14343,90 @@
+ TAO_String_Manager id;
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+- ACE_NESTED_CLASS (IR, InterfaceDef_var) interface_type;
++ IR_InterfaceDef_var interface_type;
+ };
+
+-class TAO_Export ProvidesDescription_var
++class TAO_Export IR_ProvidesDescription_var
+ {
+ public:
+- ProvidesDescription_var (void); // default constructor
+- ProvidesDescription_var (ProvidesDescription *);
+- ProvidesDescription_var (const ProvidesDescription_var &); // copy constructor
+- ~ProvidesDescription_var (void); // destructor
++ IR_ProvidesDescription_var (void); // default constructor
++ IR_ProvidesDescription_var (IR_ProvidesDescription *);
++ IR_ProvidesDescription_var (const IR_ProvidesDescription_var &); // copy constructor
++ ~IR_ProvidesDescription_var (void); // destructor
+
+- ProvidesDescription_var &operator= (ProvidesDescription *);
+- ProvidesDescription_var &operator= (const ProvidesDescription_var &);
+- ProvidesDescription *operator-> (void);
+- const ProvidesDescription *operator-> (void) const;
++ IR_ProvidesDescription_var &operator= (IR_ProvidesDescription *);
++ IR_ProvidesDescription_var &operator= (const IR_ProvidesDescription_var &);
++ IR_ProvidesDescription *operator-> (void);
++ const IR_ProvidesDescription *operator-> (void) const;
+
+- operator const ProvidesDescription &() const;
+- operator ProvidesDescription &();
+- operator ProvidesDescription &() const;
+- operator ProvidesDescription *&(); // variable-size types only
++ operator const IR_ProvidesDescription &() const;
++ operator IR_ProvidesDescription &();
++ operator IR_ProvidesDescription &() const;
++ operator IR_ProvidesDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const ProvidesDescription &in (void) const;
+- ProvidesDescription &inout (void);
+- ProvidesDescription *&out (void);
+- ProvidesDescription *_retn (void);
+- ProvidesDescription *ptr (void) const;
++ const IR_ProvidesDescription &in (void) const;
++ IR_ProvidesDescription &inout (void);
++ IR_ProvidesDescription *&out (void);
++ IR_ProvidesDescription *_retn (void);
++ IR_ProvidesDescription *ptr (void) const;
+
+ private:
+- ProvidesDescription *ptr_;
++ IR_ProvidesDescription *ptr_;
+ };
+
+-class TAO_Export ProvidesDescription_out
++class TAO_Export IR_ProvidesDescription_out
+ {
+ public:
+- ProvidesDescription_out (ProvidesDescription *&);
+- ProvidesDescription_out (ProvidesDescription_var &);
+- ProvidesDescription_out (const ProvidesDescription_out &);
+- ProvidesDescription_out &operator= (const ProvidesDescription_out &);
+- ProvidesDescription_out &operator= (ProvidesDescription *);
+- operator ProvidesDescription *&();
+- ProvidesDescription *&ptr (void);
+- ProvidesDescription *operator-> (void);
++ IR_ProvidesDescription_out (IR_ProvidesDescription *&);
++ IR_ProvidesDescription_out (IR_ProvidesDescription_var &);
++ IR_ProvidesDescription_out (const IR_ProvidesDescription_out &);
++ IR_ProvidesDescription_out &operator= (const IR_ProvidesDescription_out &);
++ IR_ProvidesDescription_out &operator= (IR_ProvidesDescription *);
++ operator IR_ProvidesDescription *&();
++ IR_ProvidesDescription *&ptr (void);
++ IR_ProvidesDescription *operator-> (void);
+
+ private:
+- ProvidesDescription *&ptr_;
++ IR_ProvidesDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ProvidesDescription_var &);
+-};
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescription;
+-
+-
+-#if !defined (_TAO_IR_USESDEF___PTR_CH_)
+-#define _TAO_IR_USESDEF___PTR_CH_
+-
+-class UsesDef;
+-typedef UsesDef *UsesDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEF___VAR_CH_)
+-#define _TAO_IR_USESDEF___VAR_CH_
+-
+-class TAO_Export UsesDef_var : public TAO_Base_var
+-{
+-public:
+- UsesDef_var (void); // default constructor
+- UsesDef_var (UsesDef_ptr p) : ptr_ (p) {}
+- UsesDef_var (const UsesDef_var &); // copy constructor
+- ~UsesDef_var (void); // destructor
+-
+- UsesDef_var &operator= (UsesDef_ptr);
+- UsesDef_var &operator= (const UsesDef_var &);
+- UsesDef_ptr operator-> (void) const;
+-
+- operator const UsesDef_ptr &() const;
+- operator UsesDef_ptr &();
+- // in, inout, out, _retn
+- UsesDef_ptr in (void) const;
+- UsesDef_ptr &inout (void);
+- UsesDef_ptr &out (void);
+- UsesDef_ptr _retn (void);
+- UsesDef_ptr ptr (void) const;
+-
+-private:
+- UsesDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- UsesDef_var (const TAO_Base_var &rhs);
+- UsesDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEF___OUT_CH_)
+-#define _TAO_IR_USESDEF___OUT_CH_
+-
+-class TAO_Export UsesDef_out
+-{
+-public:
+- UsesDef_out (UsesDef_ptr &);
+- UsesDef_out (UsesDef_var &);
+- UsesDef_out (const UsesDef_out &);
+- UsesDef_out &operator= (const UsesDef_out &);
+- UsesDef_out &operator= (const UsesDef_var &);
+- UsesDef_out &operator= (UsesDef_ptr);
+- operator UsesDef_ptr &();
+- UsesDef_ptr &ptr (void);
+- UsesDef_ptr operator-> (void);
+-
+-private:
+- UsesDef_ptr &ptr_;
++ void operator= (const IR_ProvidesDescription_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEF_CH_)
+-#define _TAO_IR_USESDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_UsesDef_Proxy_Impl;
+ class _TAO_UsesDef_Remote_Proxy_Impl;
+ class _TAO_UsesDef_Proxy_Broker;
+ class _TAO_UsesDef_Remote_Proxy_Broker;
+
+-class TAO_Export UsesDef: public virtual Contained
++class TAO_Export IR_UsesDef: public virtual IR_Contained
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef UsesDef_ptr _ptr_type;
+- typedef UsesDef_var _var_type;
++ typedef IR_UsesDef_ptr _ptr_type;
++ typedef IR_UsesDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static UsesDef_ptr _duplicate (UsesDef_ptr obj);
+- static UsesDef_ptr _narrow (
++ static IR_UsesDef_ptr _duplicate (IR_UsesDef_ptr obj);
++ static IR_UsesDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static UsesDef_ptr _unchecked_narrow (
++ static IR_UsesDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static UsesDef_ptr _nil (void)
++ static IR_UsesDef_ptr _nil (void)
+ {
+- return (UsesDef_ptr)0;
++ return (IR_UsesDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::InterfaceDef_ptr interface_type (
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -23958,121 +14455,27 @@
+ _TAO_UsesDef_Proxy_Broker *the_TAO_UsesDef_Proxy_Broker_;
+
+ protected:
+- UsesDef (int collocated = 0);
++ IR_UsesDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- UsesDef (
++ IR_UsesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_UsesDef_Remote_Proxy_Impl;
+- friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_UsesDef_Direct_Proxy_Impl;
+-
+- virtual ~UsesDef (void);
+- private:
+- UsesDef (const UsesDef &);
+- void operator= (const UsesDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_UsesDef_interface_type_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::UsesDef;
+-
+- friend class _TAO_UsesDef_Remote_Proxy_Impl;
+- friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_UsesDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_UsesDef_interface_type_get (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_UsesDef_interface_type_get &);
+- void result (IR::InterfaceDef_ptr result);
+- // update the result
+- IR::InterfaceDef_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::UsesDef;
+-
+- friend class _TAO_UsesDef_Remote_Proxy_Impl;
+- friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_UsesDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_UsesDef_Remote_Proxy_Impl;
++ friend class _TAO_UsesDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_UsesDef_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_UsesDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get (const TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_UsesDef_is_multiple_get &);
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_UsesDef (const IR_UsesDef &);
++ void operator= (const IR_UsesDef &);
+ };
+
+
+@@ -24086,12 +14489,12 @@
+ //
+
+ class TAO_Export _TAO_UsesDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_UsesDef_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDef_ptr interface_type (
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -24111,6 +14514,7 @@
+ _TAO_UsesDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -24123,7 +14527,7 @@
+ class TAO_Export _TAO_UsesDef_Remote_Proxy_Impl :
+ public virtual _TAO_UsesDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -24131,7 +14535,7 @@
+
+ virtual ~_TAO_UsesDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDef_ptr interface_type (
++ virtual IR_InterfaceDef_ptr interface_type (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -24169,8 +14573,9 @@
+ {
+ public:
+ virtual ~_TAO_UsesDef_Proxy_Broker (void);
++
+ virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
+- UsesDef *object,
++ IR_UsesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -24195,9 +14600,9 @@
+ _TAO_UsesDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_UsesDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_UsesDef_Proxy_Impl &select_proxy (
+- UsesDef *object,
++ IR_UsesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -24211,24 +14616,15 @@
+ static _TAO_UsesDef_Remote_Proxy_Broker *the_TAO_UsesDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDef;
+-
+-struct UsesDescription;
+-class UsesDescription_var;
+-
+-struct TAO_Export UsesDescription
++struct TAO_Export IR_UsesDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef UsesDescription_var _var_type;
++ typedef IR_UsesDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -24237,65 +14633,61 @@
+ TAO_String_Manager id;
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+- ACE_NESTED_CLASS (IR, InterfaceDef_var) interface_type;
++ IR_InterfaceDef_var interface_type;
+ CORBA::Boolean is_multiple;
+ };
+
+-class TAO_Export UsesDescription_var
++class TAO_Export IR_UsesDescription_var
+ {
+ public:
+- UsesDescription_var (void); // default constructor
+- UsesDescription_var (UsesDescription *);
+- UsesDescription_var (const UsesDescription_var &); // copy constructor
+- ~UsesDescription_var (void); // destructor
+-
+- UsesDescription_var &operator= (UsesDescription *);
+- UsesDescription_var &operator= (const UsesDescription_var &);
+- UsesDescription *operator-> (void);
+- const UsesDescription *operator-> (void) const;
+-
+- operator const UsesDescription &() const;
+- operator UsesDescription &();
+- operator UsesDescription &() const;
+- operator UsesDescription *&(); // variable-size types only
++ IR_UsesDescription_var (void); // default constructor
++ IR_UsesDescription_var (IR_UsesDescription *);
++ IR_UsesDescription_var (const IR_UsesDescription_var &); // copy constructor
++ ~IR_UsesDescription_var (void); // destructor
++
++ IR_UsesDescription_var &operator= (IR_UsesDescription *);
++ IR_UsesDescription_var &operator= (const IR_UsesDescription_var &);
++ IR_UsesDescription *operator-> (void);
++ const IR_UsesDescription *operator-> (void) const;
++
++ operator const IR_UsesDescription &() const;
++ operator IR_UsesDescription &();
++ operator IR_UsesDescription &() const;
++ operator IR_UsesDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const UsesDescription &in (void) const;
+- UsesDescription &inout (void);
+- UsesDescription *&out (void);
+- UsesDescription *_retn (void);
+- UsesDescription *ptr (void) const;
++ const IR_UsesDescription &in (void) const;
++ IR_UsesDescription &inout (void);
++ IR_UsesDescription *&out (void);
++ IR_UsesDescription *_retn (void);
++ IR_UsesDescription *ptr (void) const;
+
+ private:
+- UsesDescription *ptr_;
++ IR_UsesDescription *ptr_;
+ };
+
+-class TAO_Export UsesDescription_out
++class TAO_Export IR_UsesDescription_out
+ {
+ public:
+- UsesDescription_out (UsesDescription *&);
+- UsesDescription_out (UsesDescription_var &);
+- UsesDescription_out (const UsesDescription_out &);
+- UsesDescription_out &operator= (const UsesDescription_out &);
+- UsesDescription_out &operator= (UsesDescription *);
+- operator UsesDescription *&();
+- UsesDescription *&ptr (void);
+- UsesDescription *operator-> (void);
++ IR_UsesDescription_out (IR_UsesDescription *&);
++ IR_UsesDescription_out (IR_UsesDescription_var &);
++ IR_UsesDescription_out (const IR_UsesDescription_out &);
++ IR_UsesDescription_out &operator= (const IR_UsesDescription_out &);
++ IR_UsesDescription_out &operator= (IR_UsesDescription *);
++ operator IR_UsesDescription *&();
++ IR_UsesDescription *&ptr (void);
++ IR_UsesDescription *operator-> (void);
+
+ private:
+- UsesDescription *&ptr_;
++ IR_UsesDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const UsesDescription_var &);
++ void operator= (const IR_UsesDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescription;
+-
++TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IR_UsesDescription;
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_ProvidesDescSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -24305,149 +14697,118 @@
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- ProvidesDescription *data,
++ IR_ProvidesDescription *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void); // Dtor.
+ // = Accessors.
+- ProvidesDescription &operator[] (CORBA::ULong i);
+- const ProvidesDescription &operator[] (CORBA::ULong i) const;
++ IR_ProvidesDescription &operator[] (CORBA::ULong i);
++ const IR_ProvidesDescription &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static ProvidesDescription *allocbuf (CORBA::ULong size);
+- static void freebuf (ProvidesDescription *buffer);
++ static IR_ProvidesDescription *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_ProvidesDescription *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
+- const ProvidesDescription *get_buffer (void) const;
++ IR_ProvidesDescription *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_ProvidesDescription *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- ProvidesDescription *data,
++ IR_ProvidesDescription *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PROVIDESDESCSEQ_CH_)
+-#define _TAO_IR_PROVIDESDESCSEQ_CH_
+-
+-class ProvidesDescSeq;
+-class ProvidesDescSeq_var;
+-
+ // *************************************************************
+-// ProvidesDescSeq
++// IR_ProvidesDescSeq
+ // *************************************************************
+
+-class TAO_Export ProvidesDescSeq : public
++class TAO_Export IR_ProvidesDescSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<ProvidesDescription>
++ TAO_Unbounded_Sequence<IR_ProvidesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- ProvidesDescSeq (void); // default ctor
+- ProvidesDescSeq (CORBA::ULong max); // uses max size
+- ProvidesDescSeq (
++ IR_ProvidesDescSeq (void); // default ctor
++ IR_ProvidesDescSeq (CORBA::ULong max); // uses max size
++ IR_ProvidesDescSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- ProvidesDescription *buffer,
++ IR_ProvidesDescription *buffer,
+ CORBA::Boolean release = 0
+ );
+- ProvidesDescSeq (const ProvidesDescSeq &); // copy ctor
+- ~ProvidesDescSeq (void);
++ IR_ProvidesDescSeq (const IR_ProvidesDescSeq &); // copy ctor
++ ~IR_ProvidesDescSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ProvidesDescSeq_var _var_type;
++ typedef IR_ProvidesDescSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDESCSEQ___VAR_CH_)
+-#define _TAO_IR_PROVIDESDESCSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::ProvidesDescSeq_var
++// class IR_ProvidesDescSeq_var
+ // *************************************************************
+
+-class TAO_Export ProvidesDescSeq_var
++class TAO_Export IR_ProvidesDescSeq_var
+ {
+ public:
+- ProvidesDescSeq_var (void); // default constructor
+- ProvidesDescSeq_var (ProvidesDescSeq *);
+- ProvidesDescSeq_var (const ProvidesDescSeq_var &); // copy constructor
+- ~ProvidesDescSeq_var (void); // destructor
++ IR_ProvidesDescSeq_var (void); // default constructor
++ IR_ProvidesDescSeq_var (IR_ProvidesDescSeq *);
++ IR_ProvidesDescSeq_var (const IR_ProvidesDescSeq_var &); // copy constructor
++ ~IR_ProvidesDescSeq_var (void); // destructor
+
+- ProvidesDescSeq_var &operator= (ProvidesDescSeq *);
+- ProvidesDescSeq_var &operator= (const ProvidesDescSeq_var &);
+- ProvidesDescSeq *operator-> (void);
+- const ProvidesDescSeq *operator-> (void) const;
++ IR_ProvidesDescSeq_var &operator= (IR_ProvidesDescSeq *);
++ IR_ProvidesDescSeq_var &operator= (const IR_ProvidesDescSeq_var &);
++ IR_ProvidesDescSeq *operator-> (void);
++ const IR_ProvidesDescSeq *operator-> (void) const;
+
+- operator const ProvidesDescSeq &() const;
+- operator ProvidesDescSeq &();
+- operator ProvidesDescSeq &() const;
+- operator ProvidesDescSeq *&(); // variable-size base types only
++ operator const IR_ProvidesDescSeq &() const;
++ operator IR_ProvidesDescSeq &();
++ operator IR_ProvidesDescSeq &() const;
++ operator IR_ProvidesDescSeq *&(); // variable-size base types only
+
+- ProvidesDescription & operator[] (CORBA::ULong index);
+- const ProvidesDescription & operator[] (CORBA::ULong index) const;
++ IR_ProvidesDescription & operator[] (CORBA::ULong index);
++ const IR_ProvidesDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const ProvidesDescSeq &in (void) const;
+- ProvidesDescSeq &inout (void);
+- ProvidesDescSeq *&out (void);
+- ProvidesDescSeq *_retn (void);
+- ProvidesDescSeq *ptr (void) const;
++ const IR_ProvidesDescSeq &in (void) const;
++ IR_ProvidesDescSeq &inout (void);
++ IR_ProvidesDescSeq *&out (void);
++ IR_ProvidesDescSeq *_retn (void);
++ IR_ProvidesDescSeq *ptr (void) const;
+
+ private:
+- ProvidesDescSeq *ptr_;
++ IR_ProvidesDescSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDESCSEQ___OUT_CH_)
+-#define _TAO_IR_PROVIDESDESCSEQ___OUT_CH_
+-
+-class TAO_Export ProvidesDescSeq_out
++class TAO_Export IR_ProvidesDescSeq_out
+ {
+ public:
+- ProvidesDescSeq_out (ProvidesDescSeq *&);
+- ProvidesDescSeq_out (ProvidesDescSeq_var &);
+- ProvidesDescSeq_out (const ProvidesDescSeq_out &);
+- ProvidesDescSeq_out &operator= (const ProvidesDescSeq_out &);
+- ProvidesDescSeq_out &operator= (ProvidesDescSeq *);
+- operator ProvidesDescSeq *&();
+- ProvidesDescSeq *&ptr (void);
+- ProvidesDescSeq *operator-> (void);
+- ProvidesDescription & operator[] (CORBA::ULong index);
++ IR_ProvidesDescSeq_out (IR_ProvidesDescSeq *&);
++ IR_ProvidesDescSeq_out (IR_ProvidesDescSeq_var &);
++ IR_ProvidesDescSeq_out (const IR_ProvidesDescSeq_out &);
++ IR_ProvidesDescSeq_out &operator= (const IR_ProvidesDescSeq_out &);
++ IR_ProvidesDescSeq_out &operator= (IR_ProvidesDescSeq *);
++ operator IR_ProvidesDescSeq *&();
++ IR_ProvidesDescSeq *&ptr (void);
++ IR_ProvidesDescSeq *operator-> (void);
++ IR_ProvidesDescription & operator[] (CORBA::ULong index);
+
+ private:
+- ProvidesDescSeq *&ptr_;
++ IR_ProvidesDescSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const ProvidesDescSeq_var &);
++ void operator= (const IR_ProvidesDescSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ProvidesDescSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CH_
+-
+ class TAO_EXPORT_NESTED_MACRO _TAO_Unbounded_Sequence_IR_UsesDescSeq : public TAO_Unbounded_Base_Sequence
+ {
+ public:
+@@ -24457,244 +14818,145 @@
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum);
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- UsesDescription *data,
++ IR_UsesDescription *data,
+ CORBA::Boolean release = 0);
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs);
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq &operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs);
+ virtual ~_TAO_Unbounded_Sequence_IR_UsesDescSeq (void); // Dtor.
+ // = Accessors.
+- UsesDescription &operator[] (CORBA::ULong i);
+- const UsesDescription &operator[] (CORBA::ULong i) const;
++ IR_UsesDescription &operator[] (CORBA::ULong i);
++ const IR_UsesDescription &operator[] (CORBA::ULong i) const;
+ // = Static operations.
+- static UsesDescription *allocbuf (CORBA::ULong size);
+- static void freebuf (UsesDescription *buffer);
++ static IR_UsesDescription *allocbuf (CORBA::ULong size);
++ static void freebuf (IR_UsesDescription *buffer);
+ virtual void _allocate_buffer (CORBA::ULong length);
+ virtual void _deallocate_buffer (void);
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
+- const UsesDescription *get_buffer (void) const;
++ IR_UsesDescription *get_buffer (CORBA::Boolean orphan = 0);
++ const IR_UsesDescription *get_buffer (void) const;
+ void replace (CORBA::ULong max,
+ CORBA::ULong length,
+- UsesDescription *data,
++ IR_UsesDescription *data,
+ CORBA::Boolean release);
+ };
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_USESDESCSEQ_CH_)
+-#define _TAO_IR_USESDESCSEQ_CH_
+-
+-class UsesDescSeq;
+-class UsesDescSeq_var;
+-
+ // *************************************************************
+-// UsesDescSeq
++// IR_UsesDescSeq
+ // *************************************************************
+
+-class TAO_Export UsesDescSeq : public
++class TAO_Export IR_UsesDescSeq : public
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq
+ #else /* TAO_USE_SEQUENCE_TEMPLATES */
+- TAO_Unbounded_Sequence<UsesDescription>
++ TAO_Unbounded_Sequence<IR_UsesDescription>
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+ {
+ public:
+- UsesDescSeq (void); // default ctor
+- UsesDescSeq (CORBA::ULong max); // uses max size
+- UsesDescSeq (
++ IR_UsesDescSeq (void); // default ctor
++ IR_UsesDescSeq (CORBA::ULong max); // uses max size
++ IR_UsesDescSeq (
+ CORBA::ULong max,
+ CORBA::ULong length,
+- UsesDescription *buffer,
++ IR_UsesDescription *buffer,
+ CORBA::Boolean release = 0
+ );
+- UsesDescSeq (const UsesDescSeq &); // copy ctor
+- ~UsesDescSeq (void);
++ IR_UsesDescSeq (const IR_UsesDescSeq &); // copy ctor
++ ~IR_UsesDescSeq (void);
+ static void _tao_any_destructor (void*);
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef UsesDescSeq_var _var_type;
++ typedef IR_UsesDescSeq_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ };
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDESCSEQ___VAR_CH_)
+-#define _TAO_IR_USESDESCSEQ___VAR_CH_
+-
+ // *************************************************************
+-// class IR::UsesDescSeq_var
++// class IR_UsesDescSeq_var
+ // *************************************************************
+
+-class TAO_Export UsesDescSeq_var
++class TAO_Export IR_UsesDescSeq_var
+ {
+ public:
+- UsesDescSeq_var (void); // default constructor
+- UsesDescSeq_var (UsesDescSeq *);
+- UsesDescSeq_var (const UsesDescSeq_var &); // copy constructor
+- ~UsesDescSeq_var (void); // destructor
++ IR_UsesDescSeq_var (void); // default constructor
++ IR_UsesDescSeq_var (IR_UsesDescSeq *);
++ IR_UsesDescSeq_var (const IR_UsesDescSeq_var &); // copy constructor
++ ~IR_UsesDescSeq_var (void); // destructor
+
+- UsesDescSeq_var &operator= (UsesDescSeq *);
+- UsesDescSeq_var &operator= (const UsesDescSeq_var &);
+- UsesDescSeq *operator-> (void);
+- const UsesDescSeq *operator-> (void) const;
++ IR_UsesDescSeq_var &operator= (IR_UsesDescSeq *);
++ IR_UsesDescSeq_var &operator= (const IR_UsesDescSeq_var &);
++ IR_UsesDescSeq *operator-> (void);
++ const IR_UsesDescSeq *operator-> (void) const;
+
+- operator const UsesDescSeq &() const;
+- operator UsesDescSeq &();
+- operator UsesDescSeq &() const;
+- operator UsesDescSeq *&(); // variable-size base types only
++ operator const IR_UsesDescSeq &() const;
++ operator IR_UsesDescSeq &();
++ operator IR_UsesDescSeq &() const;
++ operator IR_UsesDescSeq *&(); // variable-size base types only
+
+- UsesDescription & operator[] (CORBA::ULong index);
+- const UsesDescription & operator[] (CORBA::ULong index) const;
++ IR_UsesDescription & operator[] (CORBA::ULong index);
++ const IR_UsesDescription & operator[] (CORBA::ULong index) const;
+
+ // in, inout, out, _retn
+- const UsesDescSeq &in (void) const;
+- UsesDescSeq &inout (void);
+- UsesDescSeq *&out (void);
+- UsesDescSeq *_retn (void);
+- UsesDescSeq *ptr (void) const;
++ const IR_UsesDescSeq &in (void) const;
++ IR_UsesDescSeq &inout (void);
++ IR_UsesDescSeq *&out (void);
++ IR_UsesDescSeq *_retn (void);
++ IR_UsesDescSeq *ptr (void) const;
+
+ private:
+- UsesDescSeq *ptr_;
++ IR_UsesDescSeq *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDESCSEQ___OUT_CH_)
+-#define _TAO_IR_USESDESCSEQ___OUT_CH_
+-
+-class TAO_Export UsesDescSeq_out
++class TAO_Export IR_UsesDescSeq_out
+ {
+ public:
+- UsesDescSeq_out (UsesDescSeq *&);
+- UsesDescSeq_out (UsesDescSeq_var &);
+- UsesDescSeq_out (const UsesDescSeq_out &);
+- UsesDescSeq_out &operator= (const UsesDescSeq_out &);
+- UsesDescSeq_out &operator= (UsesDescSeq *);
+- operator UsesDescSeq *&();
+- UsesDescSeq *&ptr (void);
+- UsesDescSeq *operator-> (void);
+- UsesDescription & operator[] (CORBA::ULong index);
++ IR_UsesDescSeq_out (IR_UsesDescSeq *&);
++ IR_UsesDescSeq_out (IR_UsesDescSeq_var &);
++ IR_UsesDescSeq_out (const IR_UsesDescSeq_out &);
++ IR_UsesDescSeq_out &operator= (const IR_UsesDescSeq_out &);
++ IR_UsesDescSeq_out &operator= (IR_UsesDescSeq *);
++ operator IR_UsesDescSeq *&();
++ IR_UsesDescSeq *&ptr (void);
++ IR_UsesDescSeq *operator-> (void);
++ IR_UsesDescription & operator[] (CORBA::ULong index);
+
+ private:
+- UsesDescSeq *&ptr_;
++ IR_UsesDescSeq *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const UsesDescSeq_var &);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UsesDescSeq;
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF___PTR_CH_)
+-#define _TAO_IR_EVENTDEF___PTR_CH_
+-
+-class EventDef;
+-typedef EventDef *EventDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF___VAR_CH_)
+-#define _TAO_IR_EVENTDEF___VAR_CH_
+-
+-class TAO_Export EventDef_var : public TAO_Base_var
+-{
+-public:
+- EventDef_var (void); // default constructor
+- EventDef_var (EventDef_ptr p) : ptr_ (p) {}
+- EventDef_var (const EventDef_var &); // copy constructor
+- ~EventDef_var (void); // destructor
+-
+- EventDef_var &operator= (EventDef_ptr);
+- EventDef_var &operator= (const EventDef_var &);
+- EventDef_ptr operator-> (void) const;
+-
+- operator const EventDef_ptr &() const;
+- operator EventDef_ptr &();
+- // in, inout, out, _retn
+- EventDef_ptr in (void) const;
+- EventDef_ptr &inout (void);
+- EventDef_ptr &out (void);
+- EventDef_ptr _retn (void);
+- EventDef_ptr ptr (void) const;
+-
+-private:
+- EventDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- EventDef_var (const TAO_Base_var &rhs);
+- EventDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF___OUT_CH_)
+-#define _TAO_IR_EVENTDEF___OUT_CH_
+-
+-class TAO_Export EventDef_out
+-{
+-public:
+- EventDef_out (EventDef_ptr &);
+- EventDef_out (EventDef_var &);
+- EventDef_out (const EventDef_out &);
+- EventDef_out &operator= (const EventDef_out &);
+- EventDef_out &operator= (const EventDef_var &);
+- EventDef_out &operator= (EventDef_ptr);
+- operator EventDef_ptr &();
+- EventDef_ptr &ptr (void);
+- EventDef_ptr operator-> (void);
+-
+-private:
+- EventDef_ptr &ptr_;
++ void operator= (const IR_UsesDescSeq_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF_CH_)
+-#define _TAO_IR_EVENTDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_EventDef_Proxy_Impl;
+ class _TAO_EventDef_Remote_Proxy_Impl;
+ class _TAO_EventDef_Proxy_Broker;
+ class _TAO_EventDef_Remote_Proxy_Broker;
+
+-class TAO_Export EventDef: public virtual Contained
++class TAO_Export IR_EventDef: public virtual IR_Contained
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef EventDef_ptr _ptr_type;
+- typedef EventDef_var _var_type;
++ typedef IR_EventDef_ptr _ptr_type;
++ typedef IR_EventDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static EventDef_ptr _duplicate (EventDef_ptr obj);
+- static EventDef_ptr _narrow (
++ static IR_EventDef_ptr _duplicate (IR_EventDef_ptr obj);
++ static IR_EventDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static EventDef_ptr _unchecked_narrow (
++ static IR_EventDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static EventDef_ptr _nil (void)
++ static IR_EventDef_ptr _nil (void)
+ {
+- return (EventDef_ptr)0;
++ return (IR_EventDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -24708,7 +14970,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDef_ptr event (
++ virtual IR_ValueDef_ptr event (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -24729,123 +14991,27 @@
+ _TAO_EventDef_Proxy_Broker *the_TAO_EventDef_Proxy_Broker_;
+
+ protected:
+- EventDef (int collocated = 0);
++ IR_EventDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- EventDef (
++ IR_EventDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_EventDef_Remote_Proxy_Impl;
+- friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_EventDef_Direct_Proxy_Impl;
+-
+- virtual ~EventDef (void);
+- private:
+- EventDef (const EventDef &);
+- void operator= (const EventDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_EventDef_is_a : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::EventDef;
+-
+- friend class _TAO_EventDef_Remote_Proxy_Impl;
+- friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_EventDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_EventDef_is_a (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * event_id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_EventDef_is_a (const TAO_ClientRequestInfo_IR_EventDef_is_a &);
+- void operator= (const TAO_ClientRequestInfo_IR_EventDef_is_a &);
+- const char * event_id_;
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_EventDef_event_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::EventDef;
+-
+- friend class _TAO_EventDef_Remote_Proxy_Impl;
+- friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_EventDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_EventDef_event_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
++
++ friend class _TAO_EventDef_Remote_Proxy_Impl;
++ friend class _TAO_EventDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_EventDef_Direct_Proxy_Impl;
+
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_EventDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_EventDef_event_get (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_EventDef_event_get &);
+- void result (IR::ValueDef_ptr result);
+- // update the result
+- IR::ValueDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_EventDef (const IR_EventDef &);
++ void operator= (const IR_EventDef &);
+ };
+
+
+@@ -24859,12 +15025,12 @@
+ //
+
+ class TAO_Export _TAO_EventDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_EventDef_Proxy_Impl (void) { }
+
+- virtual CORBA::Boolean is_a (
++ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * event_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -24873,7 +15039,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ValueDef_ptr event (
++ virtual IR_ValueDef_ptr event (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -24885,6 +15051,7 @@
+ _TAO_EventDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -24897,7 +15064,7 @@
+ class TAO_Export _TAO_EventDef_Remote_Proxy_Impl :
+ public virtual _TAO_EventDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -24905,7 +15072,7 @@
+
+ virtual ~_TAO_EventDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::Boolean is_a (
++ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * event_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -24914,7 +15081,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDef_ptr event (
++ virtual IR_ValueDef_ptr event (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -24944,8 +15111,9 @@
+ {
+ public:
+ virtual ~_TAO_EventDef_Proxy_Broker (void);
++
+ virtual _TAO_EventDef_Proxy_Impl &select_proxy (
+- EventDef *object,
++ IR_EventDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -24970,9 +15138,9 @@
+ _TAO_EventDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_EventDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_EventDef_Proxy_Impl &select_proxy (
+- EventDef *object,
++ IR_EventDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -24986,24 +15154,15 @@
+ static _TAO_EventDef_Remote_Proxy_Broker *the_TAO_EventDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDef;
+-
+-struct EventDescription;
+-class EventDescription_var;
+-
+-struct TAO_Export EventDescription
++struct TAO_Export IR_EventDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef EventDescription_var _var_type;
++ typedef IR_EventDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -25012,159 +15171,85 @@
+ TAO_String_Manager id;
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+- ACE_NESTED_CLASS (IR, ValueDef_var) value;
++ IR_ValueDef_var value;
+ };
+
+-class TAO_Export EventDescription_var
++class TAO_Export IR_EventDescription_var
+ {
+ public:
+- EventDescription_var (void); // default constructor
+- EventDescription_var (EventDescription *);
+- EventDescription_var (const EventDescription_var &); // copy constructor
+- ~EventDescription_var (void); // destructor
++ IR_EventDescription_var (void); // default constructor
++ IR_EventDescription_var (IR_EventDescription *);
++ IR_EventDescription_var (const IR_EventDescription_var &); // copy constructor
++ ~IR_EventDescription_var (void); // destructor
+
+- EventDescription_var &operator= (EventDescription *);
+- EventDescription_var &operator= (const EventDescription_var &);
+- EventDescription *operator-> (void);
+- const EventDescription *operator-> (void) const;
++ IR_EventDescription_var &operator= (IR_EventDescription *);
++ IR_EventDescription_var &operator= (const IR_EventDescription_var &);
++ IR_EventDescription *operator-> (void);
++ const IR_EventDescription *operator-> (void) const;
+
+- operator const EventDescription &() const;
+- operator EventDescription &();
+- operator EventDescription &() const;
+- operator EventDescription *&(); // variable-size types only
++ operator const IR_EventDescription &() const;
++ operator IR_EventDescription &();
++ operator IR_EventDescription &() const;
++ operator IR_EventDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const EventDescription &in (void) const;
+- EventDescription &inout (void);
+- EventDescription *&out (void);
+- EventDescription *_retn (void);
+- EventDescription *ptr (void) const;
++ const IR_EventDescription &in (void) const;
++ IR_EventDescription &inout (void);
++ IR_EventDescription *&out (void);
++ IR_EventDescription *_retn (void);
++ IR_EventDescription *ptr (void) const;
+
+ private:
+- EventDescription *ptr_;
++ IR_EventDescription *ptr_;
+ };
+
+-class TAO_Export EventDescription_out
++class TAO_Export IR_EventDescription_out
+ {
+ public:
+- EventDescription_out (EventDescription *&);
+- EventDescription_out (EventDescription_var &);
+- EventDescription_out (const EventDescription_out &);
+- EventDescription_out &operator= (const EventDescription_out &);
+- EventDescription_out &operator= (EventDescription *);
+- operator EventDescription *&();
+- EventDescription *&ptr (void);
+- EventDescription *operator-> (void);
++ IR_EventDescription_out (IR_EventDescription *&);
++ IR_EventDescription_out (IR_EventDescription_var &);
++ IR_EventDescription_out (const IR_EventDescription_out &);
++ IR_EventDescription_out &operator= (const IR_EventDescription_out &);
++ IR_EventDescription_out &operator= (IR_EventDescription *);
++ operator IR_EventDescription *&();
++ IR_EventDescription *&ptr (void);
++ IR_EventDescription *operator-> (void);
+
+ private:
+- EventDescription *&ptr_;
++ IR_EventDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const EventDescription_var &);
+-};
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EventDescription;
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF___PTR_CH_)
+-#define _TAO_IR_EMITSDEF___PTR_CH_
+-
+-class EmitsDef;
+-typedef EmitsDef *EmitsDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF___VAR_CH_)
+-#define _TAO_IR_EMITSDEF___VAR_CH_
+-
+-class TAO_Export EmitsDef_var : public TAO_Base_var
+-{
+-public:
+- EmitsDef_var (void); // default constructor
+- EmitsDef_var (EmitsDef_ptr p) : ptr_ (p) {}
+- EmitsDef_var (const EmitsDef_var &); // copy constructor
+- ~EmitsDef_var (void); // destructor
+-
+- EmitsDef_var &operator= (EmitsDef_ptr);
+- EmitsDef_var &operator= (const EmitsDef_var &);
+- EmitsDef_ptr operator-> (void) const;
+-
+- operator const EmitsDef_ptr &() const;
+- operator EmitsDef_ptr &();
+- // in, inout, out, _retn
+- EmitsDef_ptr in (void) const;
+- EmitsDef_ptr &inout (void);
+- EmitsDef_ptr &out (void);
+- EmitsDef_ptr _retn (void);
+- EmitsDef_ptr ptr (void) const;
+-
+-private:
+- EmitsDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- EmitsDef_var (const TAO_Base_var &rhs);
+- EmitsDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF___OUT_CH_)
+-#define _TAO_IR_EMITSDEF___OUT_CH_
+-
+-class TAO_Export EmitsDef_out
+-{
+-public:
+- EmitsDef_out (EmitsDef_ptr &);
+- EmitsDef_out (EmitsDef_var &);
+- EmitsDef_out (const EmitsDef_out &);
+- EmitsDef_out &operator= (const EmitsDef_out &);
+- EmitsDef_out &operator= (const EmitsDef_var &);
+- EmitsDef_out &operator= (EmitsDef_ptr);
+- operator EmitsDef_ptr &();
+- EmitsDef_ptr &ptr (void);
+- EmitsDef_ptr operator-> (void);
+-
+-private:
+- EmitsDef_ptr &ptr_;
++ void operator= (const IR_EventDescription_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF_CH_)
+-#define _TAO_IR_EMITSDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_EmitsDef_Proxy_Impl;
+ class _TAO_EmitsDef_Remote_Proxy_Impl;
+ class _TAO_EmitsDef_Proxy_Broker;
+ class _TAO_EmitsDef_Remote_Proxy_Broker;
+
+-class TAO_Export EmitsDef: public virtual EventDef
++class TAO_Export IR_EmitsDef: public virtual IR_EventDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef EmitsDef_ptr _ptr_type;
+- typedef EmitsDef_var _var_type;
++ typedef IR_EmitsDef_ptr _ptr_type;
++ typedef IR_EmitsDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static EmitsDef_ptr _duplicate (EmitsDef_ptr obj);
+- static EmitsDef_ptr _narrow (
++ static IR_EmitsDef_ptr _duplicate (IR_EmitsDef_ptr obj);
++ static IR_EmitsDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static EmitsDef_ptr _unchecked_narrow (
++ static IR_EmitsDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static EmitsDef_ptr _nil (void)
++ static IR_EmitsDef_ptr _nil (void)
+ {
+- return (EmitsDef_ptr)0;
++ return (IR_EmitsDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -25182,60 +15267,53 @@
+ _TAO_EmitsDef_Proxy_Broker *the_TAO_EmitsDef_Proxy_Broker_;
+
+ protected:
+- EmitsDef (int collocated = 0);
++ IR_EmitsDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- EmitsDef (
++ IR_EmitsDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_EmitsDef_Remote_Proxy_Impl;
+- friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_EmitsDef_Direct_Proxy_Impl;
++ friend class _TAO_EmitsDef_Remote_Proxy_Impl;
++ friend class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_EmitsDef_Direct_Proxy_Impl;
+
+- virtual ~EmitsDef (void);
+- private:
+- EmitsDef (const EmitsDef &);
+- void operator= (const EmitsDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+- };
++ virtual ~IR_EmitsDef (void);
++private:
++ IR_EmitsDef (const IR_EmitsDef &);
++ void operator= (const IR_EmitsDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+
+-
+- ///////////////////////////////////////////////////////////////////////
+- // Base Impl. Declaration
+- //
+
+- class TAO_Export _TAO_EmitsDef_Proxy_Impl :
+- public virtual IR::_TAO_EventDef_Proxy_Impl
+- {
+- public:
+- virtual ~_TAO_EmitsDef_Proxy_Impl (void) { }
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
++
++class TAO_Export _TAO_EmitsDef_Proxy_Impl
++ : public virtual _TAO_EventDef_Proxy_Impl
++{
++public:
++ virtual ~_TAO_EmitsDef_Proxy_Impl (void) { }
+
+- protected:
+- _TAO_EmitsDef_Proxy_Impl (void);
++protected:
++ _TAO_EmitsDef_Proxy_Impl (void);
+
+- };
+- //
+- // Base Proxy Impl. Declaration
+- ///////////////////////////////////////////////////////////////////////
++};
++
++//
++// Base Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -25245,7 +15323,7 @@
+ class TAO_Export _TAO_EmitsDef_Remote_Proxy_Impl :
+ public virtual _TAO_EmitsDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
++ public virtual _TAO_EventDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -25253,7 +15331,7 @@
+
+ virtual ~_TAO_EmitsDef_Remote_Proxy_Impl (void) { }
+
+- };
++};
+
+ //
+ // Base Proxy Impl. Declaration
+@@ -25275,8 +15353,9 @@
+ {
+ public:
+ virtual ~_TAO_EmitsDef_Proxy_Broker (void);
++
+ virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
+- EmitsDef *object,
++ IR_EmitsDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -25301,9 +15380,9 @@
+ _TAO_EmitsDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_EmitsDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_EmitsDef_Proxy_Impl &select_proxy (
+- EmitsDef *object,
++ IR_EmitsDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -25317,117 +15396,38 @@
+ static _TAO_EmitsDef_Remote_Proxy_Broker *the_TAO_EmitsDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EmitsDef;
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___PTR_CH_)
+-#define _TAO_IR_PUBLISHESDEF___PTR_CH_
+-
+-class PublishesDef;
+-typedef PublishesDef *PublishesDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___VAR_CH_)
+-#define _TAO_IR_PUBLISHESDEF___VAR_CH_
+-
+-class TAO_Export PublishesDef_var : public TAO_Base_var
+-{
+-public:
+- PublishesDef_var (void); // default constructor
+- PublishesDef_var (PublishesDef_ptr p) : ptr_ (p) {}
+- PublishesDef_var (const PublishesDef_var &); // copy constructor
+- ~PublishesDef_var (void); // destructor
+-
+- PublishesDef_var &operator= (PublishesDef_ptr);
+- PublishesDef_var &operator= (const PublishesDef_var &);
+- PublishesDef_ptr operator-> (void) const;
+-
+- operator const PublishesDef_ptr &() const;
+- operator PublishesDef_ptr &();
+- // in, inout, out, _retn
+- PublishesDef_ptr in (void) const;
+- PublishesDef_ptr &inout (void);
+- PublishesDef_ptr &out (void);
+- PublishesDef_ptr _retn (void);
+- PublishesDef_ptr ptr (void) const;
+-
+-private:
+- PublishesDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- PublishesDef_var (const TAO_Base_var &rhs);
+- PublishesDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___OUT_CH_)
+-#define _TAO_IR_PUBLISHESDEF___OUT_CH_
+-
+-class TAO_Export PublishesDef_out
+-{
+-public:
+- PublishesDef_out (PublishesDef_ptr &);
+- PublishesDef_out (PublishesDef_var &);
+- PublishesDef_out (const PublishesDef_out &);
+- PublishesDef_out &operator= (const PublishesDef_out &);
+- PublishesDef_out &operator= (const PublishesDef_var &);
+- PublishesDef_out &operator= (PublishesDef_ptr);
+- operator PublishesDef_ptr &();
+- PublishesDef_ptr &ptr (void);
+- PublishesDef_ptr operator-> (void);
+-
+-private:
+- PublishesDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF_CH_)
+-#define _TAO_IR_PUBLISHESDEF_CH_
+-
+-// Forward Classes Declaration
+ class _TAO_PublishesDef_Proxy_Impl;
+ class _TAO_PublishesDef_Remote_Proxy_Impl;
+ class _TAO_PublishesDef_Proxy_Broker;
+ class _TAO_PublishesDef_Remote_Proxy_Broker;
+
+-class TAO_Export PublishesDef: public virtual EventDef
++class TAO_Export IR_PublishesDef: public virtual IR_EventDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef PublishesDef_ptr _ptr_type;
+- typedef PublishesDef_var _var_type;
++ typedef IR_PublishesDef_ptr _ptr_type;
++ typedef IR_PublishesDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static PublishesDef_ptr _duplicate (PublishesDef_ptr obj);
+- static PublishesDef_ptr _narrow (
++ static IR_PublishesDef_ptr _duplicate (IR_PublishesDef_ptr obj);
++ static IR_PublishesDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static PublishesDef_ptr _unchecked_narrow (
++ static IR_PublishesDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static PublishesDef_ptr _nil (void)
++ static IR_PublishesDef_ptr _nil (void)
+ {
+- return (PublishesDef_ptr)0;
++ return (IR_PublishesDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -25445,60 +15445,53 @@
+ _TAO_PublishesDef_Proxy_Broker *the_TAO_PublishesDef_Proxy_Broker_;
+
+ protected:
+- PublishesDef (int collocated = 0);
++ IR_PublishesDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- PublishesDef (
++ IR_PublishesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_PublishesDef_Remote_Proxy_Impl;
+- friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_PublishesDef_Direct_Proxy_Impl;
++ friend class _TAO_PublishesDef_Remote_Proxy_Impl;
++ friend class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_PublishesDef_Direct_Proxy_Impl;
+
+- virtual ~PublishesDef (void);
+- private:
+- PublishesDef (const PublishesDef &);
+- void operator= (const PublishesDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+- };
++ virtual ~IR_PublishesDef (void);
++private:
++ IR_PublishesDef (const IR_PublishesDef &);
++ void operator= (const IR_PublishesDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+
+-
+- ///////////////////////////////////////////////////////////////////////
+- // Base Impl. Declaration
+- //
+
+- class TAO_Export _TAO_PublishesDef_Proxy_Impl :
+- public virtual IR::_TAO_EventDef_Proxy_Impl
+- {
+- public:
+- virtual ~_TAO_PublishesDef_Proxy_Impl (void) { }
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
++
++class TAO_Export _TAO_PublishesDef_Proxy_Impl
++ : public virtual _TAO_EventDef_Proxy_Impl
++{
++public:
++ virtual ~_TAO_PublishesDef_Proxy_Impl (void) { }
+
+- protected:
+- _TAO_PublishesDef_Proxy_Impl (void);
++protected:
++ _TAO_PublishesDef_Proxy_Impl (void);
++
++};
+
+- };
+- //
+- // Base Proxy Impl. Declaration
+- ///////////////////////////////////////////////////////////////////////
++//
++// Base Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -25508,7 +15501,7 @@
+ class TAO_Export _TAO_PublishesDef_Remote_Proxy_Impl :
+ public virtual _TAO_PublishesDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
++ public virtual _TAO_EventDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -25516,7 +15509,7 @@
+
+ virtual ~_TAO_PublishesDef_Remote_Proxy_Impl (void) { }
+
+- };
++};
+
+ //
+ // Base Proxy Impl. Declaration
+@@ -25538,8 +15531,9 @@
+ {
+ public:
+ virtual ~_TAO_PublishesDef_Proxy_Broker (void);
++
+ virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
+- PublishesDef *object,
++ IR_PublishesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -25564,9 +15558,9 @@
+ _TAO_PublishesDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_PublishesDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_PublishesDef_Proxy_Impl &select_proxy (
+- PublishesDef *object,
++ IR_PublishesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -25580,117 +15574,39 @@
+ static _TAO_PublishesDef_Remote_Proxy_Broker *the_TAO_PublishesDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PublishesDef;
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___PTR_CH_)
+-#define _TAO_IR_CONSUMESDEF___PTR_CH_
+-
+-class ConsumesDef;
+-typedef ConsumesDef *ConsumesDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___VAR_CH_)
+-#define _TAO_IR_CONSUMESDEF___VAR_CH_
+-
+-class TAO_Export ConsumesDef_var : public TAO_Base_var
+-{
+-public:
+- ConsumesDef_var (void); // default constructor
+- ConsumesDef_var (ConsumesDef_ptr p) : ptr_ (p) {}
+- ConsumesDef_var (const ConsumesDef_var &); // copy constructor
+- ~ConsumesDef_var (void); // destructor
+-
+- ConsumesDef_var &operator= (ConsumesDef_ptr);
+- ConsumesDef_var &operator= (const ConsumesDef_var &);
+- ConsumesDef_ptr operator-> (void) const;
+-
+- operator const ConsumesDef_ptr &() const;
+- operator ConsumesDef_ptr &();
+- // in, inout, out, _retn
+- ConsumesDef_ptr in (void) const;
+- ConsumesDef_ptr &inout (void);
+- ConsumesDef_ptr &out (void);
+- ConsumesDef_ptr _retn (void);
+- ConsumesDef_ptr ptr (void) const;
+-
+-private:
+- ConsumesDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ConsumesDef_var (const TAO_Base_var &rhs);
+- ConsumesDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___OUT_CH_)
+-#define _TAO_IR_CONSUMESDEF___OUT_CH_
+-
+-class TAO_Export ConsumesDef_out
+-{
+-public:
+- ConsumesDef_out (ConsumesDef_ptr &);
+- ConsumesDef_out (ConsumesDef_var &);
+- ConsumesDef_out (const ConsumesDef_out &);
+- ConsumesDef_out &operator= (const ConsumesDef_out &);
+- ConsumesDef_out &operator= (const ConsumesDef_var &);
+- ConsumesDef_out &operator= (ConsumesDef_ptr);
+- operator ConsumesDef_ptr &();
+- ConsumesDef_ptr &ptr (void);
+- ConsumesDef_ptr operator-> (void);
+-
+-private:
+- ConsumesDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF_CH_)
+-#define _TAO_IR_CONSUMESDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_ConsumesDef_Proxy_Impl;
+ class _TAO_ConsumesDef_Remote_Proxy_Impl;
+ class _TAO_ConsumesDef_Proxy_Broker;
+ class _TAO_ConsumesDef_Remote_Proxy_Broker;
+
+-class TAO_Export ConsumesDef: public virtual EventDef
++class TAO_Export IR_ConsumesDef: public virtual IR_EventDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ConsumesDef_ptr _ptr_type;
+- typedef ConsumesDef_var _var_type;
++ typedef IR_ConsumesDef_ptr _ptr_type;
++ typedef IR_ConsumesDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ConsumesDef_ptr _duplicate (ConsumesDef_ptr obj);
+- static ConsumesDef_ptr _narrow (
++ static IR_ConsumesDef_ptr _duplicate (IR_ConsumesDef_ptr obj);
++ static IR_ConsumesDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ConsumesDef_ptr _unchecked_narrow (
++ static IR_ConsumesDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ConsumesDef_ptr _nil (void)
++ static IR_ConsumesDef_ptr _nil (void)
+ {
+- return (ConsumesDef_ptr)0;
++ return (IR_ConsumesDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -25708,60 +15624,53 @@
+ _TAO_ConsumesDef_Proxy_Broker *the_TAO_ConsumesDef_Proxy_Broker_;
+
+ protected:
+- ConsumesDef (int collocated = 0);
++ IR_ConsumesDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- ConsumesDef (
++ IR_ConsumesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_ConsumesDef_Remote_Proxy_Impl;
+- friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
++ friend class _TAO_ConsumesDef_Remote_Proxy_Impl;
++ friend class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_ConsumesDef_Direct_Proxy_Impl;
+
+- virtual ~ConsumesDef (void);
+- private:
+- ConsumesDef (const ConsumesDef &);
+- void operator= (const ConsumesDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+- };
++ virtual ~IR_ConsumesDef (void);
++private:
++ IR_ConsumesDef (const IR_ConsumesDef &);
++ void operator= (const IR_ConsumesDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+
+-
+- ///////////////////////////////////////////////////////////////////////
+- // Base Impl. Declaration
+- //
+
+- class TAO_Export _TAO_ConsumesDef_Proxy_Impl :
+- public virtual IR::_TAO_EventDef_Proxy_Impl
+- {
+- public:
+- virtual ~_TAO_ConsumesDef_Proxy_Impl (void) { }
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
++
++class TAO_Export _TAO_ConsumesDef_Proxy_Impl
++ : public virtual _TAO_EventDef_Proxy_Impl
++{
++public:
++ virtual ~_TAO_ConsumesDef_Proxy_Impl (void) { }
+
+- protected:
+- _TAO_ConsumesDef_Proxy_Impl (void);
++protected:
++ _TAO_ConsumesDef_Proxy_Impl (void);
++
++};
+
+- };
+- //
+- // Base Proxy Impl. Declaration
+- ///////////////////////////////////////////////////////////////////////
++//
++// Base Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -25771,7 +15680,7 @@
+ class TAO_Export _TAO_ConsumesDef_Remote_Proxy_Impl :
+ public virtual _TAO_ConsumesDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_EventDef_Remote_Proxy_Impl
++ public virtual _TAO_EventDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -25779,7 +15688,7 @@
+
+ virtual ~_TAO_ConsumesDef_Remote_Proxy_Impl (void) { }
+
+- };
++};
+
+ //
+ // Base Proxy Impl. Declaration
+@@ -25801,8 +15710,9 @@
+ {
+ public:
+ virtual ~_TAO_ConsumesDef_Proxy_Broker (void);
++
+ virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+- ConsumesDef *object,
++ IR_ConsumesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -25827,9 +15737,9 @@
+ _TAO_ConsumesDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ConsumesDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ConsumesDef_Proxy_Impl &select_proxy (
+- ConsumesDef *object,
++ IR_ConsumesDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -25843,122 +15753,44 @@
+ static _TAO_ConsumesDef_Remote_Proxy_Broker *the_TAO_ConsumesDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConsumesDef;
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___PTR_CH_)
+-#define _TAO_IR_COMPONENTDEF___PTR_CH_
+-
+-class ComponentDef;
+-typedef ComponentDef *ComponentDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___VAR_CH_)
+-#define _TAO_IR_COMPONENTDEF___VAR_CH_
+-
+-class TAO_Export ComponentDef_var : public TAO_Base_var
+-{
+-public:
+- ComponentDef_var (void); // default constructor
+- ComponentDef_var (ComponentDef_ptr p) : ptr_ (p) {}
+- ComponentDef_var (const ComponentDef_var &); // copy constructor
+- ~ComponentDef_var (void); // destructor
+-
+- ComponentDef_var &operator= (ComponentDef_ptr);
+- ComponentDef_var &operator= (const ComponentDef_var &);
+- ComponentDef_ptr operator-> (void) const;
+-
+- operator const ComponentDef_ptr &() const;
+- operator ComponentDef_ptr &();
+- // in, inout, out, _retn
+- ComponentDef_ptr in (void) const;
+- ComponentDef_ptr &inout (void);
+- ComponentDef_ptr &out (void);
+- ComponentDef_ptr _retn (void);
+- ComponentDef_ptr ptr (void) const;
+-
+-private:
+- ComponentDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- ComponentDef_var (const TAO_Base_var &rhs);
+- ComponentDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___OUT_CH_)
+-#define _TAO_IR_COMPONENTDEF___OUT_CH_
+-
+-class TAO_Export ComponentDef_out
+-{
+-public:
+- ComponentDef_out (ComponentDef_ptr &);
+- ComponentDef_out (ComponentDef_var &);
+- ComponentDef_out (const ComponentDef_out &);
+- ComponentDef_out &operator= (const ComponentDef_out &);
+- ComponentDef_out &operator= (const ComponentDef_var &);
+- ComponentDef_out &operator= (ComponentDef_ptr);
+- operator ComponentDef_ptr &();
+- ComponentDef_ptr &ptr (void);
+- ComponentDef_ptr operator-> (void);
+-
+-private:
+- ComponentDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF_CH_)
+-#define _TAO_IR_COMPONENTDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_ComponentDef_Proxy_Impl;
+ class _TAO_ComponentDef_Remote_Proxy_Impl;
+ class _TAO_ComponentDef_Proxy_Broker;
+ class _TAO_ComponentDef_Remote_Proxy_Broker;
+
+-class TAO_Export ComponentDef: public virtual InterfaceDef
++class TAO_Export IR_ComponentDef: public virtual IR_InterfaceDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ComponentDef_ptr _ptr_type;
+- typedef ComponentDef_var _var_type;
++ typedef IR_ComponentDef_ptr _ptr_type;
++ typedef IR_ComponentDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static ComponentDef_ptr _duplicate (ComponentDef_ptr obj);
+- static ComponentDef_ptr _narrow (
++ static IR_ComponentDef_ptr _duplicate (IR_ComponentDef_ptr obj);
++ static IR_ComponentDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ComponentDef_ptr _unchecked_narrow (
++ static IR_ComponentDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static ComponentDef_ptr _nil (void)
++ static IR_ComponentDef_ptr _nil (void)
+ {
+- return (ComponentDef_ptr)0;
++ return (IR_ComponentDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::InterfaceDefSeq * supported_interfaces (
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -25967,39 +15799,7 @@
+ ));
+
+ virtual void supported_interfaces (
+- const IR::InterfaceDefSeq & supported_interfaces,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::ComponentDef_ptr base_component (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::ProvidesDefSeq * provides_interfaces (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::UsesDefSeq * uses_interfaces (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::EmitsDefSeq * emits_events (
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -26007,7 +15807,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::PublishesDefSeq * publishes_events (
++ virtual IR_ComponentDef_ptr base_component (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -26015,7 +15815,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ConsumesDefSeq * consumes_events (
++ virtual IR_ProvidesDefSeq * provides_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -26023,7 +15823,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual CORBA::Boolean is_basic (
++ virtual IR_UsesDefSeq * uses_interfaces (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -26031,756 +15831,135 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ProvidesDef_ptr create_provides (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::InterfaceDef_ptr interface_type,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::UsesDef_ptr create_uses (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::InterfaceDef_ptr interface_type,
+- CORBA::Boolean is_multiple,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::EmitsDef_ptr create_emits (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::PublishesDef_ptr create_publishes (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::ConsumesDef_ptr create_consumes (
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual CORBA::Boolean _is_a (
+- const CORBA::Char *type_id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+- virtual void *_tao_QueryInterface (ptr_arith_t type);
+-
+- virtual const char* _interface_repository_id (void) const;
+-
+-private:
+- _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
+-
+-protected:
+- ComponentDef (int collocated = 0);
+-
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
+-
+- ComponentDef (
+- TAO_Stub *objref,
+- CORBA::Boolean _tao_collocated = 0,
+- TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+- virtual ~ComponentDef (void);
+- private:
+- ComponentDef (const ComponentDef &);
+- void operator= (const ComponentDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_get &);
+- void result (IR::InterfaceDefSeq * result);
+- // update the result
+- IR::InterfaceDefSeq * result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const IR::InterfaceDefSeq & supported_interfaces,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_supported_interfaces_set &);
+- const IR::InterfaceDefSeq & supported_interfaces_;
+-
+-};
+-
+-class TAO_ClientRequestInfo_IR_ComponentDef_base_component_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_base_component_get (const TAO_ClientRequestInfo_IR_ComponentDef_base_component_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_base_component_get &);
+- void result (IR::ComponentDef_ptr result);
+- // update the result
+- IR::ComponentDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_provides_interfaces_get &);
+- void result (IR::ProvidesDefSeq * result);
+- // update the result
+- IR::ProvidesDefSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get (const TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_uses_interfaces_get &);
+- void result (IR::UsesDefSeq * result);
+- // update the result
+- IR::UsesDefSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_emits_events_get &);
+- void result (IR::EmitsDefSeq * result);
+- // update the result
+- IR::EmitsDefSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_publishes_events_get &);
+- void result (IR::PublishesDefSeq * result);
+- // update the result
+- IR::PublishesDefSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get (const TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_consumes_events_get &);
+- void result (IR::ConsumesDefSeq * result);
+- // update the result
+- IR::ConsumesDefSeq * result_;
+-};
++ virtual IR_EmitsDefSeq * emits_events (
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-class TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
++ virtual IR_PublishesDefSeq * publishes_events (
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
++ virtual IR_ConsumesDefSeq * consumes_events (
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual CORBA::Boolean is_basic (
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual IR_ProvidesDef_ptr create_provides (
++ const char * id,
++ const char * name,
++ const char * version,
++ IR_InterfaceDef_ptr interface_type,
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ virtual IR_UsesDef_ptr create_uses (
++ const char * id,
++ const char * name,
++ const char * version,
++ IR_InterfaceDef_ptr interface_type,
++ CORBA::Boolean is_multiple,
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get (const TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_is_basic_get &);
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
++ virtual IR_EmitsDef_ptr create_emits (
++ const char * id,
++ const char * name,
++ const char * version,
++ IR_ValueDef_ptr value,
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-class TAO_ClientRequestInfo_IR_ComponentDef_create_provides : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+-
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
++ virtual IR_PublishesDef_ptr create_publishes (
++ const char * id,
++ const char * name,
++ const char * version,
++ IR_ValueDef_ptr value,
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-TAO_ClientRequestInfo_IR_ComponentDef_create_provides (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::InterfaceDef_ptr interface_type,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_create_provides (const TAO_ClientRequestInfo_IR_ComponentDef_create_provides &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_provides &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::InterfaceDef_ptr interface_type_;
+- void result (IR::ProvidesDef_ptr result);
+- // update the result
+- IR::ProvidesDef_ptr result_;
+-};
++ virtual IR_ConsumesDef_ptr create_consumes (
++ const char * id,
++ const char * name,
++ const char * version,
++ IR_ValueDef_ptr value,
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ )
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
+
+-class TAO_ClientRequestInfo_IR_ComponentDef_create_uses : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
++ virtual CORBA::Boolean _is_a (
++ const CORBA::Char *type_id,
++ CORBA::Environment &ACE_TRY_ENV =
++ TAO_default_environment ()
++ );
++ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_create_uses (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::InterfaceDef_ptr interface_type,
+- const CORBA::Boolean & is_multiple,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_create_uses (const TAO_ClientRequestInfo_IR_ComponentDef_create_uses &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_uses &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::InterfaceDef_ptr interface_type_;
+- const CORBA::Boolean & is_multiple_;
+- void result (IR::UsesDef_ptr result);
+- // update the result
+- IR::UsesDef_ptr result_;
+-};
++ virtual const char* _interface_repository_id (void) const;
+
+-class TAO_ClientRequestInfo_IR_ComponentDef_create_emits : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
++private:
++ _TAO_ComponentDef_Proxy_Broker *the_TAO_ComponentDef_Proxy_Broker_;
+
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_create_emits (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_create_emits (const TAO_ClientRequestInfo_IR_ComponentDef_create_emits &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_emits &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::ValueDef_ptr value_;
+- void result (IR::EmitsDef_ptr result);
+- // update the result
+- IR::EmitsDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ComponentDef_create_publishes : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
++protected:
++ IR_ComponentDef (int collocated = 0);
+
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
++
++ IR_ComponentDef (
++ TAO_Stub *objref,
++ CORBA::Boolean _tao_collocated = 0,
++ TAO_Abstract_ServantBase *servant = 0
++ );
++
+ friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+ friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_create_publishes (const TAO_ClientRequestInfo_IR_ComponentDef_create_publishes &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_publishes &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::ValueDef_ptr value_;
+- void result (IR::PublishesDef_ptr result);
+- // update the result
+- IR::PublishesDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_ComponentDef_create_consumes : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::ComponentDef;
+
+- friend class _TAO_ComponentDef_Remote_Proxy_Impl;
+- friend class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_ComponentDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr value,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_ComponentDef_create_consumes (const TAO_ClientRequestInfo_IR_ComponentDef_create_consumes &);
+- void operator= (const TAO_ClientRequestInfo_IR_ComponentDef_create_consumes &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::ValueDef_ptr value_;
+- void result (IR::ConsumesDef_ptr result);
+- // update the result
+- IR::ConsumesDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ virtual ~IR_ComponentDef (void);
++private:
++ IR_ComponentDef (const IR_ComponentDef &);
++ void operator= (const IR_ComponentDef &);
+ };
+
+-
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+@@ -26791,12 +15970,12 @@
+ //
+
+ class TAO_Export _TAO_ComponentDef_Proxy_Impl :
+- public virtual IR::_TAO_InterfaceDef_Proxy_Impl
++ public virtual _TAO_InterfaceDef_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_ComponentDef_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDefSeq * supported_interfaces (
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26806,14 +15985,14 @@
+
+ virtual void supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & supported_interfaces,
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ComponentDef_ptr base_component (
++ virtual IR_ComponentDef_ptr base_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26821,7 +16000,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ProvidesDefSeq * provides_interfaces (
++ virtual IR_ProvidesDefSeq * provides_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26829,7 +16008,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::UsesDefSeq * uses_interfaces (
++ virtual IR_UsesDefSeq * uses_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26837,7 +16016,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::EmitsDefSeq * emits_events (
++ virtual IR_EmitsDefSeq * emits_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26845,7 +16024,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::PublishesDefSeq * publishes_events (
++ virtual IR_PublishesDefSeq * publishes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26853,7 +16032,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ConsumesDefSeq * consumes_events (
++ virtual IR_ConsumesDefSeq * consumes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26869,24 +16048,24 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ProvidesDef_ptr create_provides (
++ virtual IR_ProvidesDef_ptr create_provides (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::UsesDef_ptr create_uses (
++ virtual IR_UsesDef_ptr create_uses (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26894,36 +16073,36 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::EmitsDef_ptr create_emits (
++ virtual IR_EmitsDef_ptr create_emits (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::PublishesDef_ptr create_publishes (
++ virtual IR_PublishesDef_ptr create_publishes (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ConsumesDef_ptr create_consumes (
++ virtual IR_ConsumesDef_ptr create_consumes (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -26934,6 +16113,7 @@
+ _TAO_ComponentDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -26946,7 +16126,7 @@
+ class TAO_Export _TAO_ComponentDef_Remote_Proxy_Impl :
+ public virtual _TAO_ComponentDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_InterfaceDef_Remote_Proxy_Impl
++ public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -26954,7 +16134,7 @@
+
+ virtual ~_TAO_ComponentDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::InterfaceDefSeq * supported_interfaces (
++ virtual IR_InterfaceDefSeq * supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26964,14 +16144,14 @@
+
+ virtual void supported_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+- const IR::InterfaceDefSeq & supported_interfaces,
++ const IR_InterfaceDefSeq & supported_interfaces,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ComponentDef_ptr base_component (
++ virtual IR_ComponentDef_ptr base_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26979,7 +16159,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ProvidesDefSeq * provides_interfaces (
++ virtual IR_ProvidesDefSeq * provides_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26987,7 +16167,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::UsesDefSeq * uses_interfaces (
++ virtual IR_UsesDefSeq * uses_interfaces (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -26995,7 +16175,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::EmitsDefSeq * emits_events (
++ virtual IR_EmitsDefSeq * emits_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27003,7 +16183,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::PublishesDefSeq * publishes_events (
++ virtual IR_PublishesDefSeq * publishes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27011,7 +16191,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ConsumesDefSeq * consumes_events (
++ virtual IR_ConsumesDefSeq * consumes_events (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27027,24 +16207,24 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ProvidesDef_ptr create_provides (
++ virtual IR_ProvidesDef_ptr create_provides (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::UsesDef_ptr create_uses (
++ virtual IR_UsesDef_ptr create_uses (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::InterfaceDef_ptr interface_type,
++ IR_InterfaceDef_ptr interface_type,
+ CORBA::Boolean is_multiple,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27052,36 +16232,36 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::EmitsDef_ptr create_emits (
++ virtual IR_EmitsDef_ptr create_emits (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::PublishesDef_ptr create_publishes (
++ virtual IR_PublishesDef_ptr create_publishes (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ConsumesDef_ptr create_consumes (
++ virtual IR_ConsumesDef_ptr create_consumes (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr value,
++ IR_ValueDef_ptr value,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -27110,8 +16290,9 @@
+ {
+ public:
+ virtual ~_TAO_ComponentDef_Proxy_Broker (void);
++
+ virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
+- ComponentDef *object,
++ IR_ComponentDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -27136,9 +16317,9 @@
+ _TAO_ComponentDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_ComponentDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_ComponentDef_Proxy_Impl &select_proxy (
+- ComponentDef *object,
++ IR_ComponentDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -27152,24 +16333,15 @@
+ static _TAO_ComponentDef_Remote_Proxy_Broker *the_TAO_ComponentDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDef;
+-
+-struct ComponentDescription;
+-class ComponentDescription_var;
+-
+-struct TAO_Export ComponentDescription
++struct TAO_Export IR_ComponentDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef ComponentDescription_var _var_type;
++ typedef IR_ComponentDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -27179,317 +16351,147 @@
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+ TAO_String_Manager base_component;
+- ACE_NESTED_CLASS (IR, RepositoryIdSeq) supports_interfaces;
+- ACE_NESTED_CLASS (IR, ProvidesDefSeq) provides_interfaces;
+- ACE_NESTED_CLASS (IR, UsesDefSeq) uses_interfaces;
+- ACE_NESTED_CLASS (IR, AttrDescriptionSeq) attributes;
+- ACE_NESTED_CLASS (IR, EmitsDefSeq) emits_events;
+- ACE_NESTED_CLASS (IR, PublishesDefSeq) publishes_events;
+- ACE_NESTED_CLASS (IR, ConsumesDefSeq) consumes_events;
++ IR_RepositoryIdSeq supports_interfaces;
++ IR_ProvidesDefSeq provides_interfaces;
++ IR_UsesDefSeq uses_interfaces;
++ IR_AttrDescriptionSeq attributes;
++ IR_EmitsDefSeq emits_events;
++ IR_PublishesDefSeq publishes_events;
++ IR_ConsumesDefSeq consumes_events;
+ CORBA::Boolean is_basic;
+ };
+
+-class TAO_Export ComponentDescription_var
+-{
+-public:
+- ComponentDescription_var (void); // default constructor
+- ComponentDescription_var (ComponentDescription *);
+- ComponentDescription_var (const ComponentDescription_var &); // copy constructor
+- ~ComponentDescription_var (void); // destructor
+-
+- ComponentDescription_var &operator= (ComponentDescription *);
+- ComponentDescription_var &operator= (const ComponentDescription_var &);
+- ComponentDescription *operator-> (void);
+- const ComponentDescription *operator-> (void) const;
+-
+- operator const ComponentDescription &() const;
+- operator ComponentDescription &();
+- operator ComponentDescription &() const;
+- operator ComponentDescription *&(); // variable-size types only
+-
+- // in, inout, out, _retn
+- const ComponentDescription &in (void) const;
+- ComponentDescription &inout (void);
+- ComponentDescription *&out (void);
+- ComponentDescription *_retn (void);
+- ComponentDescription *ptr (void) const;
+-
+-private:
+- ComponentDescription *ptr_;
+-};
+-
+-class TAO_Export ComponentDescription_out
++class TAO_Export IR_ComponentDescription_var
+ {
+ public:
+- ComponentDescription_out (ComponentDescription *&);
+- ComponentDescription_out (ComponentDescription_var &);
+- ComponentDescription_out (const ComponentDescription_out &);
+- ComponentDescription_out &operator= (const ComponentDescription_out &);
+- ComponentDescription_out &operator= (ComponentDescription *);
+- operator ComponentDescription *&();
+- ComponentDescription *&ptr (void);
+- ComponentDescription *operator-> (void);
++ IR_ComponentDescription_var (void); // default constructor
++ IR_ComponentDescription_var (IR_ComponentDescription *);
++ IR_ComponentDescription_var (const IR_ComponentDescription_var &); // copy constructor
++ ~IR_ComponentDescription_var (void); // destructor
+
+-private:
+- ComponentDescription *&ptr_;
+- // assignment from T_var not allowed
+- void operator= (const ComponentDescription_var &);
+-};
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ComponentDescription;
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___PTR_CH_)
+-#define _TAO_IR_PRIMARYKEYDEF___PTR_CH_
+-
+-class PrimaryKeyDef;
+-typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___VAR_CH_)
+-#define _TAO_IR_PRIMARYKEYDEF___VAR_CH_
+-
+-class TAO_Export PrimaryKeyDef_var : public TAO_Base_var
+-{
+-public:
+- PrimaryKeyDef_var (void); // default constructor
+- PrimaryKeyDef_var (PrimaryKeyDef_ptr p) : ptr_ (p) {}
+- PrimaryKeyDef_var (const PrimaryKeyDef_var &); // copy constructor
+- ~PrimaryKeyDef_var (void); // destructor
++ IR_ComponentDescription_var &operator= (IR_ComponentDescription *);
++ IR_ComponentDescription_var &operator= (const IR_ComponentDescription_var &);
++ IR_ComponentDescription *operator-> (void);
++ const IR_ComponentDescription *operator-> (void) const;
+
+- PrimaryKeyDef_var &operator= (PrimaryKeyDef_ptr);
+- PrimaryKeyDef_var &operator= (const PrimaryKeyDef_var &);
+- PrimaryKeyDef_ptr operator-> (void) const;
++ operator const IR_ComponentDescription &() const;
++ operator IR_ComponentDescription &();
++ operator IR_ComponentDescription &() const;
++ operator IR_ComponentDescription *&(); // variable-size types only
+
+- operator const PrimaryKeyDef_ptr &() const;
+- operator PrimaryKeyDef_ptr &();
+ // in, inout, out, _retn
+- PrimaryKeyDef_ptr in (void) const;
+- PrimaryKeyDef_ptr &inout (void);
+- PrimaryKeyDef_ptr &out (void);
+- PrimaryKeyDef_ptr _retn (void);
+- PrimaryKeyDef_ptr ptr (void) const;
++ const IR_ComponentDescription &in (void) const;
++ IR_ComponentDescription &inout (void);
++ IR_ComponentDescription *&out (void);
++ IR_ComponentDescription *_retn (void);
++ IR_ComponentDescription *ptr (void) const;
+
+ private:
+- PrimaryKeyDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- PrimaryKeyDef_var (const TAO_Base_var &rhs);
+- PrimaryKeyDef_var &operator= (const TAO_Base_var &rhs);
++ IR_ComponentDescription *ptr_;
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___OUT_CH_)
+-#define _TAO_IR_PRIMARYKEYDEF___OUT_CH_
+-
+-class TAO_Export PrimaryKeyDef_out
++class TAO_Export IR_ComponentDescription_out
+ {
+ public:
+- PrimaryKeyDef_out (PrimaryKeyDef_ptr &);
+- PrimaryKeyDef_out (PrimaryKeyDef_var &);
+- PrimaryKeyDef_out (const PrimaryKeyDef_out &);
+- PrimaryKeyDef_out &operator= (const PrimaryKeyDef_out &);
+- PrimaryKeyDef_out &operator= (const PrimaryKeyDef_var &);
+- PrimaryKeyDef_out &operator= (PrimaryKeyDef_ptr);
+- operator PrimaryKeyDef_ptr &();
+- PrimaryKeyDef_ptr &ptr (void);
+- PrimaryKeyDef_ptr operator-> (void);
++ IR_ComponentDescription_out (IR_ComponentDescription *&);
++ IR_ComponentDescription_out (IR_ComponentDescription_var &);
++ IR_ComponentDescription_out (const IR_ComponentDescription_out &);
++ IR_ComponentDescription_out &operator= (const IR_ComponentDescription_out &);
++ IR_ComponentDescription_out &operator= (IR_ComponentDescription *);
++ operator IR_ComponentDescription *&();
++ IR_ComponentDescription *&ptr (void);
++ IR_ComponentDescription *operator-> (void);
+
+ private:
+- PrimaryKeyDef_ptr &ptr_;
++ IR_ComponentDescription *&ptr_;
++ // assignment from T_var not allowed
++ void operator= (const IR_ComponentDescription_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF_CH_)
+-#define _TAO_IR_PRIMARYKEYDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_PrimaryKeyDef_Proxy_Impl;
+ class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+ class _TAO_PrimaryKeyDef_Proxy_Broker;
+ class _TAO_PrimaryKeyDef_Remote_Proxy_Broker;
+
+-class TAO_Export PrimaryKeyDef: public virtual Contained
++class TAO_Export IR_PrimaryKeyDef: public virtual IR_Contained
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef PrimaryKeyDef_ptr _ptr_type;
+- typedef PrimaryKeyDef_var _var_type;
++ typedef IR_PrimaryKeyDef_ptr _ptr_type;
++ typedef IR_PrimaryKeyDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static PrimaryKeyDef_ptr _duplicate (PrimaryKeyDef_ptr obj);
+- static PrimaryKeyDef_ptr _narrow (
+- CORBA::Object_ptr obj,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+- static PrimaryKeyDef_ptr _unchecked_narrow (
++ static IR_PrimaryKeyDef_ptr _duplicate (IR_PrimaryKeyDef_ptr obj);
++ static IR_PrimaryKeyDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+- );
+- static PrimaryKeyDef_ptr _nil (void)
+- {
+- return (PrimaryKeyDef_ptr)0;
+- }
+-
+- static void _tao_any_destructor (void*);
+-
+- virtual CORBA::Boolean is_a (
+- const char * primary_key_id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual IR::ValueDef_ptr primary_key (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((
+- CORBA::SystemException
+- ));
+-
+- virtual CORBA::Boolean _is_a (
+- const CORBA::Char *type_id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+- virtual void *_tao_QueryInterface (ptr_arith_t type);
+-
+- virtual const char* _interface_repository_id (void) const;
+-
+-private:
+- _TAO_PrimaryKeyDef_Proxy_Broker *the_TAO_PrimaryKeyDef_Proxy_Broker_;
+-
+-protected:
+- PrimaryKeyDef (int collocated = 0);
+-
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
+-
+- PrimaryKeyDef (
+- TAO_Stub *objref,
+- CORBA::Boolean _tao_collocated = 0,
+- TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+- friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
+-
+- virtual ~PrimaryKeyDef (void);
+- private:
+- PrimaryKeyDef (const PrimaryKeyDef &);
+- void operator= (const PrimaryKeyDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::PrimaryKeyDef;
+-
+- friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+- friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * primary_key_id,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a &);
+- void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_is_a &);
+- const char * primary_key_id_;
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::PrimaryKeyDef;
+-
+- friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
+- friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
++ );
++ static IR_PrimaryKeyDef_ptr _unchecked_narrow (
++ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
++ static IR_PrimaryKeyDef_ptr _nil (void)
++ {
++ return (IR_PrimaryKeyDef_ptr)0;
++ }
++
++ static void _tao_any_destructor (void*);
++
++ virtual CORBA::Boolean is_a (
++ const char * primary_key_id,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
++
++ virtual IR_ValueDef_ptr primary_key (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
++ ACE_THROW_SPEC ((
++ CORBA::SystemException
++ ));
++
++ virtual CORBA::Boolean _is_a (
++ const CORBA::Char *type_id,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
++ );
++ virtual void *_tao_QueryInterface (ptr_arith_t type);
+
+-private:
+- TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_PrimaryKeyDef_primary_key_get &);
+- void result (IR::ValueDef_ptr result);
+- // update the result
+- IR::ValueDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
++ virtual const char* _interface_repository_id (void) const;
+
++private:
++ _TAO_PrimaryKeyDef_Proxy_Broker *the_TAO_PrimaryKeyDef_Proxy_Broker_;
++
++protected:
++ IR_PrimaryKeyDef (int collocated = 0);
++
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
++
++ IR_PrimaryKeyDef (
++ TAO_Stub *objref,
++ CORBA::Boolean _tao_collocated = 0,
++ TAO_Abstract_ServantBase *servant = 0
++ );
++
++ friend class _TAO_PrimaryKeyDef_Remote_Proxy_Impl;
++ friend class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_PrimaryKeyDef_Direct_Proxy_Impl;
++
++ virtual ~IR_PrimaryKeyDef (void);
++private:
++ IR_PrimaryKeyDef (const IR_PrimaryKeyDef &);
++ void operator= (const IR_PrimaryKeyDef &);
+ };
+
+
+@@ -27503,12 +16505,12 @@
+ //
+
+ class TAO_Export _TAO_PrimaryKeyDef_Proxy_Impl :
+- public virtual IR::_TAO_Contained_Proxy_Impl
++ public virtual _TAO_Contained_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_PrimaryKeyDef_Proxy_Impl (void) { }
+
+- virtual CORBA::Boolean is_a (
++ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * primary_key_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -27517,7 +16519,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ValueDef_ptr primary_key (
++ virtual IR_ValueDef_ptr primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27529,6 +16531,7 @@
+ _TAO_PrimaryKeyDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -27541,7 +16544,7 @@
+ class TAO_Export _TAO_PrimaryKeyDef_Remote_Proxy_Impl :
+ public virtual _TAO_PrimaryKeyDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_Contained_Remote_Proxy_Impl
++ public virtual _TAO_Contained_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -27549,7 +16552,7 @@
+
+ virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Impl (void) { }
+
+- virtual CORBA::Boolean is_a (
++ virtual CORBA::Boolean is_a (
+ CORBA_Object *_collocated_tao_target_,
+ const char * primary_key_id,
+ CORBA::Environment &ACE_TRY_ENV
+@@ -27558,7 +16561,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ValueDef_ptr primary_key (
++ virtual IR_ValueDef_ptr primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -27588,8 +16591,9 @@
+ {
+ public:
+ virtual ~_TAO_PrimaryKeyDef_Proxy_Broker (void);
++
+ virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
+- PrimaryKeyDef *object,
++ IR_PrimaryKeyDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -27614,9 +16618,9 @@
+ _TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
+- PrimaryKeyDef *object,
++ IR_PrimaryKeyDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -27630,24 +16634,15 @@
+ static _TAO_PrimaryKeyDef_Remote_Proxy_Broker *the_TAO_PrimaryKeyDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDef;
+-
+-struct PrimaryKeyDescription;
+-class PrimaryKeyDescription_var;
+-
+-struct TAO_Export PrimaryKeyDescription
++struct TAO_Export IR_PrimaryKeyDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef PrimaryKeyDescription_var _var_type;
++ typedef IR_PrimaryKeyDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -27656,159 +16651,85 @@
+ TAO_String_Manager id;
+ TAO_String_Manager defined_in;
+ TAO_String_Manager version;
+- ACE_NESTED_CLASS (IR, ValueDef_var) primary_key;
++ IR_ValueDef_var primary_key;
+ };
+
+-class TAO_Export PrimaryKeyDescription_var
++class TAO_Export IR_PrimaryKeyDescription_var
+ {
+ public:
+- PrimaryKeyDescription_var (void); // default constructor
+- PrimaryKeyDescription_var (PrimaryKeyDescription *);
+- PrimaryKeyDescription_var (const PrimaryKeyDescription_var &); // copy constructor
+- ~PrimaryKeyDescription_var (void); // destructor
++ IR_PrimaryKeyDescription_var (void); // default constructor
++ IR_PrimaryKeyDescription_var (IR_PrimaryKeyDescription *);
++ IR_PrimaryKeyDescription_var (const IR_PrimaryKeyDescription_var &); // copy constructor
++ ~IR_PrimaryKeyDescription_var (void); // destructor
+
+- PrimaryKeyDescription_var &operator= (PrimaryKeyDescription *);
+- PrimaryKeyDescription_var &operator= (const PrimaryKeyDescription_var &);
+- PrimaryKeyDescription *operator-> (void);
+- const PrimaryKeyDescription *operator-> (void) const;
++ IR_PrimaryKeyDescription_var &operator= (IR_PrimaryKeyDescription *);
++ IR_PrimaryKeyDescription_var &operator= (const IR_PrimaryKeyDescription_var &);
++ IR_PrimaryKeyDescription *operator-> (void);
++ const IR_PrimaryKeyDescription *operator-> (void) const;
+
+- operator const PrimaryKeyDescription &() const;
+- operator PrimaryKeyDescription &();
+- operator PrimaryKeyDescription &() const;
+- operator PrimaryKeyDescription *&(); // variable-size types only
++ operator const IR_PrimaryKeyDescription &() const;
++ operator IR_PrimaryKeyDescription &();
++ operator IR_PrimaryKeyDescription &() const;
++ operator IR_PrimaryKeyDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const PrimaryKeyDescription &in (void) const;
+- PrimaryKeyDescription &inout (void);
+- PrimaryKeyDescription *&out (void);
+- PrimaryKeyDescription *_retn (void);
+- PrimaryKeyDescription *ptr (void) const;
++ const IR_PrimaryKeyDescription &in (void) const;
++ IR_PrimaryKeyDescription &inout (void);
++ IR_PrimaryKeyDescription *&out (void);
++ IR_PrimaryKeyDescription *_retn (void);
++ IR_PrimaryKeyDescription *ptr (void) const;
+
+ private:
+- PrimaryKeyDescription *ptr_;
++ IR_PrimaryKeyDescription *ptr_;
+ };
+
+-class TAO_Export PrimaryKeyDescription_out
++class TAO_Export IR_PrimaryKeyDescription_out
+ {
+ public:
+- PrimaryKeyDescription_out (PrimaryKeyDescription *&);
+- PrimaryKeyDescription_out (PrimaryKeyDescription_var &);
+- PrimaryKeyDescription_out (const PrimaryKeyDescription_out &);
+- PrimaryKeyDescription_out &operator= (const PrimaryKeyDescription_out &);
+- PrimaryKeyDescription_out &operator= (PrimaryKeyDescription *);
+- operator PrimaryKeyDescription *&();
+- PrimaryKeyDescription *&ptr (void);
+- PrimaryKeyDescription *operator-> (void);
++ IR_PrimaryKeyDescription_out (IR_PrimaryKeyDescription *&);
++ IR_PrimaryKeyDescription_out (IR_PrimaryKeyDescription_var &);
++ IR_PrimaryKeyDescription_out (const IR_PrimaryKeyDescription_out &);
++ IR_PrimaryKeyDescription_out &operator= (const IR_PrimaryKeyDescription_out &);
++ IR_PrimaryKeyDescription_out &operator= (IR_PrimaryKeyDescription *);
++ operator IR_PrimaryKeyDescription *&();
++ IR_PrimaryKeyDescription *&ptr (void);
++ IR_PrimaryKeyDescription *operator-> (void);
+
+ private:
+- PrimaryKeyDescription *&ptr_;
++ IR_PrimaryKeyDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const PrimaryKeyDescription_var &);
+-};
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimaryKeyDescription;
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF___PTR_CH_)
+-#define _TAO_IR_FACTORYDEF___PTR_CH_
+-
+-class FactoryDef;
+-typedef FactoryDef *FactoryDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF___VAR_CH_)
+-#define _TAO_IR_FACTORYDEF___VAR_CH_
+-
+-class TAO_Export FactoryDef_var : public TAO_Base_var
+-{
+-public:
+- FactoryDef_var (void); // default constructor
+- FactoryDef_var (FactoryDef_ptr p) : ptr_ (p) {}
+- FactoryDef_var (const FactoryDef_var &); // copy constructor
+- ~FactoryDef_var (void); // destructor
+-
+- FactoryDef_var &operator= (FactoryDef_ptr);
+- FactoryDef_var &operator= (const FactoryDef_var &);
+- FactoryDef_ptr operator-> (void) const;
+-
+- operator const FactoryDef_ptr &() const;
+- operator FactoryDef_ptr &();
+- // in, inout, out, _retn
+- FactoryDef_ptr in (void) const;
+- FactoryDef_ptr &inout (void);
+- FactoryDef_ptr &out (void);
+- FactoryDef_ptr _retn (void);
+- FactoryDef_ptr ptr (void) const;
+-
+-private:
+- FactoryDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- FactoryDef_var (const TAO_Base_var &rhs);
+- FactoryDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF___OUT_CH_)
+-#define _TAO_IR_FACTORYDEF___OUT_CH_
+-
+-class TAO_Export FactoryDef_out
+-{
+-public:
+- FactoryDef_out (FactoryDef_ptr &);
+- FactoryDef_out (FactoryDef_var &);
+- FactoryDef_out (const FactoryDef_out &);
+- FactoryDef_out &operator= (const FactoryDef_out &);
+- FactoryDef_out &operator= (const FactoryDef_var &);
+- FactoryDef_out &operator= (FactoryDef_ptr);
+- operator FactoryDef_ptr &();
+- FactoryDef_ptr &ptr (void);
+- FactoryDef_ptr operator-> (void);
+-
+-private:
+- FactoryDef_ptr &ptr_;
++ void operator= (const IR_PrimaryKeyDescription_var &);
+ };
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF_CH_)
+-#define _TAO_IR_FACTORYDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_FactoryDef_Proxy_Impl;
+ class _TAO_FactoryDef_Remote_Proxy_Impl;
+ class _TAO_FactoryDef_Proxy_Broker;
+ class _TAO_FactoryDef_Remote_Proxy_Broker;
+
+-class TAO_Export FactoryDef: public virtual OperationDef
++class TAO_Export IR_FactoryDef: public virtual IR_OperationDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef FactoryDef_ptr _ptr_type;
+- typedef FactoryDef_var _var_type;
++ typedef IR_FactoryDef_ptr _ptr_type;
++ typedef IR_FactoryDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static FactoryDef_ptr _duplicate (FactoryDef_ptr obj);
+- static FactoryDef_ptr _narrow (
++ static IR_FactoryDef_ptr _duplicate (IR_FactoryDef_ptr obj);
++ static IR_FactoryDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static FactoryDef_ptr _unchecked_narrow (
++ static IR_FactoryDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static FactoryDef_ptr _nil (void)
++ static IR_FactoryDef_ptr _nil (void)
+ {
+- return (FactoryDef_ptr)0;
++ return (IR_FactoryDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -27826,60 +16747,53 @@
+ _TAO_FactoryDef_Proxy_Broker *the_TAO_FactoryDef_Proxy_Broker_;
+
+ protected:
+- FactoryDef (int collocated = 0);
++ IR_FactoryDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- FactoryDef (
++ IR_FactoryDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_FactoryDef_Remote_Proxy_Impl;
+- friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_FactoryDef_Direct_Proxy_Impl;
++ friend class _TAO_FactoryDef_Remote_Proxy_Impl;
++ friend class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_FactoryDef_Direct_Proxy_Impl;
+
+- virtual ~FactoryDef (void);
+- private:
+- FactoryDef (const FactoryDef &);
+- void operator= (const FactoryDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+- };
++ virtual ~IR_FactoryDef (void);
++private:
++ IR_FactoryDef (const IR_FactoryDef &);
++ void operator= (const IR_FactoryDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+
+-
+- ///////////////////////////////////////////////////////////////////////
+- // Base Impl. Declaration
+- //
+
+- class TAO_Export _TAO_FactoryDef_Proxy_Impl :
+- public virtual IR::_TAO_OperationDef_Proxy_Impl
+- {
+- public:
+- virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
++
++class TAO_Export _TAO_FactoryDef_Proxy_Impl
++ : public virtual _TAO_OperationDef_Proxy_Impl
++{
++public:
++ virtual ~_TAO_FactoryDef_Proxy_Impl (void) { }
++
++protected:
++ _TAO_FactoryDef_Proxy_Impl (void);
+
+- protected:
+- _TAO_FactoryDef_Proxy_Impl (void);
++};
+
+- };
+- //
+- // Base Proxy Impl. Declaration
+- ///////////////////////////////////////////////////////////////////////
++//
++// Base Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -27889,7 +16803,7 @@
+ class TAO_Export _TAO_FactoryDef_Remote_Proxy_Impl :
+ public virtual _TAO_FactoryDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_OperationDef_Remote_Proxy_Impl
++ public virtual _TAO_OperationDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -27897,7 +16811,7 @@
+
+ virtual ~_TAO_FactoryDef_Remote_Proxy_Impl (void) { }
+
+- };
++};
+
+ //
+ // Base Proxy Impl. Declaration
+@@ -27919,8 +16833,9 @@
+ {
+ public:
+ virtual ~_TAO_FactoryDef_Proxy_Broker (void);
++
+ virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
+- FactoryDef *object,
++ IR_FactoryDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -27945,9 +16860,9 @@
+ _TAO_FactoryDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_FactoryDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_FactoryDef_Proxy_Impl &select_proxy (
+- FactoryDef *object,
++ IR_FactoryDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -27961,117 +16876,39 @@
+ static _TAO_FactoryDef_Remote_Proxy_Broker *the_TAO_FactoryDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FactoryDef;
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF___PTR_CH_)
+-#define _TAO_IR_FINDERDEF___PTR_CH_
+-
+-class FinderDef;
+-typedef FinderDef *FinderDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF___VAR_CH_)
+-#define _TAO_IR_FINDERDEF___VAR_CH_
+-
+-class TAO_Export FinderDef_var : public TAO_Base_var
+-{
+-public:
+- FinderDef_var (void); // default constructor
+- FinderDef_var (FinderDef_ptr p) : ptr_ (p) {}
+- FinderDef_var (const FinderDef_var &); // copy constructor
+- ~FinderDef_var (void); // destructor
+-
+- FinderDef_var &operator= (FinderDef_ptr);
+- FinderDef_var &operator= (const FinderDef_var &);
+- FinderDef_ptr operator-> (void) const;
+-
+- operator const FinderDef_ptr &() const;
+- operator FinderDef_ptr &();
+- // in, inout, out, _retn
+- FinderDef_ptr in (void) const;
+- FinderDef_ptr &inout (void);
+- FinderDef_ptr &out (void);
+- FinderDef_ptr _retn (void);
+- FinderDef_ptr ptr (void) const;
+-
+-private:
+- FinderDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- FinderDef_var (const TAO_Base_var &rhs);
+- FinderDef_var &operator= (const TAO_Base_var &rhs);
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF___OUT_CH_)
+-#define _TAO_IR_FINDERDEF___OUT_CH_
+-
+-class TAO_Export FinderDef_out
+-{
+-public:
+- FinderDef_out (FinderDef_ptr &);
+- FinderDef_out (FinderDef_var &);
+- FinderDef_out (const FinderDef_out &);
+- FinderDef_out &operator= (const FinderDef_out &);
+- FinderDef_out &operator= (const FinderDef_var &);
+- FinderDef_out &operator= (FinderDef_ptr);
+- operator FinderDef_ptr &();
+- FinderDef_ptr &ptr (void);
+- FinderDef_ptr operator-> (void);
+-
+-private:
+- FinderDef_ptr &ptr_;
+-};
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF_CH_)
+-#define _TAO_IR_FINDERDEF_CH_
+-
+ // Forward Classes Declaration
+ class _TAO_FinderDef_Proxy_Impl;
+ class _TAO_FinderDef_Remote_Proxy_Impl;
+ class _TAO_FinderDef_Proxy_Broker;
+ class _TAO_FinderDef_Remote_Proxy_Broker;
+
+-class TAO_Export FinderDef: public virtual OperationDef
++class TAO_Export IR_FinderDef: public virtual IR_OperationDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef FinderDef_ptr _ptr_type;
+- typedef FinderDef_var _var_type;
++ typedef IR_FinderDef_ptr _ptr_type;
++ typedef IR_FinderDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static FinderDef_ptr _duplicate (FinderDef_ptr obj);
+- static FinderDef_ptr _narrow (
++ static IR_FinderDef_ptr _duplicate (IR_FinderDef_ptr obj);
++ static IR_FinderDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static FinderDef_ptr _unchecked_narrow (
++ static IR_FinderDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static FinderDef_ptr _nil (void)
++ static IR_FinderDef_ptr _nil (void)
+ {
+- return (FinderDef_ptr)0;
++ return (IR_FinderDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+@@ -28089,60 +16926,53 @@
+ _TAO_FinderDef_Proxy_Broker *the_TAO_FinderDef_Proxy_Broker_;
+
+ protected:
+- FinderDef (int collocated = 0);
++ IR_FinderDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
+-
+- FinderDef (
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
++
++ IR_FinderDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
++ );
+
+- friend class _TAO_FinderDef_Remote_Proxy_Impl;
+- friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_FinderDef_Direct_Proxy_Impl;
++ friend class _TAO_FinderDef_Remote_Proxy_Impl;
++ friend class _TAO_FinderDef_ThruPOA_Proxy_Impl;
++ friend class _TAO_FinderDef_Direct_Proxy_Impl;
+
+- virtual ~FinderDef (void);
+- private:
+- FinderDef (const FinderDef &);
+- void operator= (const FinderDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- #endif /* TAO_HAS_INTERCEPTORS */
+-
+- };
++ virtual ~IR_FinderDef (void);
++private:
++ IR_FinderDef (const IR_FinderDef &);
++ void operator= (const IR_FinderDef &);
++};
+
+
+ // The Proxy Implementations are used by each interface to
+ // perform a call. Each different implementation encapsulate
+ // an invocation logics.
+
+-
+- ///////////////////////////////////////////////////////////////////////
+- // Base Impl. Declaration
+- //
+
+- class TAO_Export _TAO_FinderDef_Proxy_Impl :
+- public virtual IR::_TAO_OperationDef_Proxy_Impl
+- {
+- public:
+- virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
++///////////////////////////////////////////////////////////////////////
++// Base Impl. Declaration
++//
++
++class TAO_Export _TAO_FinderDef_Proxy_Impl
++ : public virtual _TAO_OperationDef_Proxy_Impl
++{
++public:
++ virtual ~_TAO_FinderDef_Proxy_Impl (void) { }
++
++protected:
++ _TAO_FinderDef_Proxy_Impl (void);
+
+- protected:
+- _TAO_FinderDef_Proxy_Impl (void);
++};
+
+- };
+- //
+- // Base Proxy Impl. Declaration
+- ///////////////////////////////////////////////////////////////////////
++//
++// Base Proxy Impl. Declaration
++///////////////////////////////////////////////////////////////////////
+
+
+ ///////////////////////////////////////////////////////////////////////
+@@ -28152,7 +16982,7 @@
+ class TAO_Export _TAO_FinderDef_Remote_Proxy_Impl :
+ public virtual _TAO_FinderDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_OperationDef_Remote_Proxy_Impl
++ public virtual _TAO_OperationDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -28160,7 +16990,7 @@
+
+ virtual ~_TAO_FinderDef_Remote_Proxy_Impl (void) { }
+
+- };
++};
+
+ //
+ // Base Proxy Impl. Declaration
+@@ -28182,129 +17012,52 @@
+ {
+ public:
+ virtual ~_TAO_FinderDef_Proxy_Broker (void);
++
+ virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
+- FinderDef *object,
++ IR_FinderDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+ protected:
+- _TAO_FinderDef_Proxy_Broker (void);
+-
+-};
+-
+-
+-//
+-// End Base Proxy Broker Declaration
+-///////////////////////////////////////////////////////////////////////
+-
+-
+-///////////////////////////////////////////////////////////////////////
+-// Remote Proxy Broker Declaration
+-//
+-
+-class TAO_Export _TAO_FinderDef_Remote_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker
+-{
+-public:
+- _TAO_FinderDef_Remote_Proxy_Broker (void);
+-
+- virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
+-
+- virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
+- FinderDef *object,
+- CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+- );
+-
+-private:
+- _TAO_FinderDef_Remote_Proxy_Impl remote_proxy_impl_;
+-// This member function is used to get an handle to the unique instance
+-// of the Remote Proxy Broker that is available for a given
+-// interface.
+-
+-public:
+- static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
+-};
+-
+-
+-//
+-// End Remote Proxy Broker Declaration
+-///////////////////////////////////////////////////////////////////////
+-
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FinderDef;
+-
+-
+-#if !defined (_TAO_IR_HOMEDEF___PTR_CH_)
+-#define _TAO_IR_HOMEDEF___PTR_CH_
+-
+-class HomeDef;
+-typedef HomeDef *HomeDef_ptr;
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_HOMEDEF___VAR_CH_)
+-#define _TAO_IR_HOMEDEF___VAR_CH_
+-
+-class TAO_Export HomeDef_var : public TAO_Base_var
+-{
+-public:
+- HomeDef_var (void); // default constructor
+- HomeDef_var (HomeDef_ptr p) : ptr_ (p) {}
+- HomeDef_var (const HomeDef_var &); // copy constructor
+- ~HomeDef_var (void); // destructor
+-
+- HomeDef_var &operator= (HomeDef_ptr);
+- HomeDef_var &operator= (const HomeDef_var &);
+- HomeDef_ptr operator-> (void) const;
+-
+- operator const HomeDef_ptr &() const;
+- operator HomeDef_ptr &();
+- // in, inout, out, _retn
+- HomeDef_ptr in (void) const;
+- HomeDef_ptr &inout (void);
+- HomeDef_ptr &out (void);
+- HomeDef_ptr _retn (void);
+- HomeDef_ptr ptr (void) const;
+-
+-private:
+- HomeDef_ptr ptr_;
+- // Unimplemented - prevents widening assignment.
+- HomeDef_var (const TAO_Base_var &rhs);
+- HomeDef_var &operator= (const TAO_Base_var &rhs);
++ _TAO_FinderDef_Proxy_Broker (void);
++
+ };
+
+
+-#endif /* end #if !defined */
++//
++// End Base Proxy Broker Declaration
++///////////////////////////////////////////////////////////////////////
+
+
+-#if !defined (_TAO_IR_HOMEDEF___OUT_CH_)
+-#define _TAO_IR_HOMEDEF___OUT_CH_
++///////////////////////////////////////////////////////////////////////
++// Remote Proxy Broker Declaration
++//
+
+-class TAO_Export HomeDef_out
++class TAO_Export _TAO_FinderDef_Remote_Proxy_Broker : public virtual _TAO_FinderDef_Proxy_Broker
+ {
+-public:
+- HomeDef_out (HomeDef_ptr &);
+- HomeDef_out (HomeDef_var &);
+- HomeDef_out (const HomeDef_out &);
+- HomeDef_out &operator= (const HomeDef_out &);
+- HomeDef_out &operator= (const HomeDef_var &);
+- HomeDef_out &operator= (HomeDef_ptr);
+- operator HomeDef_ptr &();
+- HomeDef_ptr &ptr (void);
+- HomeDef_ptr operator-> (void);
++public:
++ _TAO_FinderDef_Remote_Proxy_Broker (void);
+
+-private:
+- HomeDef_ptr &ptr_;
+-};
++ virtual ~_TAO_FinderDef_Remote_Proxy_Broker (void);
+
++ virtual _TAO_FinderDef_Proxy_Impl &select_proxy (
++ IR_FinderDef *object,
++ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
++ );
+
+-#endif /* end #if !defined */
++private:
++ _TAO_FinderDef_Remote_Proxy_Impl remote_proxy_impl_;
++// This member function is used to get an handle to the unique instance
++// of the Remote Proxy Broker that is available for a given
++// interface.
+
++public:
++ static _TAO_FinderDef_Remote_Proxy_Broker *the_TAO_FinderDef_Remote_Proxy_Broker (void);
++};
+
+-#if !defined (_TAO_IR_HOMEDEF_CH_)
+-#define _TAO_IR_HOMEDEF_CH_
++//
++// End Remote Proxy Broker Declaration
++///////////////////////////////////////////////////////////////////////
+
+ // Forward Classes Declaration
+ class _TAO_HomeDef_Proxy_Impl;
+@@ -28312,42 +17065,42 @@
+ class _TAO_HomeDef_Proxy_Broker;
+ class _TAO_HomeDef_Remote_Proxy_Broker;
+
+-class TAO_Export HomeDef: public virtual InterfaceDef
++class TAO_Export IR_HomeDef: public virtual IR_InterfaceDef
+ {
+ public:
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef HomeDef_ptr _ptr_type;
+- typedef HomeDef_var _var_type;
++ typedef IR_HomeDef_ptr _ptr_type;
++ typedef IR_HomeDef_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ // the static operations
+- static HomeDef_ptr _duplicate (HomeDef_ptr obj);
+- static HomeDef_ptr _narrow (
++ static IR_HomeDef_ptr _duplicate (IR_HomeDef_ptr obj);
++ static IR_HomeDef_ptr _narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static HomeDef_ptr _unchecked_narrow (
++ static IR_HomeDef_ptr _unchecked_narrow (
+ CORBA::Object_ptr obj,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ );
+- static HomeDef_ptr _nil (void)
++ static IR_HomeDef_ptr _nil (void)
+ {
+- return (HomeDef_ptr)0;
++ return (IR_HomeDef_ptr)0;
+ }
+
+ static void _tao_any_destructor (void*);
+
+- virtual IR::HomeDef_ptr base_home (
+- CORBA::Environment &ACE_TRY_ENV =
++ virtual IR_HomeDef_ptr base_home (
++ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::ComponentDef_ptr managed_component (
++ virtual IR_ComponentDef_ptr managed_component (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28355,7 +17108,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::PrimaryKeyDef_ptr primary_key (
++ virtual IR_PrimaryKeyDef_ptr primary_key (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28363,7 +17116,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::FactoryDefSeq * factories (
++ virtual IR_FactoryDefSeq * factories (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28371,7 +17124,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::FinderDefSeq * finders (
++ virtual IR_FinderDefSeq * finders (
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28387,11 +17140,11 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::PrimaryKeyDef_ptr create_primary_key (
++ virtual IR_PrimaryKeyDef_ptr create_primary_key (
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr primary_key,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28399,12 +17152,12 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::FactoryDef_ptr create_factory (
++ virtual IR_FactoryDef_ptr create_factory (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28412,12 +17165,12 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::FinderDef_ptr create_finder (
++ virtual IR_FinderDef_ptr create_finder (
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV =
+ TAO_default_environment ()
+ )
+@@ -28438,450 +17191,27 @@
+ _TAO_HomeDef_Proxy_Broker *the_TAO_HomeDef_Proxy_Broker_;
+
+ protected:
+- HomeDef (int collocated = 0);
++ IR_HomeDef (int collocated = 0);
+
+- protected:
+- // This methods travese the inheritance tree and set the
+- // parents piece of the given class in the right mode
+- virtual void _tao_setup_collocation (int collocated);
++protected:
++ // This methods travese the inheritance tree and set the
++ // parents piece of the given class in the right mode
++ virtual void _tao_setup_collocation (int collocated);
+
+- HomeDef (
++ IR_HomeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated = 0,
+ TAO_Abstract_ServantBase *servant = 0
+- );
+-
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+- virtual ~HomeDef (void);
+- private:
+- HomeDef (const HomeDef &);
+- void operator= (const HomeDef &);
+-
+-#if (TAO_HAS_INTERCEPTORS == 1)
+- // Generation of interceptors related RequestInfo classes per operation.
+- // This needed to be able to store the arguments, exceptions, contexts
+- // and build the lists dynamically on demand so that unnecessary time overhead
+- // of building these lists when they arent used is avoided.
+- class TAO_ClientRequestInfo_IR_HomeDef_base_home_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::HomeDef;
+-
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_HomeDef_base_home_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- private:
+- TAO_ClientRequestInfo_IR_HomeDef_base_home_get (const TAO_ClientRequestInfo_IR_HomeDef_base_home_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_base_home_get &);
+- void result (IR::HomeDef_ptr result);
+- // update the result
+- IR::HomeDef_ptr result_;
+- };
+-
+- class TAO_ClientRequestInfo_IR_HomeDef_managed_component_get : public TAO_ClientRequestInfo
+- {
+- public:
+- friend class IR::HomeDef;
+-
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+- TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+ );
+-
+- virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+- virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_HomeDef_managed_component_get (const TAO_ClientRequestInfo_IR_HomeDef_managed_component_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_managed_component_get &);
+- void result (IR::ComponentDef_ptr result);
+- // update the result
+- IR::ComponentDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_HomeDef_primary_key_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::HomeDef;
+-
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_HomeDef_primary_key_get (const TAO_ClientRequestInfo_IR_HomeDef_primary_key_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_primary_key_get &);
+- void result (IR::PrimaryKeyDef_ptr result);
+- // update the result
+- IR::PrimaryKeyDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_HomeDef_factories_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::HomeDef;
+-
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_HomeDef_factories_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_HomeDef_factories_get (const TAO_ClientRequestInfo_IR_HomeDef_factories_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_factories_get &);
+- void result (IR::FactoryDefSeq * result);
+- // update the result
+- IR::FactoryDefSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_HomeDef_finders_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::HomeDef;
+-
++
+ friend class _TAO_HomeDef_Remote_Proxy_Impl;
+ friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+ friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_HomeDef_finders_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_HomeDef_finders_get (const TAO_ClientRequestInfo_IR_HomeDef_finders_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_finders_get &);
+- void result (IR::FinderDefSeq * result);
+- // update the result
+- IR::FinderDefSeq * result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_HomeDef_is_basic_get : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::HomeDef;
+
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
++ virtual ~IR_HomeDef (void);
+ private:
+- TAO_ClientRequestInfo_IR_HomeDef_is_basic_get (const TAO_ClientRequestInfo_IR_HomeDef_is_basic_get &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_is_basic_get &);
+- void result (CORBA::Boolean result);
+- // update the result
+- CORBA::Boolean result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_HomeDef_create_primary_key : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::HomeDef;
+-
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- IR::ValueDef_ptr primary_key,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_HomeDef_create_primary_key (const TAO_ClientRequestInfo_IR_HomeDef_create_primary_key &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_primary_key &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- IR::ValueDef_ptr primary_key_;
+- void result (IR::PrimaryKeyDef_ptr result);
+- // update the result
+- IR::PrimaryKeyDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_HomeDef_create_factory : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::HomeDef;
+-
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_HomeDef_create_factory (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_HomeDef_create_factory (const TAO_ClientRequestInfo_IR_HomeDef_create_factory &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_factory &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- const IR::ParDescriptionSeq & params_;
+- const IR::ExceptionDefSeq & exceptions_;
+- void result (IR::FactoryDef_ptr result);
+- // update the result
+- IR::FactoryDef_ptr result_;
+-};
+-
+-class TAO_ClientRequestInfo_IR_HomeDef_create_finder : public TAO_ClientRequestInfo
+-{
+-public:
+- friend class IR::HomeDef;
+-
+- friend class _TAO_HomeDef_Remote_Proxy_Impl;
+- friend class _TAO_HomeDef_ThruPOA_Proxy_Impl;
+- friend class _TAO_HomeDef_Direct_Proxy_Impl;
+-
+-TAO_ClientRequestInfo_IR_HomeDef_create_finder (
+- const char *_tao_operation,
+- IOP::ServiceContextList &_tao_service_context_list,
+- CORBA::Object *_tao_target,
+- const char * id,
+- const char * name,
+- const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- );
+-
+-virtual Dynamic::ParameterList * arguments (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual Dynamic::ExceptionList * exceptions (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-virtual CORBA::Any * result (
+- CORBA::Environment &ACE_TRY_ENV =
+- TAO_default_environment ()
+- )
+- ACE_THROW_SPEC ((CORBA::SystemException));
+-
+-private:
+- TAO_ClientRequestInfo_IR_HomeDef_create_finder (const TAO_ClientRequestInfo_IR_HomeDef_create_finder &);
+- void operator= (const TAO_ClientRequestInfo_IR_HomeDef_create_finder &);
+- const char * id_;
+- const char * name_;
+- const char * version_;
+- const IR::ParDescriptionSeq & params_;
+- const IR::ExceptionDefSeq & exceptions_;
+- void result (IR::FinderDef_ptr result);
+- // update the result
+- IR::FinderDef_ptr result_;
+-};
+-
+-#endif /* TAO_HAS_INTERCEPTORS */
+-
++ IR_HomeDef (const IR_HomeDef &);
++ void operator= (const IR_HomeDef &);
+ };
+
+
+@@ -28895,12 +17225,12 @@
+ //
+
+ class TAO_Export _TAO_HomeDef_Proxy_Impl :
+- public virtual IR::_TAO_InterfaceDef_Proxy_Impl
++ public virtual _TAO_InterfaceDef_Proxy_Impl
+ {
+ public:
+ virtual ~_TAO_HomeDef_Proxy_Impl (void) { }
+
+- virtual IR::HomeDef_ptr base_home (
++ virtual IR_HomeDef_ptr base_home (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28908,7 +17238,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::ComponentDef_ptr managed_component (
++ virtual IR_ComponentDef_ptr managed_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28916,7 +17246,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::PrimaryKeyDef_ptr primary_key (
++ virtual IR_PrimaryKeyDef_ptr primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28924,7 +17254,7 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::FactoryDefSeq * factories (
++ virtual IR_FactoryDefSeq * factories (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -28932,54 +17262,54 @@
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::FinderDefSeq * finders (
++ virtual IR_FinderDefSeq * finders (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual CORBA::Boolean is_basic (
++ virtual CORBA::Boolean is_basic (
+ CORBA_Object *_collocated_tao_target_,
+- CORBA::Environment &ACE_TRY_ENV
++ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::PrimaryKeyDef_ptr create_primary_key (
++ virtual IR_PrimaryKeyDef_ptr create_primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr primary_key,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::FactoryDef_ptr create_factory (
++ virtual IR_FactoryDef_ptr create_factory (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ )) = 0;
+
+- virtual IR::FinderDef_ptr create_finder (
++ virtual IR_FinderDef_ptr create_finder (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -28990,6 +17320,7 @@
+ _TAO_HomeDef_Proxy_Impl (void);
+
+ };
++
+ //
+ // Base Proxy Impl. Declaration
+ ///////////////////////////////////////////////////////////////////////
+@@ -29002,7 +17333,7 @@
+ class TAO_Export _TAO_HomeDef_Remote_Proxy_Impl :
+ public virtual _TAO_HomeDef_Proxy_Impl,
+ public virtual TAO_Remote_Object_Proxy_Impl,
+- public virtual IR::_TAO_InterfaceDef_Remote_Proxy_Impl
++ public virtual _TAO_InterfaceDef_Remote_Proxy_Impl
+
+ {
+ public:
+@@ -29010,7 +17341,7 @@
+
+ virtual ~_TAO_HomeDef_Remote_Proxy_Impl (void) { }
+
+- virtual IR::HomeDef_ptr base_home (
++ virtual IR_HomeDef_ptr base_home (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -29018,7 +17349,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::ComponentDef_ptr managed_component (
++ virtual IR_ComponentDef_ptr managed_component (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -29026,7 +17357,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::PrimaryKeyDef_ptr primary_key (
++ virtual IR_PrimaryKeyDef_ptr primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -29034,7 +17365,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::FactoryDefSeq * factories (
++ virtual IR_FactoryDefSeq * factories (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -29042,7 +17373,7 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::FinderDefSeq * finders (
++ virtual IR_FinderDefSeq * finders (
+ CORBA_Object *_collocated_tao_target_,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+@@ -29058,38 +17389,38 @@
+ CORBA::SystemException
+ ));
+
+- virtual IR::PrimaryKeyDef_ptr create_primary_key (
++ virtual IR_PrimaryKeyDef_ptr create_primary_key (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- IR::ValueDef_ptr primary_key,
++ IR_ValueDef_ptr primary_key,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::FactoryDef_ptr create_factory (
++ virtual IR_FactoryDef_ptr create_factory (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+ CORBA::SystemException
+ ));
+
+- virtual IR::FinderDef_ptr create_finder (
++ virtual IR_FinderDef_ptr create_finder (
+ CORBA_Object *_collocated_tao_target_,
+ const char * id,
+ const char * name,
+ const char * version,
+- const IR::ParDescriptionSeq & params,
+- const IR::ExceptionDefSeq & exceptions,
++ const IR_ParDescriptionSeq & params,
++ const IR_ExceptionDefSeq & exceptions,
+ CORBA::Environment &ACE_TRY_ENV
+ )
+ ACE_THROW_SPEC ((
+@@ -29118,8 +17449,9 @@
+ {
+ public:
+ virtual ~_TAO_HomeDef_Proxy_Broker (void);
++
+ virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+- HomeDef *object,
++ IR_HomeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ ) = 0;
+
+@@ -29144,9 +17476,9 @@
+ _TAO_HomeDef_Remote_Proxy_Broker (void);
+
+ virtual ~_TAO_HomeDef_Remote_Proxy_Broker (void);
+-
++
+ virtual _TAO_HomeDef_Proxy_Impl &select_proxy (
+- HomeDef *object,
++ IR_HomeDef *object,
+ CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
+ );
+
+@@ -29160,24 +17492,15 @@
+ static _TAO_HomeDef_Remote_Proxy_Broker *the_TAO_HomeDef_Remote_Proxy_Broker (void);
+ };
+
+-
+ //
+ // End Remote Proxy Broker Declaration
+ ///////////////////////////////////////////////////////////////////////
+
+-
+-#endif /* end #if !defined */
+-
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDef;
+-
+-struct HomeDescription;
+-class HomeDescription_var;
+-
+-struct TAO_Export HomeDescription
++struct TAO_Export IR_HomeDescription
+ {
+
+ #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
+- typedef HomeDescription_var _var_type;
++ typedef IR_HomeDescription_var _var_type;
+ #endif /* ! __GNUC__ || g++ >= 2.8 */
+
+ static void _tao_any_destructor (void*);
+@@ -29188,1033 +17511,875 @@
+ TAO_String_Manager version;
+ TAO_String_Manager base_home;
+ TAO_String_Manager managed_component;
+- ACE_NESTED_CLASS (IR, PrimaryKeyDef_var) primary_key_def;
+- ACE_NESTED_CLASS (IR, FactoryDefSeq) factories;
+- ACE_NESTED_CLASS (IR, FinderDefSeq) finders;
+- ACE_NESTED_CLASS (IR, OpDescriptionSeq) operations;
+- ACE_NESTED_CLASS (IR, AttrDescriptionSeq) attributes;
++ IR_PrimaryKeyDef_var primary_key_def;
++ IR_FactoryDefSeq factories;
++ IR_FinderDefSeq finders;
++ IR_OpDescriptionSeq operations;
++ IR_AttrDescriptionSeq attributes;
+ CORBA::Boolean is_basic;
+ };
+
+-class TAO_Export HomeDescription_var
++class TAO_Export IR_HomeDescription_var
+ {
+ public:
+- HomeDescription_var (void); // default constructor
+- HomeDescription_var (HomeDescription *);
+- HomeDescription_var (const HomeDescription_var &); // copy constructor
+- ~HomeDescription_var (void); // destructor
+-
+- HomeDescription_var &operator= (HomeDescription *);
+- HomeDescription_var &operator= (const HomeDescription_var &);
+- HomeDescription *operator-> (void);
+- const HomeDescription *operator-> (void) const;
+-
+- operator const HomeDescription &() const;
+- operator HomeDescription &();
+- operator HomeDescription &() const;
+- operator HomeDescription *&(); // variable-size types only
++ IR_HomeDescription_var (void); // default constructor
++ IR_HomeDescription_var (IR_HomeDescription *);
++ IR_HomeDescription_var (const IR_HomeDescription_var &); // copy constructor
++ ~IR_HomeDescription_var (void); // destructor
++
++ IR_HomeDescription_var &operator= (IR_HomeDescription *);
++ IR_HomeDescription_var &operator= (const IR_HomeDescription_var &);
++ IR_HomeDescription *operator-> (void);
++ const IR_HomeDescription *operator-> (void) const;
++
++ operator const IR_HomeDescription &() const;
++ operator IR_HomeDescription &();
++ operator IR_HomeDescription &() const;
++ operator IR_HomeDescription *&(); // variable-size types only
+
+ // in, inout, out, _retn
+- const HomeDescription &in (void) const;
+- HomeDescription &inout (void);
+- HomeDescription *&out (void);
+- HomeDescription *_retn (void);
+- HomeDescription *ptr (void) const;
++ const IR_HomeDescription &in (void) const;
++ IR_HomeDescription &inout (void);
++ IR_HomeDescription *&out (void);
++ IR_HomeDescription *_retn (void);
++ IR_HomeDescription *ptr (void) const;
+
+ private:
+- HomeDescription *ptr_;
++ IR_HomeDescription *ptr_;
+ };
+
+-class TAO_Export HomeDescription_out
++class TAO_Export IR_HomeDescription_out
+ {
+ public:
+- HomeDescription_out (HomeDescription *&);
+- HomeDescription_out (HomeDescription_var &);
+- HomeDescription_out (const HomeDescription_out &);
+- HomeDescription_out &operator= (const HomeDescription_out &);
+- HomeDescription_out &operator= (HomeDescription *);
+- operator HomeDescription *&();
+- HomeDescription *&ptr (void);
+- HomeDescription *operator-> (void);
++ IR_HomeDescription_out (IR_HomeDescription *&);
++ IR_HomeDescription_out (IR_HomeDescription_var &);
++ IR_HomeDescription_out (const IR_HomeDescription_out &);
++ IR_HomeDescription_out &operator= (const IR_HomeDescription_out &);
++ IR_HomeDescription_out &operator= (IR_HomeDescription *);
++ operator IR_HomeDescription *&();
++ IR_HomeDescription *&ptr (void);
++ IR_HomeDescription *operator-> (void);
+
+ private:
+- HomeDescription *&ptr_;
++ IR_HomeDescription *&ptr_;
+ // assignment from T_var not allowed
+- void operator= (const HomeDescription_var &);
++ void operator= (const IR_HomeDescription_var &);
+ };
+
+-TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_HomeDescription;
+-
+-
+-}
+-TAO_NAMESPACE_CLOSE // module IR
+-
+-TAO_Export void operator<<= (CORBA::Any &, IR::DefinitionKind);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::DefinitionKind &);
+-extern TAO_Export CORBA::_TAO_IRObject_Proxy_Broker * (*CORBA__TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
++TAO_Export void operator<<= (CORBA::Any &, IR_DefinitionKind);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_DefinitionKind &);
++extern TAO_Export _TAO_IRObject_Proxy_Broker * (*_TAO_IRObject_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface CORBA::IRObject
+-TAO_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IRObject *&);
+-extern TAO_Export IR::_TAO_Contained_Proxy_Broker * (*IR__TAO_Contained_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface CORBA_IRObject
++TAO_Export void operator<<= (CORBA::Any &, CORBA_IRObject_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA_IRObject *&);
++extern TAO_Export _TAO_Contained_Proxy_Broker * (*_TAO_Contained_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::Contained
+-TAO_Export void operator<<= (CORBA::Any &, IR::Contained_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Contained *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::Contained::Description &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::Contained::Description*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Contained::Description *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Contained::Description *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::InterfaceDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::InterfaceDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::InterfaceDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ValueDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ValueDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ComponentDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ComponentDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ProvidesDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ProvidesDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::UsesDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::UsesDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::HomeDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::HomeDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::EmitsDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::EmitsDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EmitsDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::PublishesDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::PublishesDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PublishesDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ConsumesDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ConsumesDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ConsumesDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::FactoryDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::FactoryDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::FactoryDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::FinderDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::FinderDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::FinderDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ContainedSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ContainedSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ContainedSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ContainedSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::StructMember &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::StructMember*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StructMember *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::StructMember *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::StructMemberSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::StructMemberSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StructMemberSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::StructMemberSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::Initializer &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::Initializer*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Initializer *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Initializer *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::InitializerSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::InitializerSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InitializerSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::InitializerSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::UnionMember &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::UnionMember*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UnionMember *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UnionMember *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::UnionMemberSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::UnionMemberSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UnionMemberSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UnionMemberSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::EnumMemberSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::EnumMemberSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EnumMemberSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EnumMemberSeq *&);
+-extern TAO_Export IR::_TAO_Container_Proxy_Broker * (*IR__TAO_Container_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_Contained
++TAO_Export void operator<<= (CORBA::Any &, IR_Contained_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Contained *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_Contained::Description &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_Contained::Description*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Contained::Description *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Contained::Description *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_InterfaceDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_InterfaceDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InterfaceDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_InterfaceDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ValueDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ValueDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ComponentDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ComponentDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ComponentDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ProvidesDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ProvidesDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_UsesDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_UsesDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_HomeDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_HomeDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_HomeDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_HomeDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_EmitsDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_EmitsDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EmitsDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EmitsDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_PublishesDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_PublishesDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PublishesDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_PublishesDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ConsumesDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ConsumesDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConsumesDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ConsumesDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_FactoryDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_FactoryDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FactoryDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_FactoryDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_FinderDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_FinderDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FinderDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_FinderDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ContainedSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ContainedSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ContainedSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ContainedSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_StructMember &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_StructMember*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructMember *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_StructMember *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_StructMemberSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_StructMemberSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructMemberSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_StructMemberSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_Initializer &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_Initializer*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Initializer *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Initializer *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_InitializerSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_InitializerSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InitializerSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_InitializerSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_UnionMember &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_UnionMember*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionMember *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UnionMember *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_UnionMemberSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_UnionMemberSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionMemberSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UnionMemberSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_EnumMemberSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_EnumMemberSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumMemberSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EnumMemberSeq *&);
++extern TAO_Export _TAO_Container_Proxy_Broker * (*_TAO_Container_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::Container
+-TAO_Export void operator<<= (CORBA::Any &, IR::Container_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::Container::Description &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::Container::Description*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container::Description *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Container::Description *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::Container::DescriptionSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::Container::DescriptionSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Container::DescriptionSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::Container::DescriptionSeq *&);
+-extern TAO_Export IR::_TAO_IDLType_Proxy_Broker * (*IR__TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_Container
++TAO_Export void operator<<= (CORBA::Any &, IR_Container_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_Container::Description &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_Container::Description*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container::Description *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Container::Description *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_Container::DescriptionSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_Container::DescriptionSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Container::DescriptionSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_Container::DescriptionSeq *&);
++extern TAO_Export _TAO_IDLType_Proxy_Broker * (*_TAO_IDLType_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::IDLType
+-TAO_Export void operator<<= (CORBA::Any &, IR::IDLType_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::IDLType *&);
+-TAO_Export void operator<<= (CORBA::Any &, IR::PrimitiveKind);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveKind &);
+-extern TAO_Export IR::_TAO_Repository_Proxy_Broker * (*IR__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_IDLType
++TAO_Export void operator<<= (CORBA::Any &, IR_IDLType_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_IDLType *&);
++TAO_Export void operator<<= (CORBA::Any &, IR_PrimitiveKind);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveKind &);
++extern TAO_Export _TAO_Repository_Proxy_Broker * (*_TAO_Repository_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::Repository
+-TAO_Export void operator<<= (CORBA::Any &, IR::Repository_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::Repository *&);
+-extern TAO_Export IR::_TAO_ComponentRepository_Proxy_Broker * (*IR__TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_Repository
++TAO_Export void operator<<= (CORBA::Any &, IR_Repository_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_Repository *&);
++extern TAO_Export _TAO_ComponentRepository_Proxy_Broker * (*_TAO_ComponentRepository_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ComponentRepository
+-TAO_Export void operator<<= (CORBA::Any &, IR::ComponentRepository_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentRepository *&);
+-extern TAO_Export IR::_TAO_ModuleDef_Proxy_Broker * (*IR__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ComponentRepository
++TAO_Export void operator<<= (CORBA::Any &, IR_ComponentRepository_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentRepository *&);
++extern TAO_Export _TAO_ModuleDef_Proxy_Broker * (*_TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ModuleDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ModuleDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ModuleDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ModuleDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ModuleDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ModuleDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ModuleDescription *&);
+-extern TAO_Export IR::_TAO_ConstantDef_Proxy_Broker * (*IR__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ModuleDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ModuleDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ModuleDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ModuleDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ModuleDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ModuleDescription *&);
++extern TAO_Export _TAO_ConstantDef_Proxy_Broker * (*_TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ConstantDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ConstantDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConstantDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ConstantDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ConstantDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConstantDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ConstantDescription *&);
+-extern TAO_Export IR::_TAO_TypedefDef_Proxy_Broker * (*IR__TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ConstantDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ConstantDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ConstantDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ConstantDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConstantDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ConstantDescription *&);
++extern TAO_Export _TAO_TypedefDef_Proxy_Broker * (*_TAO_TypedefDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::TypedefDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::TypedefDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::TypedefDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::TypeDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::TypeDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::TypeDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::TypeDescription *&);
+-extern TAO_Export IR::_TAO_StructDef_Proxy_Broker * (*IR__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_TypedefDef
++TAO_Export void operator<<= (CORBA::Any &, IR_TypedefDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypedefDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_TypeDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_TypeDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_TypeDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_TypeDescription *&);
++extern TAO_Export _TAO_StructDef_Proxy_Broker * (*_TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::StructDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::StructDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StructDef *&);
+-extern TAO_Export IR::_TAO_UnionDef_Proxy_Broker * (*IR__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_StructDef
++TAO_Export void operator<<= (CORBA::Any &, IR_StructDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StructDef *&);
++extern TAO_Export _TAO_UnionDef_Proxy_Broker * (*_TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::UnionDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::UnionDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UnionDef *&);
+-extern TAO_Export IR::_TAO_EnumDef_Proxy_Broker * (*IR__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_UnionDef
++TAO_Export void operator<<= (CORBA::Any &, IR_UnionDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UnionDef *&);
++extern TAO_Export _TAO_EnumDef_Proxy_Broker * (*_TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::EnumDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::EnumDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EnumDef *&);
+-extern TAO_Export IR::_TAO_AliasDef_Proxy_Broker * (*IR__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_EnumDef
++TAO_Export void operator<<= (CORBA::Any &, IR_EnumDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EnumDef *&);
++extern TAO_Export _TAO_AliasDef_Proxy_Broker * (*_TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::AliasDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::AliasDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AliasDef *&);
+-extern TAO_Export IR::_TAO_NativeDef_Proxy_Broker * (*IR__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_AliasDef
++TAO_Export void operator<<= (CORBA::Any &, IR_AliasDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AliasDef *&);
++extern TAO_Export _TAO_NativeDef_Proxy_Broker * (*_TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::NativeDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::NativeDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::NativeDef *&);
+-extern TAO_Export IR::_TAO_PrimitiveDef_Proxy_Broker * (*IR__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_NativeDef
++TAO_Export void operator<<= (CORBA::Any &, IR_NativeDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_NativeDef *&);
++extern TAO_Export _TAO_PrimitiveDef_Proxy_Broker * (*_TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::PrimitiveDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::PrimitiveDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimitiveDef *&);
+-extern TAO_Export IR::_TAO_StringDef_Proxy_Broker * (*IR__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_PrimitiveDef
++TAO_Export void operator<<= (CORBA::Any &, IR_PrimitiveDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimitiveDef *&);
++extern TAO_Export _TAO_StringDef_Proxy_Broker * (*_TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::StringDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::StringDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::StringDef *&);
+-extern TAO_Export IR::_TAO_WstringDef_Proxy_Broker * (*IR__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_StringDef
++TAO_Export void operator<<= (CORBA::Any &, IR_StringDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_StringDef *&);
++extern TAO_Export _TAO_WstringDef_Proxy_Broker * (*_TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::WstringDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::WstringDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::WstringDef *&);
+-extern TAO_Export IR::_TAO_FixedDef_Proxy_Broker * (*IR__TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_WstringDef
++TAO_Export void operator<<= (CORBA::Any &, IR_WstringDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_WstringDef *&);
++extern TAO_Export _TAO_FixedDef_Proxy_Broker * (*_TAO_FixedDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::FixedDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::FixedDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FixedDef *&);
+-extern TAO_Export IR::_TAO_SequenceDef_Proxy_Broker * (*IR__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_FixedDef
++TAO_Export void operator<<= (CORBA::Any &, IR_FixedDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FixedDef *&);
++extern TAO_Export _TAO_SequenceDef_Proxy_Broker * (*_TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::SequenceDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::SequenceDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::SequenceDef *&);
+-extern TAO_Export IR::_TAO_ArrayDef_Proxy_Broker * (*IR__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_SequenceDef
++TAO_Export void operator<<= (CORBA::Any &, IR_SequenceDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_SequenceDef *&);
++extern TAO_Export _TAO_ArrayDef_Proxy_Broker * (*_TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ArrayDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ArrayDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ArrayDef *&);
+-extern TAO_Export IR::_TAO_ExceptionDef_Proxy_Broker * (*IR__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ArrayDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ArrayDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ArrayDef *&);
++extern TAO_Export _TAO_ExceptionDef_Proxy_Broker * (*_TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ExceptionDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ExceptionDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ExceptionDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ExceptionDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExceptionDescription *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ExceptionDefSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ExceptionDefSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExceptionDefSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExceptionDefSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ExcDescriptionSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ExcDescriptionSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ExcDescriptionSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ExcDescriptionSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, IR::AttributeMode);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeMode &);
+-extern TAO_Export IR::_TAO_AttributeDef_Proxy_Broker * (*IR__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ExceptionDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ExceptionDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExceptionDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ExceptionDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ExceptionDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExceptionDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExceptionDescription *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ExceptionDefSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ExceptionDefSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExceptionDefSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExceptionDefSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ExcDescriptionSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ExcDescriptionSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ExcDescriptionSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ExcDescriptionSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, IR_AttributeMode);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeMode &);
++extern TAO_Export _TAO_AttributeDef_Proxy_Broker * (*_TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::AttributeDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::AttributeDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::AttributeDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::AttributeDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttributeDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::AttributeDescription *&);
+-TAO_Export void operator<<= (CORBA::Any &, IR::OperationMode);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationMode &);
+-TAO_Export void operator<<= (CORBA::Any &, IR::ParameterMode);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterMode &);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ParameterDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ParameterDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParameterDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ParameterDescription *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ParDescriptionSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ParDescriptionSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ParDescriptionSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ParDescriptionSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ContextIdSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ContextIdSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ContextIdSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ContextIdSeq *&);
+-extern TAO_Export IR::_TAO_OperationDef_Proxy_Broker * (*IR__TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_AttributeDef
++TAO_Export void operator<<= (CORBA::Any &, IR_AttributeDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_AttributeDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_AttributeDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttributeDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_AttributeDescription *&);
++TAO_Export void operator<<= (CORBA::Any &, IR_OperationMode);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationMode &);
++TAO_Export void operator<<= (CORBA::Any &, IR_ParameterMode);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ParameterMode &);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ParameterDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ParameterDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ParameterDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ParameterDescription *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ParDescriptionSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ParDescriptionSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ParDescriptionSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ParDescriptionSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ContextIdSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ContextIdSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ContextIdSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ContextIdSeq *&);
++extern TAO_Export _TAO_OperationDef_Proxy_Broker * (*_TAO_OperationDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::OperationDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::OperationDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::OperationDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::OperationDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OperationDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::OperationDescription *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::RepositoryIdSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::RepositoryIdSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::RepositoryIdSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::RepositoryIdSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::OpDescriptionSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::OpDescriptionSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::OpDescriptionSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::OpDescriptionSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::AttrDescriptionSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::AttrDescriptionSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::AttrDescriptionSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::AttrDescriptionSeq *&);
+-extern TAO_Export IR::_TAO_InterfaceDef_Proxy_Broker * (*IR__TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_OperationDef
++TAO_Export void operator<<= (CORBA::Any &, IR_OperationDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_OperationDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_OperationDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OperationDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_OperationDescription *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_RepositoryIdSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_RepositoryIdSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_RepositoryIdSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_RepositoryIdSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_OpDescriptionSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_OpDescriptionSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_OpDescriptionSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_OpDescriptionSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_AttrDescriptionSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_AttrDescriptionSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_AttrDescriptionSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_AttrDescriptionSeq *&);
++extern TAO_Export _TAO_InterfaceDef_Proxy_Broker * (*_TAO_InterfaceDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::InterfaceDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::InterfaceDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::InterfaceDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::InterfaceDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::InterfaceDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::InterfaceDescription *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ValueMember &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ValueMember*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMember *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueMember *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ValueMemberSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ValueMemberSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMemberSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueMemberSeq *&);
+-extern TAO_Export IR::_TAO_ValueMemberDef_Proxy_Broker * (*IR__TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_InterfaceDef
++TAO_Export void operator<<= (CORBA::Any &, IR_InterfaceDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InterfaceDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_InterfaceDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_InterfaceDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_InterfaceDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_InterfaceDescription *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ValueMember &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ValueMember*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMember *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueMember *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ValueMemberSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ValueMemberSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueMemberSeq *&);
++extern TAO_Export _TAO_ValueMemberDef_Proxy_Broker * (*_TAO_ValueMemberDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ValueMemberDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ValueMemberDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueMemberDef *&);
+-extern TAO_Export IR::_TAO_ValueDef_Proxy_Broker * (*IR__TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ValueMemberDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ValueMemberDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueMemberDef *&);
++extern TAO_Export _TAO_ValueDef_Proxy_Broker * (*_TAO_ValueDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ValueDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ValueDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ValueDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ValueDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ValueDescription *&);
+-extern TAO_Export IR::_TAO_ValueBoxDef_Proxy_Broker * (*IR__TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ValueDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ValueDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ValueDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ValueDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ValueDescription *&);
++extern TAO_Export _TAO_ValueBoxDef_Proxy_Broker * (*_TAO_ValueBoxDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ValueBoxDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ValueBoxDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ValueBoxDef *&);
+-extern TAO_Export IR::_TAO_ProvidesDef_Proxy_Broker * (*IR__TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ValueBoxDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ValueBoxDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ValueBoxDef *&);
++extern TAO_Export _TAO_ProvidesDef_Proxy_Broker * (*_TAO_ProvidesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ProvidesDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ProvidesDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ProvidesDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescription *&);
+-extern TAO_Export IR::_TAO_UsesDef_Proxy_Broker * (*IR__TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ProvidesDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ProvidesDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ProvidesDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ProvidesDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDescription *&);
++extern TAO_Export _TAO_UsesDef_Proxy_Broker * (*_TAO_UsesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::UsesDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::UsesDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::UsesDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::UsesDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescription *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ProvidesDescSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ProvidesDescSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ProvidesDescSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ProvidesDescSeq *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::UsesDescSeq &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::UsesDescSeq*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::UsesDescSeq *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::UsesDescSeq *&);
+-extern TAO_Export IR::_TAO_EventDef_Proxy_Broker * (*IR__TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_UsesDef
++TAO_Export void operator<<= (CORBA::Any &, IR_UsesDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_UsesDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_UsesDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDescription *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ProvidesDescSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ProvidesDescSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ProvidesDescSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ProvidesDescSeq *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_UsesDescSeq &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_UsesDescSeq*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_UsesDescSeq *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_UsesDescSeq *&);
++extern TAO_Export _TAO_EventDef_Proxy_Broker * (*_TAO_EventDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::EventDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::EventDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::EventDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::EventDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EventDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::EventDescription *&);
+-extern TAO_Export IR::_TAO_EmitsDef_Proxy_Broker * (*IR__TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_EventDef
++TAO_Export void operator<<= (CORBA::Any &, IR_EventDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_EventDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_EventDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EventDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_EventDescription *&);
++extern TAO_Export _TAO_EmitsDef_Proxy_Broker * (*_TAO_EmitsDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::EmitsDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::EmitsDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::EmitsDef *&);
+-extern TAO_Export IR::_TAO_PublishesDef_Proxy_Broker * (*IR__TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_EmitsDef
++TAO_Export void operator<<= (CORBA::Any &, IR_EmitsDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_EmitsDef *&);
++extern TAO_Export _TAO_PublishesDef_Proxy_Broker * (*_TAO_PublishesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::PublishesDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::PublishesDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PublishesDef *&);
+-extern TAO_Export IR::_TAO_ConsumesDef_Proxy_Broker * (*IR__TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_PublishesDef
++TAO_Export void operator<<= (CORBA::Any &, IR_PublishesDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PublishesDef *&);
++extern TAO_Export _TAO_ConsumesDef_Proxy_Broker * (*_TAO_ConsumesDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ConsumesDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ConsumesDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ConsumesDef *&);
+-extern TAO_Export IR::_TAO_ComponentDef_Proxy_Broker * (*IR__TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ConsumesDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ConsumesDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ConsumesDef *&);
++extern TAO_Export _TAO_ComponentDef_Proxy_Broker * (*_TAO_ComponentDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::ComponentDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::ComponentDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::ComponentDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::ComponentDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::ComponentDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::ComponentDescription *&);
+-extern TAO_Export IR::_TAO_PrimaryKeyDef_Proxy_Broker * (*IR__TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_ComponentDef
++TAO_Export void operator<<= (CORBA::Any &, IR_ComponentDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_ComponentDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_ComponentDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_ComponentDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_ComponentDescription *&);
++extern TAO_Export _TAO_PrimaryKeyDef_Proxy_Broker * (*_TAO_PrimaryKeyDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::PrimaryKeyDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::PrimaryKeyDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::PrimaryKeyDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::PrimaryKeyDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::PrimaryKeyDescription *&);
+-extern TAO_Export IR::_TAO_FactoryDef_Proxy_Broker * (*IR__TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_PrimaryKeyDef
++TAO_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_PrimaryKeyDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_PrimaryKeyDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_PrimaryKeyDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_PrimaryKeyDescription *&);
++extern TAO_Export _TAO_FactoryDef_Proxy_Broker * (*_TAO_FactoryDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::FactoryDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::FactoryDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FactoryDef *&);
+-extern TAO_Export IR::_TAO_FinderDef_Proxy_Broker * (*IR__TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_FactoryDef
++TAO_Export void operator<<= (CORBA::Any &, IR_FactoryDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FactoryDef *&);
++extern TAO_Export _TAO_FinderDef_Proxy_Broker * (*_TAO_FinderDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::FinderDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::FinderDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::FinderDef *&);
+-extern TAO_Export IR::_TAO_HomeDef_Proxy_Broker * (*IR__TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
++// Any operators for interface IR_FinderDef
++TAO_Export void operator<<= (CORBA::Any &, IR_FinderDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_FinderDef *&);
++extern TAO_Export _TAO_HomeDef_Proxy_Broker * (*_TAO_HomeDef_Proxy_Broker_Factory_function_pointer) (
+ CORBA::Object_ptr obj
+ );
+-// Any operators for interface IR::HomeDef
+-TAO_Export void operator<<= (CORBA::Any &, IR::HomeDef_ptr);
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDef *&);
+-TAO_Export void operator<<= (CORBA::Any &, const IR::HomeDescription &); // copying version
+-TAO_Export void operator<<= (CORBA::Any &, IR::HomeDescription*); // noncopying version
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR::HomeDescription *&); // deprecated
+-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR::HomeDescription *&);
++// Any operators for interface IR_HomeDef
++TAO_Export void operator<<= (CORBA::Any &, IR_HomeDef_ptr);
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_HomeDef *&);
++TAO_Export void operator<<= (CORBA::Any &, const IR_HomeDescription &); // copying version
++TAO_Export void operator<<= (CORBA::Any &, IR_HomeDescription*); // noncopying version
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IR_HomeDescription *&); // deprecated
++TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IR_HomeDescription *&);
+
+ #ifndef __ACE_INLINE__
+
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::DefinitionKind &); //
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::DefinitionKind &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::IRObject_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::IRObject_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Contained_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Contained_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Contained::Description &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Contained::Description &);
+-
+-#if !defined _TAO_CDR_OP_IR_InterfaceDefSeq_H_
+-#define _TAO_CDR_OP_IR_InterfaceDefSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_DefinitionKind &); //
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_DefinitionKind &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA_IRObject_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA_IRObject_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Contained_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Contained_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Contained::Description &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Contained::Description &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::InterfaceDefSeq &
++ const IR_InterfaceDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::InterfaceDefSeq &
++ IR_InterfaceDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_InterfaceDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ValueDefSeq_H_
+-#define _TAO_CDR_OP_IR_ValueDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueDefSeq &
++ const IR_ValueDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ValueDefSeq &
++ IR_ValueDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ValueDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ComponentDefSeq_H_
+-#define _TAO_CDR_OP_IR_ComponentDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ComponentDefSeq &
++ const IR_ComponentDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ComponentDefSeq &
++ IR_ComponentDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ComponentDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_H_
+-#define _TAO_CDR_OP_IR_ProvidesDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ProvidesDefSeq &
++ const IR_ProvidesDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ProvidesDefSeq &
++ IR_ProvidesDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_UsesDefSeq_H_
+-#define _TAO_CDR_OP_IR_UsesDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::UsesDefSeq &
++ const IR_UsesDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::UsesDefSeq &
++ IR_UsesDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_UsesDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_HomeDefSeq_H_
+-#define _TAO_CDR_OP_IR_HomeDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::HomeDefSeq &
++ const IR_HomeDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::HomeDefSeq &
++ IR_HomeDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_HomeDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_EmitsDefSeq_H_
+-#define _TAO_CDR_OP_IR_EmitsDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::EmitsDefSeq &
++ const IR_EmitsDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::EmitsDefSeq &
++ IR_EmitsDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_EmitsDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_PublishesDefSeq_H_
+-#define _TAO_CDR_OP_IR_PublishesDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::PublishesDefSeq &
++ const IR_PublishesDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::PublishesDefSeq &
++ IR_PublishesDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_PublishesDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_H_
+-#define _TAO_CDR_OP_IR_ConsumesDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ConsumesDefSeq &
++ const IR_ConsumesDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ConsumesDefSeq &
++ IR_ConsumesDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_FactoryDefSeq_H_
+-#define _TAO_CDR_OP_IR_FactoryDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::FactoryDefSeq &
++ const IR_FactoryDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::FactoryDefSeq &
++ IR_FactoryDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_FactoryDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_FinderDefSeq_H_
+-#define _TAO_CDR_OP_IR_FinderDefSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::FinderDefSeq &
++ const IR_FinderDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::FinderDefSeq &
++ IR_FinderDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_FinderDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ContainedSeq_H_
+-#define _TAO_CDR_OP_IR_ContainedSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ContainedSeq &
++ const IR_ContainedSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ContainedSeq &
++ IR_ContainedSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ContainedSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::StructMember &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::StructMember &);
+-
+-#if !defined _TAO_CDR_OP_IR_StructMemberSeq_H_
+-#define _TAO_CDR_OP_IR_StructMemberSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_StructMember &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_StructMember &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::StructMemberSeq &
++ const IR_StructMemberSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::StructMemberSeq &
++ IR_StructMemberSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_StructMemberSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Initializer &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Initializer &);
+-
+-#if !defined _TAO_CDR_OP_IR_InitializerSeq_H_
+-#define _TAO_CDR_OP_IR_InitializerSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Initializer &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Initializer &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::InitializerSeq &
++ const IR_InitializerSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::InitializerSeq &
++ IR_InitializerSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_InitializerSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UnionMember &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UnionMember &);
+-
+-#if !defined _TAO_CDR_OP_IR_UnionMemberSeq_H_
+-#define _TAO_CDR_OP_IR_UnionMemberSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UnionMember &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UnionMember &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::UnionMemberSeq &
++ const IR_UnionMemberSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::UnionMemberSeq &
++ IR_UnionMemberSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_UnionMemberSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_EnumMemberSeq_H_
+-#define _TAO_CDR_OP_IR_EnumMemberSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::EnumMemberSeq &
++ const IR_EnumMemberSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::EnumMemberSeq &
++ IR_EnumMemberSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_EnumMemberSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Container_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Container_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Container::Description &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Container::Description &);
+-
+-#if !defined _TAO_CDR_OP_IR_Container_DescriptionSeq_H_
+-#define _TAO_CDR_OP_IR_Container_DescriptionSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Container_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Container_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Container::Description &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Container::Description &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::Container::DescriptionSeq &
++ const IR_Container::DescriptionSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::Container::DescriptionSeq &
++ IR_Container::DescriptionSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_Container_DescriptionSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::IDLType_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::IDLType_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimitiveKind &); //
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimitiveKind &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::Repository_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::Repository_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentRepository_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentRepository_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ModuleDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ModuleDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ModuleDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ModuleDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConstantDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConstantDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConstantDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConstantDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::TypedefDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::TypedefDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::TypeDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::TypeDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::StructDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::StructDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UnionDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UnionDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EnumDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EnumDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AliasDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AliasDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::NativeDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::NativeDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimitiveDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimitiveDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::StringDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::StringDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::WstringDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::WstringDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FixedDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FixedDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::SequenceDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::SequenceDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ArrayDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ArrayDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ExceptionDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ExceptionDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ExceptionDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ExceptionDescription &);
+-
+-#if !defined _TAO_CDR_OP_IR_ExceptionDefSeq_H_
+-#define _TAO_CDR_OP_IR_ExceptionDefSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_IDLType_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_IDLType_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimitiveKind &); //
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimitiveKind &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_Repository_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_Repository_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ComponentRepository_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ComponentRepository_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ModuleDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ModuleDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ModuleDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ModuleDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ConstantDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ConstantDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ConstantDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ConstantDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_TypedefDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_TypedefDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_TypeDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_TypeDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_StructDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_StructDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UnionDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UnionDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EnumDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EnumDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AliasDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AliasDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_NativeDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_NativeDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimitiveDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimitiveDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_StringDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_StringDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_WstringDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_WstringDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_FixedDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_FixedDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_SequenceDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_SequenceDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ArrayDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ArrayDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ExceptionDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ExceptionDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ExceptionDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ExceptionDescription &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ExceptionDefSeq &
++ const IR_ExceptionDefSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ExceptionDefSeq &
++ IR_ExceptionDefSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ExceptionDefSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ExcDescriptionSeq_H_
+-#define _TAO_CDR_OP_IR_ExcDescriptionSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ExcDescriptionSeq &
++ const IR_ExcDescriptionSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ExcDescriptionSeq &
++ IR_ExcDescriptionSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeMode &); //
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeMode &); //
+ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeMode &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::AttributeDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::AttributeDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::OperationMode &); //
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_AttributeDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_AttributeDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationMode &); //
+ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationMode &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ParameterMode &); //
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterMode &); //
+ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterMode &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ParameterDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ParameterDescription &);
+-
+-#if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_H_
+-#define _TAO_CDR_OP_IR_ParDescriptionSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ParameterDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ParameterDescription &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ParDescriptionSeq &
++ const IR_ParDescriptionSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ParDescriptionSeq &
++ IR_ParDescriptionSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ParDescriptionSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_ContextIdSeq_H_
+-#define _TAO_CDR_OP_IR_ContextIdSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ContextIdSeq &
++ const IR_ContextIdSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ContextIdSeq &
++ IR_ContextIdSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ContextIdSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::OperationDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::OperationDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::OperationDescription &);
+-
+-#if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_H_
+-#define _TAO_CDR_OP_IR_RepositoryIdSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_OperationDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_OperationDescription &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::RepositoryIdSeq &
++ const IR_RepositoryIdSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::RepositoryIdSeq &
++ IR_RepositoryIdSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_OpDescriptionSeq_H_
+-#define _TAO_CDR_OP_IR_OpDescriptionSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::OpDescriptionSeq &
++ const IR_OpDescriptionSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::OpDescriptionSeq &
++ IR_OpDescriptionSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_OpDescriptionSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_AttrDescriptionSeq_H_
+-#define _TAO_CDR_OP_IR_AttrDescriptionSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::AttrDescriptionSeq &
++ const IR_AttrDescriptionSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::AttrDescriptionSeq &
++ IR_AttrDescriptionSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_AttrDescriptionSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::InterfaceDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::InterfaceDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::InterfaceDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::InterfaceDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueMember &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueMember &);
+-
+-#if !defined _TAO_CDR_OP_IR_ValueMemberSeq_H_
+-#define _TAO_CDR_OP_IR_ValueMemberSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_InterfaceDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_InterfaceDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_InterfaceDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_InterfaceDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueMember &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueMember &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueMemberSeq &
++ const IR_ValueMemberSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ValueMemberSeq &
++ IR_ValueMemberSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ValueMemberSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueMemberDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueMemberDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ValueBoxDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ValueBoxDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ProvidesDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ProvidesDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::UsesDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::UsesDescription &);
+-
+-#if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_H_
+-#define _TAO_CDR_OP_IR_ProvidesDescSeq_H_
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueMemberDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueMemberDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ValueBoxDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ValueBoxDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ProvidesDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ProvidesDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ProvidesDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ProvidesDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UsesDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UsesDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_UsesDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_UsesDescription &);
+
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ProvidesDescSeq &
++ const IR_ProvidesDescSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ProvidesDescSeq &
++ IR_ProvidesDescSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_H_ */
+-
+-
+-#if !defined _TAO_CDR_OP_IR_UsesDescSeq_H_
+-#define _TAO_CDR_OP_IR_UsesDescSeq_H_
+-
+ TAO_Export CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::UsesDescSeq &
++ const IR_UsesDescSeq &
+ );
+ TAO_Export CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::UsesDescSeq &
++ IR_UsesDescSeq &
+ );
+
+-#endif /* _TAO_CDR_OP_IR_UsesDescSeq_H_ */
+-
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EventDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EventDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::EmitsDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::EmitsDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PublishesDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PublishesDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ConsumesDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ConsumesDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::ComponentDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::ComponentDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::PrimaryKeyDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::PrimaryKeyDescription &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FactoryDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FactoryDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::FinderDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::FinderDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDef_ptr );
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDef_ptr &);
+-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR::HomeDescription &);
+-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR::HomeDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EventDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EventDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EventDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EventDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_EmitsDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_EmitsDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PublishesDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PublishesDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ConsumesDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ConsumesDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ComponentDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ComponentDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_ComponentDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_ComponentDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimaryKeyDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimaryKeyDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_PrimaryKeyDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_PrimaryKeyDescription &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_FactoryDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_FactoryDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_FinderDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_FinderDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_HomeDef_ptr );
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_HomeDef_ptr &);
++TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IR_HomeDescription &);
++TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IR_HomeDescription &);
+
+ #endif /* __ACE_INLINE__ */
+
+@@ -30227,5 +18392,6 @@
+ #pragma warning(pop)
+ #endif /* _MSC_VER */
+
++#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
+ #include "ace/post.h"
+ #endif /* ifndef */
diff --git a/TAO/tao/diffs/InterfaceC.i.diff b/TAO/tao/diffs/InterfaceC.i.diff
new file mode 100644
index 00000000000..54c00c984a9
--- /dev/null
+++ b/TAO/tao/diffs/InterfaceC.i.diff
@@ -0,0 +1,27294 @@
+--- InterfaceC.i Fri Dec 01 16:26:16 2000
++++ ..\..\..\tao\InterfaceC.i Mon Nov 27 19:25:22 2000
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++//$Id$
+
+ // **** Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -19,12 +19,8 @@
+ // Information about TAO is available at:
+ // http://www.cs.wustl.edu/~schmidt/TAO.html
+
+-
+-#if !defined (_TAO_CORBA_IROBJECT___CI_)
+-#define _TAO_CORBA_IROBJECT___CI_
+-
+ ACE_INLINE
+-CORBA::IRObject::IRObject (
++CORBA_IRObject::CORBA_IRObject (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -34,12 +30,6 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_CORBA_IROBJECT___VAR_CI_)
+-#define _TAO_CORBA_IROBJECT___VAR_CI_
+-
+ // *************************************************************
+ // Inline operations for class CORBA::IRObject_var
+ // *************************************************************
+@@ -133,13 +123,6 @@
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_CORBA_IROBJECT___OUT_CI_)
+-#define _TAO_CORBA_IROBJECT___OUT_CI_
+-
+ // *************************************************************
+ // Inline operations for class CORBA::IRObject_out
+ // *************************************************************
+@@ -167,7 +150,7 @@
+ ACE_INLINE ::CORBA::IRObject_out &
+ CORBA::IRObject_out::operator= (const ::CORBA::IRObject_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IRObject_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (CORBA_IRObject_out&, p).ptr_;
+ return *this;
+ }
+
+@@ -203,15 +186,8 @@
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED___CI_)
+-#define _TAO_IR_CONTAINED___CI_
+-
+ ACE_INLINE
+-IR::Contained::Contained (
++IR_Contained::IR_Contained (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -221,185 +197,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED___VAR_CI_)
+-#define _TAO_IR_CONTAINED___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::Contained_var
++// Inline operations for class IR_Contained_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Contained_var::Contained_var (void) // default constructor
+- : ptr_ (IR::Contained::_nil ())
++IR_Contained_var::IR_Contained_var (void) // default constructor
++ : ptr_ (IR_Contained::_nil ())
+ {}
+
+-ACE_INLINE IR::Contained_ptr
+-IR::Contained_var::ptr (void) const
++ACE_INLINE IR_Contained_ptr
++IR_Contained_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Contained_var::Contained_var (const IR::Contained_var &p) // copy constructor
++IR_Contained_var::IR_Contained_var (const IR_Contained_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (Contained::_duplicate (p.ptr ()))
++ ptr_ (IR_Contained::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::Contained_var::~Contained_var (void) // destructor
++IR_Contained_var::~IR_Contained_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::Contained_var &
+-IR::Contained_var::operator= (IR::Contained_ptr p)
++ACE_INLINE IR_Contained_var &
++IR_Contained_var::operator= (IR_Contained_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::Contained_var &
+-IR::Contained_var::operator= (const IR::Contained_var &p)
++ACE_INLINE IR_Contained_var &
++IR_Contained_var::operator= (const IR_Contained_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Contained::_duplicate (p.ptr ());
++ this->ptr_ = IR_Contained::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Contained_var::operator const IR::Contained_ptr &() const // cast
++IR_Contained_var::operator const IR_Contained_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Contained_var::operator IR::Contained_ptr &() // cast
++IR_Contained_var::operator IR_Contained_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Contained_ptr
+-IR::Contained_var::operator-> (void) const
++ACE_INLINE IR_Contained_ptr
++IR_Contained_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Contained_ptr
+-IR::Contained_var::in (void) const
++ACE_INLINE IR_Contained_ptr
++IR_Contained_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Contained_ptr &
+-IR::Contained_var::inout (void)
++ACE_INLINE IR_Contained_ptr &
++IR_Contained_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Contained_ptr &
+-IR::Contained_var::out (void)
++ACE_INLINE IR_Contained_ptr &
++IR_Contained_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Contained::_nil ();
++ this->ptr_ = IR_Contained::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Contained_ptr
+-IR::Contained_var::_retn (void)
++ACE_INLINE IR_Contained_ptr
++IR_Contained_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::Contained_ptr val = this->ptr_;
+- this->ptr_ = IR::Contained::_nil ();
++ IR_Contained_ptr val = this->ptr_;
++ this->ptr_ = IR_Contained::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINED___OUT_CI_)
+-#define _TAO_IR_CONTAINED___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::Contained_out
++// Inline operations for class IR_Contained_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Contained_out::Contained_out (IR::Contained_ptr &p)
++IR_Contained_out::IR_Contained_out (IR_Contained_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::Contained::_nil ();
++ this->ptr_ = IR_Contained::_nil ();
+ }
+
+ ACE_INLINE
+-IR::Contained_out::Contained_out (IR::Contained_var &p) // constructor from _var
++IR_Contained_out::IR_Contained_out (IR_Contained_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Contained::_nil ();
++ this->ptr_ = IR_Contained::_nil ();
+ }
+
+ ACE_INLINE
+-IR::Contained_out::Contained_out (const IR::Contained_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::Contained_out&,p).ptr_)
++IR_Contained_out::IR_Contained_out (const IR_Contained_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_Contained_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::Contained_out &
+-IR::Contained_out::operator= (const IR::Contained_out &p)
++ACE_INLINE IR_Contained_out &
++IR_Contained_out::operator= (const IR_Contained_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::Contained_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_Contained_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::Contained_out &
+-IR::Contained_out::operator= (const IR::Contained_var &p)
++ACE_INLINE IR_Contained_out &
++IR_Contained_out::operator= (const IR_Contained_var &p)
+ {
+- this->ptr_ = IR::Contained::_duplicate (p.ptr ());
++ this->ptr_ = IR_Contained::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::Contained_out &
+-IR::Contained_out::operator= (IR::Contained_ptr p)
++ACE_INLINE IR_Contained_out &
++IR_Contained_out::operator= (IR_Contained_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Contained_out::operator IR::Contained_ptr &() // cast
++IR_Contained_out::operator IR_Contained_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Contained_ptr &
+-IR::Contained_out::ptr (void) // ptr
++ACE_INLINE IR_Contained_ptr &
++IR_Contained_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Contained_ptr
+-IR::Contained_out::operator-> (void)
++ACE_INLINE IR_Contained_ptr
++IR_Contained_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY___CI_)
+-#define _TAO_IR_REPOSITORY___CI_
+-
+ ACE_INLINE
+-IR::Repository::Repository (
++IR_Repository::IR_Repository (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -409,185 +364,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY___VAR_CI_)
+-#define _TAO_IR_REPOSITORY___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::Repository_var
++// Inline operations for class IR_Repository_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Repository_var::Repository_var (void) // default constructor
+- : ptr_ (IR::Repository::_nil ())
++IR_Repository_var::IR_Repository_var (void) // default constructor
++ : ptr_ (IR_Repository::_nil ())
+ {}
+
+-ACE_INLINE IR::Repository_ptr
+-IR::Repository_var::ptr (void) const
++ACE_INLINE IR_Repository_ptr
++IR_Repository_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Repository_var::Repository_var (const IR::Repository_var &p) // copy constructor
++IR_Repository_var::IR_Repository_var (const IR_Repository_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (Repository::_duplicate (p.ptr ()))
++ ptr_ (IR_Repository::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::Repository_var::~Repository_var (void) // destructor
++IR_Repository_var::~IR_Repository_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::Repository_var &
+-IR::Repository_var::operator= (IR::Repository_ptr p)
++ACE_INLINE IR_Repository_var &
++IR_Repository_var::operator= (IR_Repository_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::Repository_var &
+-IR::Repository_var::operator= (const IR::Repository_var &p)
++ACE_INLINE IR_Repository_var &
++IR_Repository_var::operator= (const IR_Repository_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Repository::_duplicate (p.ptr ());
++ this->ptr_ = IR_Repository::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Repository_var::operator const IR::Repository_ptr &() const // cast
++IR_Repository_var::operator const IR_Repository_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Repository_var::operator IR::Repository_ptr &() // cast
++IR_Repository_var::operator IR_Repository_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Repository_ptr
+-IR::Repository_var::operator-> (void) const
++ACE_INLINE IR_Repository_ptr
++IR_Repository_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Repository_ptr
+-IR::Repository_var::in (void) const
++ACE_INLINE IR_Repository_ptr
++IR_Repository_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Repository_ptr &
+-IR::Repository_var::inout (void)
++ACE_INLINE IR_Repository_ptr &
++IR_Repository_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Repository_ptr &
+-IR::Repository_var::out (void)
++ACE_INLINE IR_Repository_ptr &
++IR_Repository_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Repository::_nil ();
++ this->ptr_ = IR_Repository::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Repository_ptr
+-IR::Repository_var::_retn (void)
++ACE_INLINE IR_Repository_ptr
++IR_Repository_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::Repository_ptr val = this->ptr_;
+- this->ptr_ = IR::Repository::_nil ();
++ IR_Repository_ptr val = this->ptr_;
++ this->ptr_ = IR_Repository::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_REPOSITORY___OUT_CI_)
+-#define _TAO_IR_REPOSITORY___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::Repository_out
++// Inline operations for class IR_Repository_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Repository_out::Repository_out (IR::Repository_ptr &p)
++IR_Repository_out::IR_Repository_out (IR_Repository_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::Repository::_nil ();
++ this->ptr_ = IR_Repository::_nil ();
+ }
+
+ ACE_INLINE
+-IR::Repository_out::Repository_out (IR::Repository_var &p) // constructor from _var
++IR_Repository_out::IR_Repository_out (IR_Repository_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Repository::_nil ();
++ this->ptr_ = IR_Repository::_nil ();
+ }
+
+ ACE_INLINE
+-IR::Repository_out::Repository_out (const IR::Repository_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::Repository_out&,p).ptr_)
++IR_Repository_out::IR_Repository_out (const IR_Repository_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_Repository_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::Repository_out &
+-IR::Repository_out::operator= (const IR::Repository_out &p)
++ACE_INLINE IR_Repository_out &
++IR_Repository_out::operator= (const IR_Repository_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::Repository_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_Repository_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::Repository_out &
+-IR::Repository_out::operator= (const IR::Repository_var &p)
++ACE_INLINE IR_Repository_out &
++IR_Repository_out::operator= (const IR_Repository_var &p)
+ {
+- this->ptr_ = IR::Repository::_duplicate (p.ptr ());
++ this->ptr_ = IR_Repository::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::Repository_out &
+-IR::Repository_out::operator= (IR::Repository_ptr p)
++ACE_INLINE IR_Repository_out &
++IR_Repository_out::operator= (IR_Repository_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Repository_out::operator IR::Repository_ptr &() // cast
++IR_Repository_out::operator IR_Repository_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Repository_ptr &
+-IR::Repository_out::ptr (void) // ptr
++ACE_INLINE IR_Repository_ptr &
++IR_Repository_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Repository_ptr
+-IR::Repository_out::operator-> (void)
++ACE_INLINE IR_Repository_ptr
++IR_Repository_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER___CI_)
+-#define _TAO_IR_CONTAINER___CI_
+-
+ ACE_INLINE
+-IR::Container::Container (
++IR_Container::IR_Container (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -597,312 +531,295 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER___VAR_CI_)
+-#define _TAO_IR_CONTAINER___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::Container_var
++// Inline operations for class IR_Container_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Container_var::Container_var (void) // default constructor
+- : ptr_ (IR::Container::_nil ())
++IR_Container_var::IR_Container_var (void) // default constructor
++ : ptr_ (IR_Container::_nil ())
+ {}
+
+-ACE_INLINE IR::Container_ptr
+-IR::Container_var::ptr (void) const
++ACE_INLINE IR_Container_ptr
++IR_Container_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Container_var::Container_var (const IR::Container_var &p) // copy constructor
++IR_Container_var::IR_Container_var (const IR_Container_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (Container::_duplicate (p.ptr ()))
++ ptr_ (IR_Container::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::Container_var::~Container_var (void) // destructor
++IR_Container_var::~IR_Container_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::Container_var &
+-IR::Container_var::operator= (IR::Container_ptr p)
++ACE_INLINE IR_Container_var &
++IR_Container_var::operator= (IR_Container_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::Container_var &
+-IR::Container_var::operator= (const IR::Container_var &p)
++ACE_INLINE IR_Container_var &
++IR_Container_var::operator= (const IR_Container_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Container::_duplicate (p.ptr ());
++ this->ptr_ = IR_Container::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Container_var::operator const IR::Container_ptr &() const // cast
++IR_Container_var::operator const IR_Container_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Container_var::operator IR::Container_ptr &() // cast
++IR_Container_var::operator IR_Container_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container_ptr
+-IR::Container_var::operator-> (void) const
++ACE_INLINE IR_Container_ptr
++IR_Container_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container_ptr
+-IR::Container_var::in (void) const
++ACE_INLINE IR_Container_ptr
++IR_Container_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container_ptr &
+-IR::Container_var::inout (void)
++ACE_INLINE IR_Container_ptr &
++IR_Container_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container_ptr &
+-IR::Container_var::out (void)
++ACE_INLINE IR_Container_ptr &
++IR_Container_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Container::_nil ();
++ this->ptr_ = IR_Container::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container_ptr
+-IR::Container_var::_retn (void)
++ACE_INLINE IR_Container_ptr
++IR_Container_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::Container_ptr val = this->ptr_;
+- this->ptr_ = IR::Container::_nil ();
++ IR_Container_ptr val = this->ptr_;
++ this->ptr_ = IR_Container::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTAINER___OUT_CI_)
+-#define _TAO_IR_CONTAINER___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::Container_out
++// Inline operations for class IR_Container_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Container_out::Container_out (IR::Container_ptr &p)
++IR_Container_out::IR_Container_out (IR_Container_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::Container::_nil ();
++ this->ptr_ = IR_Container::_nil ();
+ }
+
+ ACE_INLINE
+-IR::Container_out::Container_out (IR::Container_var &p) // constructor from _var
++IR_Container_out::IR_Container_out (IR_Container_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::Container::_nil ();
++ this->ptr_ = IR_Container::_nil ();
+ }
+
+ ACE_INLINE
+-IR::Container_out::Container_out (const IR::Container_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::Container_out&,p).ptr_)
++IR_Container_out::IR_Container_out (const IR_Container_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_Container_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::Container_out &
+-IR::Container_out::operator= (const IR::Container_out &p)
++ACE_INLINE IR_Container_out &
++IR_Container_out::operator= (const IR_Container_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::Container_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_Container_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::Container_out &
+-IR::Container_out::operator= (const IR::Container_var &p)
++ACE_INLINE IR_Container_out &
++IR_Container_out::operator= (const IR_Container_var &p)
+ {
+- this->ptr_ = IR::Container::_duplicate (p.ptr ());
++ this->ptr_ = IR_Container::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::Container_out &
+-IR::Container_out::operator= (IR::Container_ptr p)
++ACE_INLINE IR_Container_out &
++IR_Container_out::operator= (IR_Container_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Container_out::operator IR::Container_ptr &() // cast
++IR_Container_out::operator IR_Container_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container_ptr &
+-IR::Container_out::ptr (void) // ptr
++ACE_INLINE IR_Container_ptr &
++IR_Container_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container_ptr
+-IR::Container_out::operator-> (void)
++ACE_INLINE IR_Container_ptr
++IR_Container_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::Contained::Description_var
++// Inline operations for class IR_Contained::Description_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Contained::Description_var::Description_var (void) // default constructor
++IR_Contained::Description_var::Description_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::Contained::Description_var::Description_var (Description *p)
++IR_Contained::Description_var::Description_var (Description *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::Contained::Description_var::Description_var (const ::IR::Contained::Description_var &p) // copy constructor
++IR_Contained::Description_var::Description_var (const ::IR_Contained::Description_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::Contained::Description (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_Contained::Description (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::Contained::Description_var::~Description_var (void) // destructor
++IR_Contained::Description_var::~Description_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::Contained::Description_var &
+-IR::Contained::Description_var::operator= (Description *p)
++ACE_INLINE IR_Contained::Description_var &
++IR_Contained::Description_var::operator= (Description *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::Contained::Description_var &
+-IR::Contained::Description_var::operator= (const ::IR::Contained::Description_var &p)
++ACE_INLINE ::IR_Contained::Description_var &
++IR_Contained::Description_var::operator= (const ::IR_Contained::Description_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::Contained::Description (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_Contained::Description (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::Contained::Description *
+-IR::Contained::Description_var::operator-> (void) const
++ACE_INLINE const ::IR_Contained::Description *
++IR_Contained::Description_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Contained::Description *
+-IR::Contained::Description_var::operator-> (void)
++ACE_INLINE ::IR_Contained::Description *
++IR_Contained::Description_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Contained::Description_var::operator const ::IR::Contained::Description &() const // cast
++IR_Contained::Description_var::operator const ::IR_Contained::Description &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Contained::Description_var::operator ::IR::Contained::Description &() // cast
++IR_Contained::Description_var::operator ::IR_Contained::Description &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Contained::Description_var::operator ::IR::Contained::Description &() const // cast
++IR_Contained::Description_var::operator ::IR_Contained::Description &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::Contained::Description_var::operator ::IR::Contained::Description *&() // cast
++IR_Contained::Description_var::operator ::IR_Contained::Description *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::Contained::Description &
+-IR::Contained::Description_var::in (void) const
++ACE_INLINE const ::IR_Contained::Description &
++IR_Contained::Description_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Contained::Description &
+-IR::Contained::Description_var::inout (void)
++ACE_INLINE ::IR_Contained::Description &
++IR_Contained::Description_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::Contained::Description *&
+-IR::Contained::Description_var::out (void)
++ACE_INLINE ::IR_Contained::Description *&
++IR_Contained::Description_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Contained::Description *
+-IR::Contained::Description_var::_retn (void)
++ACE_INLINE ::IR_Contained::Description *
++IR_Contained::Description_var::_retn (void)
+ {
+- ::IR::Contained::Description *tmp = this->ptr_;
++ ::IR_Contained::Description *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::Contained::Description *
+-IR::Contained::Description_var::ptr (void) const
++ACE_INLINE ::IR_Contained::Description *
++IR_Contained::Description_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::Contained::Description_out
++// Inline operations for class IR_Contained::Description_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Contained::Description_out::Description_out (::IR::Contained::Description *&p)
++IR_Contained::Description_out::Description_out (::IR_Contained::Description *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::Contained::Description_out::Description_out (Description_var &p) // constructor from _var
++IR_Contained::Description_out::Description_out (Description_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -910,48 +827,44 @@
+ }
+
+ ACE_INLINE
+-IR::Contained::Description_out::Description_out (const ::IR::Contained::Description_out &p) // copy constructor
++IR_Contained::Description_out::Description_out (const ::IR_Contained::Description_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::Contained::Description_out &
+-IR::Contained::Description_out::operator= (const ::IR::Contained::Description_out &p)
++ACE_INLINE IR_Contained::Description_out &
++IR_Contained::Description_out::operator= (const ::IR_Contained::Description_out &p)
+ {
+ this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::Contained::Description_out &
+-IR::Contained::Description_out::operator= (Description *p)
++ACE_INLINE IR_Contained::Description_out &
++IR_Contained::Description_out::operator= (Description *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Contained::Description_out::operator ::IR::Contained::Description *&() // cast
++IR_Contained::Description_out::operator ::IR_Contained::Description *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Contained::Description *&
+-IR::Contained::Description_out::ptr (void) // ptr
++ACE_INLINE ::IR_Contained::Description *&
++IR_Contained::Description_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Contained::Description *
+-IR::Contained::Description_out::operator-> (void)
++ACE_INLINE ::IR_Contained::Description *
++IR_Contained::Description_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#if !defined (_TAO_IR_MODULEDEF___CI_)
+-#define _TAO_IR_MODULEDEF___CI_
+-
+ ACE_INLINE
+-IR::ModuleDef::ModuleDef (
++IR_ModuleDef::IR_ModuleDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -961,185 +874,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_MODULEDEF___VAR_CI_)
+-#define _TAO_IR_MODULEDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ModuleDef_var
++// Inline operations for class IR_ModuleDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ModuleDef_var::ModuleDef_var (void) // default constructor
+- : ptr_ (IR::ModuleDef::_nil ())
++IR_ModuleDef_var::IR_ModuleDef_var (void) // default constructor
++ : ptr_ (IR_ModuleDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ModuleDef_ptr
+-IR::ModuleDef_var::ptr (void) const
++ACE_INLINE IR_ModuleDef_ptr
++IR_ModuleDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ModuleDef_var::ModuleDef_var (const IR::ModuleDef_var &p) // copy constructor
++IR_ModuleDef_var::IR_ModuleDef_var (const IR_ModuleDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ModuleDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ModuleDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ModuleDef_var::~ModuleDef_var (void) // destructor
++IR_ModuleDef_var::~IR_ModuleDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ModuleDef_var &
+-IR::ModuleDef_var::operator= (IR::ModuleDef_ptr p)
++ACE_INLINE IR_ModuleDef_var &
++IR_ModuleDef_var::operator= (IR_ModuleDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ModuleDef_var &
+-IR::ModuleDef_var::operator= (const IR::ModuleDef_var &p)
++ACE_INLINE IR_ModuleDef_var &
++IR_ModuleDef_var::operator= (const IR_ModuleDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ModuleDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ModuleDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ModuleDef_var::operator const IR::ModuleDef_ptr &() const // cast
++IR_ModuleDef_var::operator const IR_ModuleDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ModuleDef_var::operator IR::ModuleDef_ptr &() // cast
++IR_ModuleDef_var::operator IR_ModuleDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ModuleDef_ptr
+-IR::ModuleDef_var::operator-> (void) const
++ACE_INLINE IR_ModuleDef_ptr
++IR_ModuleDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ModuleDef_ptr
+-IR::ModuleDef_var::in (void) const
++ACE_INLINE IR_ModuleDef_ptr
++IR_ModuleDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ModuleDef_ptr &
+-IR::ModuleDef_var::inout (void)
++ACE_INLINE IR_ModuleDef_ptr &
++IR_ModuleDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ModuleDef_ptr &
+-IR::ModuleDef_var::out (void)
++ACE_INLINE IR_ModuleDef_ptr &
++IR_ModuleDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ModuleDef::_nil ();
++ this->ptr_ = IR_ModuleDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ModuleDef_ptr
+-IR::ModuleDef_var::_retn (void)
++ACE_INLINE IR_ModuleDef_ptr
++IR_ModuleDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ModuleDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ModuleDef::_nil ();
++ IR_ModuleDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ModuleDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_MODULEDEF___OUT_CI_)
+-#define _TAO_IR_MODULEDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ModuleDef_out
++// Inline operations for class IR_ModuleDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ModuleDef_out::ModuleDef_out (IR::ModuleDef_ptr &p)
++IR_ModuleDef_out::IR_ModuleDef_out (IR_ModuleDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ModuleDef::_nil ();
++ this->ptr_ = IR_ModuleDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ModuleDef_out::ModuleDef_out (IR::ModuleDef_var &p) // constructor from _var
++IR_ModuleDef_out::IR_ModuleDef_out (IR_ModuleDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ModuleDef::_nil ();
++ this->ptr_ = IR_ModuleDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ModuleDef_out::ModuleDef_out (const IR::ModuleDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ModuleDef_out&,p).ptr_)
++IR_ModuleDef_out::IR_ModuleDef_out (const IR_ModuleDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ModuleDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ModuleDef_out &
+-IR::ModuleDef_out::operator= (const IR::ModuleDef_out &p)
++ACE_INLINE IR_ModuleDef_out &
++IR_ModuleDef_out::operator= (const IR_ModuleDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ModuleDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ModuleDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ModuleDef_out &
+-IR::ModuleDef_out::operator= (const IR::ModuleDef_var &p)
++ACE_INLINE IR_ModuleDef_out &
++IR_ModuleDef_out::operator= (const IR_ModuleDef_var &p)
+ {
+- this->ptr_ = IR::ModuleDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ModuleDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ModuleDef_out &
+-IR::ModuleDef_out::operator= (IR::ModuleDef_ptr p)
++ACE_INLINE IR_ModuleDef_out &
++IR_ModuleDef_out::operator= (IR_ModuleDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ModuleDef_out::operator IR::ModuleDef_ptr &() // cast
++IR_ModuleDef_out::operator IR_ModuleDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ModuleDef_ptr &
+-IR::ModuleDef_out::ptr (void) // ptr
++ACE_INLINE IR_ModuleDef_ptr &
++IR_ModuleDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ModuleDef_ptr
+-IR::ModuleDef_out::operator-> (void)
++ACE_INLINE IR_ModuleDef_ptr
++IR_ModuleDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___CI_)
+-#define _TAO_IR_CONSTANTDEF___CI_
+-
+ ACE_INLINE
+-IR::ConstantDef::ConstantDef (
++IR_ConstantDef::IR_ConstantDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -1149,185 +1041,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___VAR_CI_)
+-#define _TAO_IR_CONSTANTDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ConstantDef_var
++// Inline operations for class IR_ConstantDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ConstantDef_var::ConstantDef_var (void) // default constructor
+- : ptr_ (IR::ConstantDef::_nil ())
++IR_ConstantDef_var::IR_ConstantDef_var (void) // default constructor
++ : ptr_ (IR_ConstantDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ConstantDef_ptr
+-IR::ConstantDef_var::ptr (void) const
++ACE_INLINE IR_ConstantDef_ptr
++IR_ConstantDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConstantDef_var::ConstantDef_var (const IR::ConstantDef_var &p) // copy constructor
++IR_ConstantDef_var::IR_ConstantDef_var (const IR_ConstantDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ConstantDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ConstantDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ConstantDef_var::~ConstantDef_var (void) // destructor
++IR_ConstantDef_var::~IR_ConstantDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ConstantDef_var &
+-IR::ConstantDef_var::operator= (IR::ConstantDef_ptr p)
++ACE_INLINE IR_ConstantDef_var &
++IR_ConstantDef_var::operator= (IR_ConstantDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ConstantDef_var &
+-IR::ConstantDef_var::operator= (const IR::ConstantDef_var &p)
++ACE_INLINE IR_ConstantDef_var &
++IR_ConstantDef_var::operator= (const IR_ConstantDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ConstantDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ConstantDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ConstantDef_var::operator const IR::ConstantDef_ptr &() const // cast
++IR_ConstantDef_var::operator const IR_ConstantDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConstantDef_var::operator IR::ConstantDef_ptr &() // cast
++IR_ConstantDef_var::operator IR_ConstantDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConstantDef_ptr
+-IR::ConstantDef_var::operator-> (void) const
++ACE_INLINE IR_ConstantDef_ptr
++IR_ConstantDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConstantDef_ptr
+-IR::ConstantDef_var::in (void) const
++ACE_INLINE IR_ConstantDef_ptr
++IR_ConstantDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConstantDef_ptr &
+-IR::ConstantDef_var::inout (void)
++ACE_INLINE IR_ConstantDef_ptr &
++IR_ConstantDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConstantDef_ptr &
+-IR::ConstantDef_var::out (void)
++ACE_INLINE IR_ConstantDef_ptr &
++IR_ConstantDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ConstantDef::_nil ();
++ this->ptr_ = IR_ConstantDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConstantDef_ptr
+-IR::ConstantDef_var::_retn (void)
++ACE_INLINE IR_ConstantDef_ptr
++IR_ConstantDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ConstantDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ConstantDef::_nil ();
++ IR_ConstantDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ConstantDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSTANTDEF___OUT_CI_)
+-#define _TAO_IR_CONSTANTDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ConstantDef_out
++// Inline operations for class IR_ConstantDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ConstantDef_out::ConstantDef_out (IR::ConstantDef_ptr &p)
++IR_ConstantDef_out::IR_ConstantDef_out (IR_ConstantDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ConstantDef::_nil ();
++ this->ptr_ = IR_ConstantDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ConstantDef_out::ConstantDef_out (IR::ConstantDef_var &p) // constructor from _var
++IR_ConstantDef_out::IR_ConstantDef_out (IR_ConstantDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ConstantDef::_nil ();
++ this->ptr_ = IR_ConstantDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ConstantDef_out::ConstantDef_out (const IR::ConstantDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ConstantDef_out&,p).ptr_)
++IR_ConstantDef_out::IR_ConstantDef_out (const IR_ConstantDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ConstantDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ConstantDef_out &
+-IR::ConstantDef_out::operator= (const IR::ConstantDef_out &p)
++ACE_INLINE IR_ConstantDef_out &
++IR_ConstantDef_out::operator= (const IR_ConstantDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ConstantDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ConstantDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ConstantDef_out &
+-IR::ConstantDef_out::operator= (const IR::ConstantDef_var &p)
++ACE_INLINE IR_ConstantDef_out &
++IR_ConstantDef_out::operator= (const IR_ConstantDef_var &p)
+ {
+- this->ptr_ = IR::ConstantDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ConstantDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ConstantDef_out &
+-IR::ConstantDef_out::operator= (IR::ConstantDef_ptr p)
++ACE_INLINE IR_ConstantDef_out &
++IR_ConstantDef_out::operator= (IR_ConstantDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ConstantDef_out::operator IR::ConstantDef_ptr &() // cast
++IR_ConstantDef_out::operator IR_ConstantDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConstantDef_ptr &
+-IR::ConstantDef_out::ptr (void) // ptr
++ACE_INLINE IR_ConstantDef_ptr &
++IR_ConstantDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConstantDef_ptr
+-IR::ConstantDef_out::operator-> (void)
++ACE_INLINE IR_ConstantDef_ptr
++IR_ConstantDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE___CI_)
+-#define _TAO_IR_IDLTYPE___CI_
+-
+ ACE_INLINE
+-IR::IDLType::IDLType (
++IR_IDLType::IR_IDLType (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -1337,185 +1208,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE___VAR_CI_)
+-#define _TAO_IR_IDLTYPE___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::IDLType_var
++// Inline operations for class IR_IDLType_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::IDLType_var::IDLType_var (void) // default constructor
+- : ptr_ (IR::IDLType::_nil ())
++IR_IDLType_var::IR_IDLType_var (void) // default constructor
++ : ptr_ (IR_IDLType::_nil ())
+ {}
+
+-ACE_INLINE IR::IDLType_ptr
+-IR::IDLType_var::ptr (void) const
++ACE_INLINE IR_IDLType_ptr
++IR_IDLType_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::IDLType_var::IDLType_var (const IR::IDLType_var &p) // copy constructor
++IR_IDLType_var::IR_IDLType_var (const IR_IDLType_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (IDLType::_duplicate (p.ptr ()))
++ ptr_ (IR_IDLType::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::IDLType_var::~IDLType_var (void) // destructor
++IR_IDLType_var::~IR_IDLType_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::IDLType_var &
+-IR::IDLType_var::operator= (IR::IDLType_ptr p)
++ACE_INLINE IR_IDLType_var &
++IR_IDLType_var::operator= (IR_IDLType_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::IDLType_var &
+-IR::IDLType_var::operator= (const IR::IDLType_var &p)
++ACE_INLINE IR_IDLType_var &
++IR_IDLType_var::operator= (const IR_IDLType_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::IDLType::_duplicate (p.ptr ());
++ this->ptr_ = IR_IDLType::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::IDLType_var::operator const IR::IDLType_ptr &() const // cast
++IR_IDLType_var::operator const IR_IDLType_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::IDLType_var::operator IR::IDLType_ptr &() // cast
++IR_IDLType_var::operator IR_IDLType_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::IDLType_ptr
+-IR::IDLType_var::operator-> (void) const
++ACE_INLINE IR_IDLType_ptr
++IR_IDLType_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::IDLType_ptr
+-IR::IDLType_var::in (void) const
++ACE_INLINE IR_IDLType_ptr
++IR_IDLType_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::IDLType_ptr &
+-IR::IDLType_var::inout (void)
++ACE_INLINE IR_IDLType_ptr &
++IR_IDLType_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::IDLType_ptr &
+-IR::IDLType_var::out (void)
++ACE_INLINE IR_IDLType_ptr &
++IR_IDLType_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::IDLType::_nil ();
++ this->ptr_ = IR_IDLType::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::IDLType_ptr
+-IR::IDLType_var::_retn (void)
++ACE_INLINE IR_IDLType_ptr
++IR_IDLType_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::IDLType_ptr val = this->ptr_;
+- this->ptr_ = IR::IDLType::_nil ();
++ IR_IDLType_ptr val = this->ptr_;
++ this->ptr_ = IR_IDLType::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_IDLTYPE___OUT_CI_)
+-#define _TAO_IR_IDLTYPE___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::IDLType_out
++// Inline operations for class IR_IDLType_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::IDLType_out::IDLType_out (IR::IDLType_ptr &p)
++IR_IDLType_out::IR_IDLType_out (IR_IDLType_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::IDLType::_nil ();
++ this->ptr_ = IR_IDLType::_nil ();
+ }
+
+ ACE_INLINE
+-IR::IDLType_out::IDLType_out (IR::IDLType_var &p) // constructor from _var
++IR_IDLType_out::IR_IDLType_out (IR_IDLType_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::IDLType::_nil ();
++ this->ptr_ = IR_IDLType::_nil ();
+ }
+
+ ACE_INLINE
+-IR::IDLType_out::IDLType_out (const IR::IDLType_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::IDLType_out&,p).ptr_)
++IR_IDLType_out::IR_IDLType_out (const IR_IDLType_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_IDLType_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::IDLType_out &
+-IR::IDLType_out::operator= (const IR::IDLType_out &p)
++ACE_INLINE IR_IDLType_out &
++IR_IDLType_out::operator= (const IR_IDLType_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::IDLType_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_IDLType_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::IDLType_out &
+-IR::IDLType_out::operator= (const IR::IDLType_var &p)
++ACE_INLINE IR_IDLType_out &
++IR_IDLType_out::operator= (const IR_IDLType_var &p)
+ {
+- this->ptr_ = IR::IDLType::_duplicate (p.ptr ());
++ this->ptr_ = IR_IDLType::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::IDLType_out &
+-IR::IDLType_out::operator= (IR::IDLType_ptr p)
++ACE_INLINE IR_IDLType_out &
++IR_IDLType_out::operator= (IR_IDLType_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::IDLType_out::operator IR::IDLType_ptr &() // cast
++IR_IDLType_out::operator IR_IDLType_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::IDLType_ptr &
+-IR::IDLType_out::ptr (void) // ptr
++ACE_INLINE IR_IDLType_ptr &
++IR_IDLType_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::IDLType_ptr
+-IR::IDLType_out::operator-> (void)
++ACE_INLINE IR_IDLType_ptr
++IR_IDLType_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF___CI_)
+-#define _TAO_IR_STRUCTDEF___CI_
+-
+ ACE_INLINE
+-IR::StructDef::StructDef (
++IR_StructDef::IR_StructDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -1525,185 +1375,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF___VAR_CI_)
+-#define _TAO_IR_STRUCTDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::StructDef_var
++// Inline operations for class IR_StructDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::StructDef_var::StructDef_var (void) // default constructor
+- : ptr_ (IR::StructDef::_nil ())
++IR_StructDef_var::IR_StructDef_var (void) // default constructor
++ : ptr_ (IR_StructDef::_nil ())
+ {}
+
+-ACE_INLINE IR::StructDef_ptr
+-IR::StructDef_var::ptr (void) const
++ACE_INLINE IR_StructDef_ptr
++IR_StructDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StructDef_var::StructDef_var (const IR::StructDef_var &p) // copy constructor
++IR_StructDef_var::IR_StructDef_var (const IR_StructDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (StructDef::_duplicate (p.ptr ()))
++ ptr_ (IR_StructDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::StructDef_var::~StructDef_var (void) // destructor
++IR_StructDef_var::~IR_StructDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::StructDef_var &
+-IR::StructDef_var::operator= (IR::StructDef_ptr p)
++ACE_INLINE IR_StructDef_var &
++IR_StructDef_var::operator= (IR_StructDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::StructDef_var &
+-IR::StructDef_var::operator= (const IR::StructDef_var &p)
++ACE_INLINE IR_StructDef_var &
++IR_StructDef_var::operator= (const IR_StructDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::StructDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_StructDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::StructDef_var::operator const IR::StructDef_ptr &() const // cast
++IR_StructDef_var::operator const IR_StructDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StructDef_var::operator IR::StructDef_ptr &() // cast
++IR_StructDef_var::operator IR_StructDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructDef_ptr
+-IR::StructDef_var::operator-> (void) const
++ACE_INLINE IR_StructDef_ptr
++IR_StructDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructDef_ptr
+-IR::StructDef_var::in (void) const
++ACE_INLINE IR_StructDef_ptr
++IR_StructDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructDef_ptr &
+-IR::StructDef_var::inout (void)
++ACE_INLINE IR_StructDef_ptr &
++IR_StructDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructDef_ptr &
+-IR::StructDef_var::out (void)
++ACE_INLINE IR_StructDef_ptr &
++IR_StructDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::StructDef::_nil ();
++ this->ptr_ = IR_StructDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructDef_ptr
+-IR::StructDef_var::_retn (void)
++ACE_INLINE IR_StructDef_ptr
++IR_StructDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::StructDef_ptr val = this->ptr_;
+- this->ptr_ = IR::StructDef::_nil ();
++ IR_StructDef_ptr val = this->ptr_;
++ this->ptr_ = IR_StructDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRUCTDEF___OUT_CI_)
+-#define _TAO_IR_STRUCTDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::StructDef_out
++// Inline operations for class IR_StructDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::StructDef_out::StructDef_out (IR::StructDef_ptr &p)
++IR_StructDef_out::IR_StructDef_out (IR_StructDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::StructDef::_nil ();
++ this->ptr_ = IR_StructDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::StructDef_out::StructDef_out (IR::StructDef_var &p) // constructor from _var
++IR_StructDef_out::IR_StructDef_out (IR_StructDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::StructDef::_nil ();
++ this->ptr_ = IR_StructDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::StructDef_out::StructDef_out (const IR::StructDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::StructDef_out&,p).ptr_)
++IR_StructDef_out::IR_StructDef_out (const IR_StructDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_StructDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::StructDef_out &
+-IR::StructDef_out::operator= (const IR::StructDef_out &p)
++ACE_INLINE IR_StructDef_out &
++IR_StructDef_out::operator= (const IR_StructDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::StructDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_StructDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::StructDef_out &
+-IR::StructDef_out::operator= (const IR::StructDef_var &p)
++ACE_INLINE IR_StructDef_out &
++IR_StructDef_out::operator= (const IR_StructDef_var &p)
+ {
+- this->ptr_ = IR::StructDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_StructDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::StructDef_out &
+-IR::StructDef_out::operator= (IR::StructDef_ptr p)
++ACE_INLINE IR_StructDef_out &
++IR_StructDef_out::operator= (IR_StructDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::StructDef_out::operator IR::StructDef_ptr &() // cast
++IR_StructDef_out::operator IR_StructDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructDef_ptr &
+-IR::StructDef_out::ptr (void) // ptr
++ACE_INLINE IR_StructDef_ptr &
++IR_StructDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructDef_ptr
+-IR::StructDef_out::operator-> (void)
++ACE_INLINE IR_StructDef_ptr
++IR_StructDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF___CI_)
+-#define _TAO_IR_UNIONDEF___CI_
+-
+ ACE_INLINE
+-IR::UnionDef::UnionDef (
++IR_UnionDef::IR_UnionDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -1713,185 +1542,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF___VAR_CI_)
+-#define _TAO_IR_UNIONDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::UnionDef_var
++// Inline operations for class IR_UnionDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UnionDef_var::UnionDef_var (void) // default constructor
+- : ptr_ (IR::UnionDef::_nil ())
++IR_UnionDef_var::IR_UnionDef_var (void) // default constructor
++ : ptr_ (IR_UnionDef::_nil ())
+ {}
+
+-ACE_INLINE IR::UnionDef_ptr
+-IR::UnionDef_var::ptr (void) const
++ACE_INLINE IR_UnionDef_ptr
++IR_UnionDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UnionDef_var::UnionDef_var (const IR::UnionDef_var &p) // copy constructor
++IR_UnionDef_var::IR_UnionDef_var (const IR_UnionDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (UnionDef::_duplicate (p.ptr ()))
++ ptr_ (IR_UnionDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::UnionDef_var::~UnionDef_var (void) // destructor
++IR_UnionDef_var::~IR_UnionDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::UnionDef_var &
+-IR::UnionDef_var::operator= (IR::UnionDef_ptr p)
++ACE_INLINE IR_UnionDef_var &
++IR_UnionDef_var::operator= (IR_UnionDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::UnionDef_var &
+-IR::UnionDef_var::operator= (const IR::UnionDef_var &p)
++ACE_INLINE IR_UnionDef_var &
++IR_UnionDef_var::operator= (const IR_UnionDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::UnionDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_UnionDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UnionDef_var::operator const IR::UnionDef_ptr &() const // cast
++IR_UnionDef_var::operator const IR_UnionDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UnionDef_var::operator IR::UnionDef_ptr &() // cast
++IR_UnionDef_var::operator IR_UnionDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionDef_ptr
+-IR::UnionDef_var::operator-> (void) const
++ACE_INLINE IR_UnionDef_ptr
++IR_UnionDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionDef_ptr
+-IR::UnionDef_var::in (void) const
++ACE_INLINE IR_UnionDef_ptr
++IR_UnionDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionDef_ptr &
+-IR::UnionDef_var::inout (void)
++ACE_INLINE IR_UnionDef_ptr &
++IR_UnionDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionDef_ptr &
+-IR::UnionDef_var::out (void)
++ACE_INLINE IR_UnionDef_ptr &
++IR_UnionDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::UnionDef::_nil ();
++ this->ptr_ = IR_UnionDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionDef_ptr
+-IR::UnionDef_var::_retn (void)
++ACE_INLINE IR_UnionDef_ptr
++IR_UnionDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::UnionDef_ptr val = this->ptr_;
+- this->ptr_ = IR::UnionDef::_nil ();
++ IR_UnionDef_ptr val = this->ptr_;
++ this->ptr_ = IR_UnionDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_UNIONDEF___OUT_CI_)
+-#define _TAO_IR_UNIONDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::UnionDef_out
++// Inline operations for class IR_UnionDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UnionDef_out::UnionDef_out (IR::UnionDef_ptr &p)
++IR_UnionDef_out::IR_UnionDef_out (IR_UnionDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::UnionDef::_nil ();
++ this->ptr_ = IR_UnionDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::UnionDef_out::UnionDef_out (IR::UnionDef_var &p) // constructor from _var
++IR_UnionDef_out::IR_UnionDef_out (IR_UnionDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::UnionDef::_nil ();
++ this->ptr_ = IR_UnionDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::UnionDef_out::UnionDef_out (const IR::UnionDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::UnionDef_out&,p).ptr_)
++IR_UnionDef_out::IR_UnionDef_out (const IR_UnionDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_UnionDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::UnionDef_out &
+-IR::UnionDef_out::operator= (const IR::UnionDef_out &p)
++ACE_INLINE IR_UnionDef_out &
++IR_UnionDef_out::operator= (const IR_UnionDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::UnionDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_UnionDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::UnionDef_out &
+-IR::UnionDef_out::operator= (const IR::UnionDef_var &p)
++ACE_INLINE IR_UnionDef_out &
++IR_UnionDef_out::operator= (const IR_UnionDef_var &p)
+ {
+- this->ptr_ = IR::UnionDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_UnionDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::UnionDef_out &
+-IR::UnionDef_out::operator= (IR::UnionDef_ptr p)
++ACE_INLINE IR_UnionDef_out &
++IR_UnionDef_out::operator= (IR_UnionDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UnionDef_out::operator IR::UnionDef_ptr &() // cast
++IR_UnionDef_out::operator IR_UnionDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionDef_ptr &
+-IR::UnionDef_out::ptr (void) // ptr
++ACE_INLINE IR_UnionDef_ptr &
++IR_UnionDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionDef_ptr
+-IR::UnionDef_out::operator-> (void)
++ACE_INLINE IR_UnionDef_ptr
++IR_UnionDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF___CI_)
+-#define _TAO_IR_ENUMDEF___CI_
+-
+ ACE_INLINE
+-IR::EnumDef::EnumDef (
++IR_EnumDef::IR_EnumDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -1901,185 +1709,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF___VAR_CI_)
+-#define _TAO_IR_ENUMDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::EnumDef_var
++// Inline operations for class IR_EnumDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EnumDef_var::EnumDef_var (void) // default constructor
+- : ptr_ (IR::EnumDef::_nil ())
++IR_EnumDef_var::IR_EnumDef_var (void) // default constructor
++ : ptr_ (IR_EnumDef::_nil ())
+ {}
+
+-ACE_INLINE IR::EnumDef_ptr
+-IR::EnumDef_var::ptr (void) const
++ACE_INLINE IR_EnumDef_ptr
++IR_EnumDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EnumDef_var::EnumDef_var (const IR::EnumDef_var &p) // copy constructor
++IR_EnumDef_var::IR_EnumDef_var (const IR_EnumDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (EnumDef::_duplicate (p.ptr ()))
++ ptr_ (IR_EnumDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::EnumDef_var::~EnumDef_var (void) // destructor
++IR_EnumDef_var::~IR_EnumDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::EnumDef_var &
+-IR::EnumDef_var::operator= (IR::EnumDef_ptr p)
++ACE_INLINE IR_EnumDef_var &
++IR_EnumDef_var::operator= (IR_EnumDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::EnumDef_var &
+-IR::EnumDef_var::operator= (const IR::EnumDef_var &p)
++ACE_INLINE IR_EnumDef_var &
++IR_EnumDef_var::operator= (const IR_EnumDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EnumDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_EnumDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EnumDef_var::operator const IR::EnumDef_ptr &() const // cast
++IR_EnumDef_var::operator const IR_EnumDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EnumDef_var::operator IR::EnumDef_ptr &() // cast
++IR_EnumDef_var::operator IR_EnumDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EnumDef_ptr
+-IR::EnumDef_var::operator-> (void) const
++ACE_INLINE IR_EnumDef_ptr
++IR_EnumDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EnumDef_ptr
+-IR::EnumDef_var::in (void) const
++ACE_INLINE IR_EnumDef_ptr
++IR_EnumDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EnumDef_ptr &
+-IR::EnumDef_var::inout (void)
++ACE_INLINE IR_EnumDef_ptr &
++IR_EnumDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EnumDef_ptr &
+-IR::EnumDef_var::out (void)
++ACE_INLINE IR_EnumDef_ptr &
++IR_EnumDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EnumDef::_nil ();
++ this->ptr_ = IR_EnumDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EnumDef_ptr
+-IR::EnumDef_var::_retn (void)
++ACE_INLINE IR_EnumDef_ptr
++IR_EnumDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::EnumDef_ptr val = this->ptr_;
+- this->ptr_ = IR::EnumDef::_nil ();
++ IR_EnumDef_ptr val = this->ptr_;
++ this->ptr_ = IR_EnumDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMDEF___OUT_CI_)
+-#define _TAO_IR_ENUMDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::EnumDef_out
++// Inline operations for class IR_EnumDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EnumDef_out::EnumDef_out (IR::EnumDef_ptr &p)
++IR_EnumDef_out::IR_EnumDef_out (IR_EnumDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::EnumDef::_nil ();
++ this->ptr_ = IR_EnumDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::EnumDef_out::EnumDef_out (IR::EnumDef_var &p) // constructor from _var
++IR_EnumDef_out::IR_EnumDef_out (IR_EnumDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EnumDef::_nil ();
++ this->ptr_ = IR_EnumDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::EnumDef_out::EnumDef_out (const IR::EnumDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::EnumDef_out&,p).ptr_)
++IR_EnumDef_out::IR_EnumDef_out (const IR_EnumDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_EnumDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::EnumDef_out &
+-IR::EnumDef_out::operator= (const IR::EnumDef_out &p)
++ACE_INLINE IR_EnumDef_out &
++IR_EnumDef_out::operator= (const IR_EnumDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::EnumDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_EnumDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::EnumDef_out &
+-IR::EnumDef_out::operator= (const IR::EnumDef_var &p)
++ACE_INLINE IR_EnumDef_out &
++IR_EnumDef_out::operator= (const IR_EnumDef_var &p)
+ {
+- this->ptr_ = IR::EnumDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_EnumDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::EnumDef_out &
+-IR::EnumDef_out::operator= (IR::EnumDef_ptr p)
++ACE_INLINE IR_EnumDef_out &
++IR_EnumDef_out::operator= (IR_EnumDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EnumDef_out::operator IR::EnumDef_ptr &() // cast
++IR_EnumDef_out::operator IR_EnumDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EnumDef_ptr &
+-IR::EnumDef_out::ptr (void) // ptr
++ACE_INLINE IR_EnumDef_ptr &
++IR_EnumDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EnumDef_ptr
+-IR::EnumDef_out::operator-> (void)
++ACE_INLINE IR_EnumDef_ptr
++IR_EnumDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF___CI_)
+-#define _TAO_IR_ALIASDEF___CI_
+-
+ ACE_INLINE
+-IR::AliasDef::AliasDef (
++IR_AliasDef::IR_AliasDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -2089,185 +1876,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF___VAR_CI_)
+-#define _TAO_IR_ALIASDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::AliasDef_var
++// Inline operations for class IR_AliasDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::AliasDef_var::AliasDef_var (void) // default constructor
+- : ptr_ (IR::AliasDef::_nil ())
++IR_AliasDef_var::IR_AliasDef_var (void) // default constructor
++ : ptr_ (IR_AliasDef::_nil ())
+ {}
+
+-ACE_INLINE IR::AliasDef_ptr
+-IR::AliasDef_var::ptr (void) const
++ACE_INLINE IR_AliasDef_ptr
++IR_AliasDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AliasDef_var::AliasDef_var (const IR::AliasDef_var &p) // copy constructor
++IR_AliasDef_var::IR_AliasDef_var (const IR_AliasDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (AliasDef::_duplicate (p.ptr ()))
++ ptr_ (IR_AliasDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::AliasDef_var::~AliasDef_var (void) // destructor
++IR_AliasDef_var::~IR_AliasDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::AliasDef_var &
+-IR::AliasDef_var::operator= (IR::AliasDef_ptr p)
++ACE_INLINE IR_AliasDef_var &
++IR_AliasDef_var::operator= (IR_AliasDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::AliasDef_var &
+-IR::AliasDef_var::operator= (const IR::AliasDef_var &p)
++ACE_INLINE IR_AliasDef_var &
++IR_AliasDef_var::operator= (const IR_AliasDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::AliasDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_AliasDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::AliasDef_var::operator const IR::AliasDef_ptr &() const // cast
++IR_AliasDef_var::operator const IR_AliasDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AliasDef_var::operator IR::AliasDef_ptr &() // cast
++IR_AliasDef_var::operator IR_AliasDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AliasDef_ptr
+-IR::AliasDef_var::operator-> (void) const
++ACE_INLINE IR_AliasDef_ptr
++IR_AliasDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AliasDef_ptr
+-IR::AliasDef_var::in (void) const
++ACE_INLINE IR_AliasDef_ptr
++IR_AliasDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AliasDef_ptr &
+-IR::AliasDef_var::inout (void)
++ACE_INLINE IR_AliasDef_ptr &
++IR_AliasDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AliasDef_ptr &
+-IR::AliasDef_var::out (void)
++ACE_INLINE IR_AliasDef_ptr &
++IR_AliasDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::AliasDef::_nil ();
++ this->ptr_ = IR_AliasDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AliasDef_ptr
+-IR::AliasDef_var::_retn (void)
++ACE_INLINE IR_AliasDef_ptr
++IR_AliasDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::AliasDef_ptr val = this->ptr_;
+- this->ptr_ = IR::AliasDef::_nil ();
++ IR_AliasDef_ptr val = this->ptr_;
++ this->ptr_ = IR_AliasDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ALIASDEF___OUT_CI_)
+-#define _TAO_IR_ALIASDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::AliasDef_out
++// Inline operations for class IR_AliasDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::AliasDef_out::AliasDef_out (IR::AliasDef_ptr &p)
++IR_AliasDef_out::IR_AliasDef_out (IR_AliasDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::AliasDef::_nil ();
++ this->ptr_ = IR_AliasDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::AliasDef_out::AliasDef_out (IR::AliasDef_var &p) // constructor from _var
++IR_AliasDef_out::IR_AliasDef_out (IR_AliasDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::AliasDef::_nil ();
++ this->ptr_ = IR_AliasDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::AliasDef_out::AliasDef_out (const IR::AliasDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::AliasDef_out&,p).ptr_)
++IR_AliasDef_out::IR_AliasDef_out (const IR_AliasDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_AliasDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::AliasDef_out &
+-IR::AliasDef_out::operator= (const IR::AliasDef_out &p)
++ACE_INLINE IR_AliasDef_out &
++IR_AliasDef_out::operator= (const IR_AliasDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::AliasDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_AliasDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::AliasDef_out &
+-IR::AliasDef_out::operator= (const IR::AliasDef_var &p)
++ACE_INLINE IR_AliasDef_out &
++IR_AliasDef_out::operator= (const IR_AliasDef_var &p)
+ {
+- this->ptr_ = IR::AliasDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_AliasDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::AliasDef_out &
+-IR::AliasDef_out::operator= (IR::AliasDef_ptr p)
++ACE_INLINE IR_AliasDef_out &
++IR_AliasDef_out::operator= (IR_AliasDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::AliasDef_out::operator IR::AliasDef_ptr &() // cast
++IR_AliasDef_out::operator IR_AliasDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AliasDef_ptr &
+-IR::AliasDef_out::ptr (void) // ptr
++ACE_INLINE IR_AliasDef_ptr &
++IR_AliasDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AliasDef_ptr
+-IR::AliasDef_out::operator-> (void)
++ACE_INLINE IR_AliasDef_ptr
++IR_AliasDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___CI_)
+-#define _TAO_IR_INTERFACEDEF___CI_
+-
+ ACE_INLINE
+-IR::InterfaceDef::InterfaceDef (
++IR_InterfaceDef::IR_InterfaceDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -2277,185 +2043,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___VAR_CI_)
+-#define _TAO_IR_INTERFACEDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::InterfaceDef_var
++// Inline operations for class IR_InterfaceDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::InterfaceDef_var::InterfaceDef_var (void) // default constructor
+- : ptr_ (IR::InterfaceDef::_nil ())
++IR_InterfaceDef_var::IR_InterfaceDef_var (void) // default constructor
++ : ptr_ (IR_InterfaceDef::_nil ())
+ {}
+
+-ACE_INLINE IR::InterfaceDef_ptr
+-IR::InterfaceDef_var::ptr (void) const
++ACE_INLINE IR_InterfaceDef_ptr
++IR_InterfaceDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDef_var::InterfaceDef_var (const IR::InterfaceDef_var &p) // copy constructor
++IR_InterfaceDef_var::IR_InterfaceDef_var (const IR_InterfaceDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (InterfaceDef::_duplicate (p.ptr ()))
++ ptr_ (IR_InterfaceDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::InterfaceDef_var::~InterfaceDef_var (void) // destructor
++IR_InterfaceDef_var::~IR_InterfaceDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::InterfaceDef_var &
+-IR::InterfaceDef_var::operator= (IR::InterfaceDef_ptr p)
++ACE_INLINE IR_InterfaceDef_var &
++IR_InterfaceDef_var::operator= (IR_InterfaceDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::InterfaceDef_var &
+-IR::InterfaceDef_var::operator= (const IR::InterfaceDef_var &p)
++ACE_INLINE IR_InterfaceDef_var &
++IR_InterfaceDef_var::operator= (const IR_InterfaceDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::InterfaceDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_InterfaceDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDef_var::operator const IR::InterfaceDef_ptr &() const // cast
++IR_InterfaceDef_var::operator const IR_InterfaceDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDef_var::operator IR::InterfaceDef_ptr &() // cast
++IR_InterfaceDef_var::operator IR_InterfaceDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDef_ptr
+-IR::InterfaceDef_var::operator-> (void) const
++ACE_INLINE IR_InterfaceDef_ptr
++IR_InterfaceDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDef_ptr
+-IR::InterfaceDef_var::in (void) const
++ACE_INLINE IR_InterfaceDef_ptr
++IR_InterfaceDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDef_ptr &
+-IR::InterfaceDef_var::inout (void)
++ACE_INLINE IR_InterfaceDef_ptr &
++IR_InterfaceDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDef_ptr &
+-IR::InterfaceDef_var::out (void)
++ACE_INLINE IR_InterfaceDef_ptr &
++IR_InterfaceDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::InterfaceDef::_nil ();
++ this->ptr_ = IR_InterfaceDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDef_ptr
+-IR::InterfaceDef_var::_retn (void)
++ACE_INLINE IR_InterfaceDef_ptr
++IR_InterfaceDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::InterfaceDef_ptr val = this->ptr_;
+- this->ptr_ = IR::InterfaceDef::_nil ();
++ IR_InterfaceDef_ptr val = this->ptr_;
++ this->ptr_ = IR_InterfaceDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_INTERFACEDEF___OUT_CI_)
+-#define _TAO_IR_INTERFACEDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::InterfaceDef_out
++// Inline operations for class IR_InterfaceDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::InterfaceDef_out::InterfaceDef_out (IR::InterfaceDef_ptr &p)
++IR_InterfaceDef_out::IR_InterfaceDef_out (IR_InterfaceDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::InterfaceDef::_nil ();
++ this->ptr_ = IR_InterfaceDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::InterfaceDef_out::InterfaceDef_out (IR::InterfaceDef_var &p) // constructor from _var
++IR_InterfaceDef_out::IR_InterfaceDef_out (IR_InterfaceDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::InterfaceDef::_nil ();
++ this->ptr_ = IR_InterfaceDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::InterfaceDef_out::InterfaceDef_out (const IR::InterfaceDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::InterfaceDef_out&,p).ptr_)
++IR_InterfaceDef_out::IR_InterfaceDef_out (const IR_InterfaceDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_InterfaceDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::InterfaceDef_out &
+-IR::InterfaceDef_out::operator= (const IR::InterfaceDef_out &p)
++ACE_INLINE IR_InterfaceDef_out &
++IR_InterfaceDef_out::operator= (const IR_InterfaceDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::InterfaceDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_InterfaceDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::InterfaceDef_out &
+-IR::InterfaceDef_out::operator= (const IR::InterfaceDef_var &p)
++ACE_INLINE IR_InterfaceDef_out &
++IR_InterfaceDef_out::operator= (const IR_InterfaceDef_var &p)
+ {
+- this->ptr_ = IR::InterfaceDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_InterfaceDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::InterfaceDef_out &
+-IR::InterfaceDef_out::operator= (IR::InterfaceDef_ptr p)
++ACE_INLINE IR_InterfaceDef_out &
++IR_InterfaceDef_out::operator= (IR_InterfaceDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDef_out::operator IR::InterfaceDef_ptr &() // cast
++IR_InterfaceDef_out::operator IR_InterfaceDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDef_ptr &
+-IR::InterfaceDef_out::ptr (void) // ptr
++ACE_INLINE IR_InterfaceDef_ptr &
++IR_InterfaceDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDef_ptr
+-IR::InterfaceDef_out::operator-> (void)
++ACE_INLINE IR_InterfaceDef_ptr
++IR_InterfaceDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___CI_)
+-#define _TAO_IR_EXCEPTIONDEF___CI_
+-
+ ACE_INLINE
+-IR::ExceptionDef::ExceptionDef (
++IR_ExceptionDef::IR_ExceptionDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -2465,185 +2210,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___VAR_CI_)
+-#define _TAO_IR_EXCEPTIONDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ExceptionDef_var
++// Inline operations for class IR_ExceptionDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ExceptionDef_var::ExceptionDef_var (void) // default constructor
+- : ptr_ (IR::ExceptionDef::_nil ())
++IR_ExceptionDef_var::IR_ExceptionDef_var (void) // default constructor
++ : ptr_ (IR_ExceptionDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ExceptionDef_ptr
+-IR::ExceptionDef_var::ptr (void) const
++ACE_INLINE IR_ExceptionDef_ptr
++IR_ExceptionDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDef_var::ExceptionDef_var (const IR::ExceptionDef_var &p) // copy constructor
++IR_ExceptionDef_var::IR_ExceptionDef_var (const IR_ExceptionDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ExceptionDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ExceptionDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ExceptionDef_var::~ExceptionDef_var (void) // destructor
++IR_ExceptionDef_var::~IR_ExceptionDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ExceptionDef_var &
+-IR::ExceptionDef_var::operator= (IR::ExceptionDef_ptr p)
++ACE_INLINE IR_ExceptionDef_var &
++IR_ExceptionDef_var::operator= (IR_ExceptionDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ExceptionDef_var &
+-IR::ExceptionDef_var::operator= (const IR::ExceptionDef_var &p)
++ACE_INLINE IR_ExceptionDef_var &
++IR_ExceptionDef_var::operator= (const IR_ExceptionDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ExceptionDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ExceptionDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDef_var::operator const IR::ExceptionDef_ptr &() const // cast
++IR_ExceptionDef_var::operator const IR_ExceptionDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDef_var::operator IR::ExceptionDef_ptr &() // cast
++IR_ExceptionDef_var::operator IR_ExceptionDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDef_ptr
+-IR::ExceptionDef_var::operator-> (void) const
++ACE_INLINE IR_ExceptionDef_ptr
++IR_ExceptionDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDef_ptr
+-IR::ExceptionDef_var::in (void) const
++ACE_INLINE IR_ExceptionDef_ptr
++IR_ExceptionDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDef_ptr &
+-IR::ExceptionDef_var::inout (void)
++ACE_INLINE IR_ExceptionDef_ptr &
++IR_ExceptionDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDef_ptr &
+-IR::ExceptionDef_var::out (void)
++ACE_INLINE IR_ExceptionDef_ptr &
++IR_ExceptionDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ExceptionDef::_nil ();
++ this->ptr_ = IR_ExceptionDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDef_ptr
+-IR::ExceptionDef_var::_retn (void)
++ACE_INLINE IR_ExceptionDef_ptr
++IR_ExceptionDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ExceptionDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ExceptionDef::_nil ();
++ IR_ExceptionDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ExceptionDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EXCEPTIONDEF___OUT_CI_)
+-#define _TAO_IR_EXCEPTIONDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ExceptionDef_out
++// Inline operations for class IR_ExceptionDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ExceptionDef_out::ExceptionDef_out (IR::ExceptionDef_ptr &p)
++IR_ExceptionDef_out::IR_ExceptionDef_out (IR_ExceptionDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ExceptionDef::_nil ();
++ this->ptr_ = IR_ExceptionDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ExceptionDef_out::ExceptionDef_out (IR::ExceptionDef_var &p) // constructor from _var
++IR_ExceptionDef_out::IR_ExceptionDef_out (IR_ExceptionDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ExceptionDef::_nil ();
++ this->ptr_ = IR_ExceptionDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ExceptionDef_out::ExceptionDef_out (const IR::ExceptionDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ExceptionDef_out&,p).ptr_)
++IR_ExceptionDef_out::IR_ExceptionDef_out (const IR_ExceptionDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ExceptionDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ExceptionDef_out &
+-IR::ExceptionDef_out::operator= (const IR::ExceptionDef_out &p)
++ACE_INLINE IR_ExceptionDef_out &
++IR_ExceptionDef_out::operator= (const IR_ExceptionDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ExceptionDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ExceptionDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ExceptionDef_out &
+-IR::ExceptionDef_out::operator= (const IR::ExceptionDef_var &p)
++ACE_INLINE IR_ExceptionDef_out &
++IR_ExceptionDef_out::operator= (const IR_ExceptionDef_var &p)
+ {
+- this->ptr_ = IR::ExceptionDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ExceptionDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ExceptionDef_out &
+-IR::ExceptionDef_out::operator= (IR::ExceptionDef_ptr p)
++ACE_INLINE IR_ExceptionDef_out &
++IR_ExceptionDef_out::operator= (IR_ExceptionDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDef_out::operator IR::ExceptionDef_ptr &() // cast
++IR_ExceptionDef_out::operator IR_ExceptionDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDef_ptr &
+-IR::ExceptionDef_out::ptr (void) // ptr
++ACE_INLINE IR_ExceptionDef_ptr &
++IR_ExceptionDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDef_ptr
+-IR::ExceptionDef_out::operator-> (void)
++ACE_INLINE IR_ExceptionDef_ptr
++IR_ExceptionDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF___CI_)
+-#define _TAO_IR_NATIVEDEF___CI_
+-
+ ACE_INLINE
+-IR::NativeDef::NativeDef (
++IR_NativeDef::IR_NativeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -2653,200 +2377,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF___VAR_CI_)
+-#define _TAO_IR_NATIVEDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::NativeDef_var
++// Inline operations for class IR_NativeDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::NativeDef_var::NativeDef_var (void) // default constructor
+- : ptr_ (IR::NativeDef::_nil ())
++IR_NativeDef_var::IR_NativeDef_var (void) // default constructor
++ : ptr_ (IR_NativeDef::_nil ())
+ {}
+
+-ACE_INLINE IR::NativeDef_ptr
+-IR::NativeDef_var::ptr (void) const
++ACE_INLINE IR_NativeDef_ptr
++IR_NativeDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::NativeDef_var::NativeDef_var (const IR::NativeDef_var &p) // copy constructor
++IR_NativeDef_var::IR_NativeDef_var (const IR_NativeDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (NativeDef::_duplicate (p.ptr ()))
++ ptr_ (IR_NativeDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::NativeDef_var::~NativeDef_var (void) // destructor
++IR_NativeDef_var::~IR_NativeDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::NativeDef_var &
+-IR::NativeDef_var::operator= (IR::NativeDef_ptr p)
++ACE_INLINE IR_NativeDef_var &
++IR_NativeDef_var::operator= (IR_NativeDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::NativeDef_var &
+-IR::NativeDef_var::operator= (const IR::NativeDef_var &p)
++ACE_INLINE IR_NativeDef_var &
++IR_NativeDef_var::operator= (const IR_NativeDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::NativeDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_NativeDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::NativeDef_var::operator const IR::NativeDef_ptr &() const // cast
++IR_NativeDef_var::operator const IR_NativeDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::NativeDef_var::operator IR::NativeDef_ptr &() // cast
++IR_NativeDef_var::operator IR_NativeDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::NativeDef_ptr
+-IR::NativeDef_var::operator-> (void) const
++ACE_INLINE IR_NativeDef_ptr
++IR_NativeDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::NativeDef_ptr
+-IR::NativeDef_var::in (void) const
++ACE_INLINE IR_NativeDef_ptr
++IR_NativeDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::NativeDef_ptr &
+-IR::NativeDef_var::inout (void)
++ACE_INLINE IR_NativeDef_ptr &
++IR_NativeDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::NativeDef_ptr &
+-IR::NativeDef_var::out (void)
++ACE_INLINE IR_NativeDef_ptr &
++IR_NativeDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::NativeDef::_nil ();
++ this->ptr_ = IR_NativeDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::NativeDef_ptr
+-IR::NativeDef_var::_retn (void)
++ACE_INLINE IR_NativeDef_ptr
++IR_NativeDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::NativeDef_ptr val = this->ptr_;
+- this->ptr_ = IR::NativeDef::_nil ();
++ IR_NativeDef_ptr val = this->ptr_;
++ this->ptr_ = IR_NativeDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_NATIVEDEF___OUT_CI_)
+-#define _TAO_IR_NATIVEDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::NativeDef_out
++// Inline operations for class IR_NativeDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::NativeDef_out::NativeDef_out (IR::NativeDef_ptr &p)
++IR_NativeDef_out::IR_NativeDef_out (IR_NativeDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::NativeDef::_nil ();
++ this->ptr_ = IR_NativeDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::NativeDef_out::NativeDef_out (IR::NativeDef_var &p) // constructor from _var
++IR_NativeDef_out::IR_NativeDef_out (IR_NativeDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::NativeDef::_nil ();
++ this->ptr_ = IR_NativeDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::NativeDef_out::NativeDef_out (const IR::NativeDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::NativeDef_out&,p).ptr_)
++IR_NativeDef_out::IR_NativeDef_out (const IR_NativeDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_NativeDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::NativeDef_out &
+-IR::NativeDef_out::operator= (const IR::NativeDef_out &p)
++ACE_INLINE IR_NativeDef_out &
++IR_NativeDef_out::operator= (const IR_NativeDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::NativeDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_NativeDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::NativeDef_out &
+-IR::NativeDef_out::operator= (const IR::NativeDef_var &p)
++ACE_INLINE IR_NativeDef_out &
++IR_NativeDef_out::operator= (const IR_NativeDef_var &p)
+ {
+- this->ptr_ = IR::NativeDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_NativeDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::NativeDef_out &
+-IR::NativeDef_out::operator= (IR::NativeDef_ptr p)
++ACE_INLINE IR_NativeDef_out &
++IR_NativeDef_out::operator= (IR_NativeDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::NativeDef_out::operator IR::NativeDef_ptr &() // cast
++IR_NativeDef_out::operator IR_NativeDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::NativeDef_ptr &
+-IR::NativeDef_out::ptr (void) // ptr
++ACE_INLINE IR_NativeDef_ptr &
++IR_NativeDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::NativeDef_ptr
+-IR::NativeDef_out::operator-> (void)
++ACE_INLINE IR_NativeDef_ptr
++IR_NativeDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_INTERFACEDEFSEQ_CI_
+-
+- ACE_INLINE IR::InterfaceDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_InterfaceDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::InterfaceDef **buf = 0;
++ IR_InterfaceDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::InterfaceDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_InterfaceDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::InterfaceDef::_nil ();
++ buf[i] = IR_InterfaceDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (IR::InterfaceDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::freebuf (IR_InterfaceDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -2854,36 +2557,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::InterfaceDef* *value,
++ IR_InterfaceDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq(const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (this->maximum_);
+- IR::InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_InterfaceDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::allocbuf (this->maximum_);
++ IR_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::InterfaceDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_InterfaceDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -2893,20 +2596,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::InterfaceDef **tmp = ACE_reinterpret_cast (IR::InterfaceDef **, this->buffer_);
++ IR_InterfaceDef **tmp = ACE_reinterpret_cast (IR_InterfaceDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::InterfaceDef::_nil ();
++ tmp[i] = IR_InterfaceDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -2919,28 +2622,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::InterfaceDef **tmp1 = ACE_reinterpret_cast (IR::InterfaceDef **, this->buffer_);
+- IR::InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR::InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_InterfaceDef **tmp1 = ACE_reinterpret_cast (IR_InterfaceDef **, this->buffer_);
++ IR_InterfaceDef ** const tmp2 = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::InterfaceDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_InterfaceDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::InterfaceDef ** const tmp = ACE_reinterpret_cast (IR::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::InterfaceDef,IR::InterfaceDef_var> (tmp + index, this->release_);
++ IR_InterfaceDef ** const tmp = ACE_reinterpret_cast (IR_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_InterfaceDef,IR_InterfaceDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::InterfaceDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_InterfaceDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::InterfaceDef **result = 0;
++ IR_InterfaceDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -2952,7 +2655,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::InterfaceDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_InterfaceDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -2961,7 +2664,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::InterfaceDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_InterfaceDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -2971,160 +2674,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::InterfaceDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_InterfaceDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_InterfaceDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::InterfaceDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_InterfaceDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_INTERFACEDEFSEQ_CI_)
+-#define _TAO_IR_INTERFACEDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::InterfaceDefSeq_var
++// Inline operations for class IR_InterfaceDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_var::InterfaceDefSeq_var (void) // default constructor
++IR_InterfaceDefSeq_var::IR_InterfaceDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_var::InterfaceDefSeq_var (InterfaceDefSeq *p)
++IR_InterfaceDefSeq_var::IR_InterfaceDefSeq_var (IR_InterfaceDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_var::InterfaceDefSeq_var (const ::IR::InterfaceDefSeq_var &p) // copy constructor
++IR_InterfaceDefSeq_var::IR_InterfaceDefSeq_var (const ::IR_InterfaceDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::InterfaceDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_InterfaceDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_var::~InterfaceDefSeq_var (void) // destructor
++IR_InterfaceDefSeq_var::~IR_InterfaceDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDefSeq_var &
+-IR::InterfaceDefSeq_var::operator= (InterfaceDefSeq *p)
++ACE_INLINE IR_InterfaceDefSeq_var &
++IR_InterfaceDefSeq_var::operator= (IR_InterfaceDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::InterfaceDefSeq_var &
+-IR::InterfaceDefSeq_var::operator= (const ::IR::InterfaceDefSeq_var &p) // deep copy
++ACE_INLINE IR_InterfaceDefSeq_var &
++IR_InterfaceDefSeq_var::operator= (const ::IR_InterfaceDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::InterfaceDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_InterfaceDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::InterfaceDefSeq *
+-IR::InterfaceDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_InterfaceDefSeq *
++IR_InterfaceDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDefSeq *
+-IR::InterfaceDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_InterfaceDefSeq *
++IR_InterfaceDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_var::operator const ::IR::InterfaceDefSeq &() const // cast
++IR_InterfaceDefSeq_var::operator const ::IR_InterfaceDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_var::operator ::IR::InterfaceDefSeq &() // cast
++IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_var::operator ::IR::InterfaceDefSeq &() const // cast
++IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::InterfaceDefSeq_var::operator ::IR::InterfaceDefSeq *&() // cast
++IR_InterfaceDefSeq_var::operator ::IR_InterfaceDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::InterfaceDef, IR::InterfaceDef_var>
+-IR::InterfaceDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var>
++IR_InterfaceDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::InterfaceDefSeq &
+-IR::InterfaceDefSeq_var::in (void) const
++ACE_INLINE const ::IR_InterfaceDefSeq &
++IR_InterfaceDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDefSeq &
+-IR::InterfaceDefSeq_var::inout (void)
++ACE_INLINE ::IR_InterfaceDefSeq &
++IR_InterfaceDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::InterfaceDefSeq *&
+-IR::InterfaceDefSeq_var::out (void)
++ACE_INLINE ::IR_InterfaceDefSeq *&
++IR_InterfaceDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDefSeq *
+-IR::InterfaceDefSeq_var::_retn (void)
++ACE_INLINE ::IR_InterfaceDefSeq *
++IR_InterfaceDefSeq_var::_retn (void)
+ {
+- ::IR::InterfaceDefSeq *tmp = this->ptr_;
++ ::IR_InterfaceDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::InterfaceDefSeq *
+-IR::InterfaceDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_InterfaceDefSeq *
++IR_InterfaceDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::InterfaceDefSeq_out
++// Inline operations for class IR_InterfaceDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_out::InterfaceDefSeq_out (InterfaceDefSeq *&p)
++IR_InterfaceDefSeq_out::IR_InterfaceDefSeq_out (IR_InterfaceDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_out::InterfaceDefSeq_out (InterfaceDefSeq_var &p) // constructor from _var
++IR_InterfaceDefSeq_out::IR_InterfaceDefSeq_out (IR_InterfaceDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -3132,57 +2828,50 @@
+ }
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_out::InterfaceDefSeq_out (const ::IR::InterfaceDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (InterfaceDefSeq_out&, p).ptr_)
++IR_InterfaceDefSeq_out::IR_InterfaceDefSeq_out (const ::IR_InterfaceDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_InterfaceDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::InterfaceDefSeq_out &
+-IR::InterfaceDefSeq_out::operator= (const ::IR::InterfaceDefSeq_out &p)
++ACE_INLINE ::IR_InterfaceDefSeq_out &
++IR_InterfaceDefSeq_out::operator= (const ::IR_InterfaceDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (InterfaceDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_InterfaceDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::InterfaceDefSeq_out &
+-IR::InterfaceDefSeq_out::operator= (InterfaceDefSeq *p)
++ACE_INLINE ::IR_InterfaceDefSeq_out &
++IR_InterfaceDefSeq_out::operator= (IR_InterfaceDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDefSeq_out::operator ::IR::InterfaceDefSeq *&() // cast
++IR_InterfaceDefSeq_out::operator ::IR_InterfaceDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDefSeq *&
+-IR::InterfaceDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_InterfaceDefSeq *&
++IR_InterfaceDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDefSeq *
+-IR::InterfaceDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_InterfaceDefSeq *
++IR_InterfaceDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::InterfaceDef, IR::InterfaceDef_var>
+-IR::InterfaceDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_InterfaceDef, IR_InterfaceDef_var>
++IR_InterfaceDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF___CI_)
+-#define _TAO_IR_VALUEDEF___CI_
+-
+ ACE_INLINE
+-IR::ValueDef::ValueDef (
++IR_ValueDef::IR_ValueDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -3192,200 +2881,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF___VAR_CI_)
+-#define _TAO_IR_VALUEDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueDef_var
++// Inline operations for class IR_ValueDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueDef_var::ValueDef_var (void) // default constructor
+- : ptr_ (IR::ValueDef::_nil ())
++IR_ValueDef_var::IR_ValueDef_var (void) // default constructor
++ : ptr_ (IR_ValueDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ValueDef_ptr
+-IR::ValueDef_var::ptr (void) const
++ACE_INLINE IR_ValueDef_ptr
++IR_ValueDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueDef_var::ValueDef_var (const IR::ValueDef_var &p) // copy constructor
++IR_ValueDef_var::IR_ValueDef_var (const IR_ValueDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ValueDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ValueDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ValueDef_var::~ValueDef_var (void) // destructor
++IR_ValueDef_var::~IR_ValueDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ValueDef_var &
+-IR::ValueDef_var::operator= (IR::ValueDef_ptr p)
++ACE_INLINE IR_ValueDef_var &
++IR_ValueDef_var::operator= (IR_ValueDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueDef_var &
+-IR::ValueDef_var::operator= (const IR::ValueDef_var &p)
++ACE_INLINE IR_ValueDef_var &
++IR_ValueDef_var::operator= (const IR_ValueDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ValueDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ValueDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueDef_var::operator const IR::ValueDef_ptr &() const // cast
++IR_ValueDef_var::operator const IR_ValueDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueDef_var::operator IR::ValueDef_ptr &() // cast
++IR_ValueDef_var::operator IR_ValueDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDef_ptr
+-IR::ValueDef_var::operator-> (void) const
++ACE_INLINE IR_ValueDef_ptr
++IR_ValueDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDef_ptr
+-IR::ValueDef_var::in (void) const
++ACE_INLINE IR_ValueDef_ptr
++IR_ValueDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDef_ptr &
+-IR::ValueDef_var::inout (void)
++ACE_INLINE IR_ValueDef_ptr &
++IR_ValueDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDef_ptr &
+-IR::ValueDef_var::out (void)
++ACE_INLINE IR_ValueDef_ptr &
++IR_ValueDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ValueDef::_nil ();
++ this->ptr_ = IR_ValueDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDef_ptr
+-IR::ValueDef_var::_retn (void)
++ACE_INLINE IR_ValueDef_ptr
++IR_ValueDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ValueDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ValueDef::_nil ();
++ IR_ValueDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ValueDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEDEF___OUT_CI_)
+-#define _TAO_IR_VALUEDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueDef_out
++// Inline operations for class IR_ValueDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueDef_out::ValueDef_out (IR::ValueDef_ptr &p)
++IR_ValueDef_out::IR_ValueDef_out (IR_ValueDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ValueDef::_nil ();
++ this->ptr_ = IR_ValueDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ValueDef_out::ValueDef_out (IR::ValueDef_var &p) // constructor from _var
++IR_ValueDef_out::IR_ValueDef_out (IR_ValueDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ValueDef::_nil ();
++ this->ptr_ = IR_ValueDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ValueDef_out::ValueDef_out (const IR::ValueDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ValueDef_out&,p).ptr_)
++IR_ValueDef_out::IR_ValueDef_out (const IR_ValueDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ValueDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ValueDef_out &
+-IR::ValueDef_out::operator= (const IR::ValueDef_out &p)
++ACE_INLINE IR_ValueDef_out &
++IR_ValueDef_out::operator= (const IR_ValueDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ValueDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ValueDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueDef_out &
+-IR::ValueDef_out::operator= (const IR::ValueDef_var &p)
++ACE_INLINE IR_ValueDef_out &
++IR_ValueDef_out::operator= (const IR_ValueDef_var &p)
+ {
+- this->ptr_ = IR::ValueDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ValueDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueDef_out &
+-IR::ValueDef_out::operator= (IR::ValueDef_ptr p)
++ACE_INLINE IR_ValueDef_out &
++IR_ValueDef_out::operator= (IR_ValueDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueDef_out::operator IR::ValueDef_ptr &() // cast
++IR_ValueDef_out::operator IR_ValueDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDef_ptr &
+-IR::ValueDef_out::ptr (void) // ptr
++ACE_INLINE IR_ValueDef_ptr &
++IR_ValueDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDef_ptr
+-IR::ValueDef_out::operator-> (void)
++ACE_INLINE IR_ValueDef_ptr
++IR_ValueDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_VALUEDEFSEQ_CI_
+-
+- ACE_INLINE IR::ValueDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_ValueDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::ValueDef **buf = 0;
++ IR_ValueDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::ValueDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_ValueDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::ValueDef::_nil ();
++ buf[i] = IR_ValueDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (IR::ValueDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::freebuf (IR_ValueDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -3393,36 +3061,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ValueDef* *value,
++ IR_ValueDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (this->maximum_);
+- IR::ValueDef ** const tmp2 = ACE_reinterpret_cast (IR::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ValueDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::allocbuf (this->maximum_);
++ IR_ValueDef ** const tmp2 = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ValueDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ValueDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -3432,20 +3100,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ValueDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::ValueDef **tmp = ACE_reinterpret_cast (IR::ValueDef **, this->buffer_);
++ IR_ValueDef **tmp = ACE_reinterpret_cast (IR_ValueDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ValueDef::_nil ();
++ tmp[i] = IR_ValueDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -3458,28 +3126,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ValueDef **tmp1 = ACE_reinterpret_cast (IR::ValueDef **, this->buffer_);
+- IR::ValueDef ** const tmp2 = ACE_reinterpret_cast (IR::ValueDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ValueDef **tmp1 = ACE_reinterpret_cast (IR_ValueDef **, this->buffer_);
++ IR_ValueDef ** const tmp2 = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ValueDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ValueDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::ValueDef ** const tmp = ACE_reinterpret_cast (IR::ValueDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::ValueDef,IR::ValueDef_var> (tmp + index, this->release_);
++ IR_ValueDef ** const tmp = ACE_reinterpret_cast (IR_ValueDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_ValueDef,IR_ValueDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::ValueDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ValueDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ValueDef **result = 0;
++ IR_ValueDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -3491,7 +3159,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ValueDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ValueDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -3500,7 +3168,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ValueDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ValueDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -3510,160 +3178,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ValueDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_ValueDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ValueDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ValueDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ValueDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_VALUEDEFSEQ_CI_)
+-#define _TAO_IR_VALUEDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueDefSeq_var
++// Inline operations for class IR_ValueDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueDefSeq_var::ValueDefSeq_var (void) // default constructor
++IR_ValueDefSeq_var::IR_ValueDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ValueDefSeq_var::ValueDefSeq_var (ValueDefSeq *p)
++IR_ValueDefSeq_var::IR_ValueDefSeq_var (IR_ValueDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ValueDefSeq_var::ValueDefSeq_var (const ::IR::ValueDefSeq_var &p) // copy constructor
++IR_ValueDefSeq_var::IR_ValueDefSeq_var (const ::IR_ValueDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ValueDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ValueDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ValueDefSeq_var::~ValueDefSeq_var (void) // destructor
++IR_ValueDefSeq_var::~IR_ValueDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDefSeq_var &
+-IR::ValueDefSeq_var::operator= (ValueDefSeq *p)
++ACE_INLINE IR_ValueDefSeq_var &
++IR_ValueDefSeq_var::operator= (IR_ValueDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueDefSeq_var &
+-IR::ValueDefSeq_var::operator= (const ::IR::ValueDefSeq_var &p) // deep copy
++ACE_INLINE IR_ValueDefSeq_var &
++IR_ValueDefSeq_var::operator= (const ::IR_ValueDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ValueDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ValueDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ValueDefSeq *
+-IR::ValueDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ValueDefSeq *
++IR_ValueDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDefSeq *
+-IR::ValueDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_ValueDefSeq *
++IR_ValueDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueDefSeq_var::operator const ::IR::ValueDefSeq &() const // cast
++IR_ValueDefSeq_var::operator const ::IR_ValueDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueDefSeq_var::operator ::IR::ValueDefSeq &() // cast
++IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueDefSeq_var::operator ::IR::ValueDefSeq &() const // cast
++IR_ValueDefSeq_var::operator ::IR_ValueDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ValueDefSeq_var::operator ::IR::ValueDefSeq *&() // cast
++IR_ValueDefSeq_var::operator ::IR_ValueDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ValueDef, IR::ValueDef_var>
+-IR::ValueDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var>
++IR_ValueDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::ValueDefSeq &
+-IR::ValueDefSeq_var::in (void) const
++ACE_INLINE const ::IR_ValueDefSeq &
++IR_ValueDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDefSeq &
+-IR::ValueDefSeq_var::inout (void)
++ACE_INLINE ::IR_ValueDefSeq &
++IR_ValueDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ValueDefSeq *&
+-IR::ValueDefSeq_var::out (void)
++ACE_INLINE ::IR_ValueDefSeq *&
++IR_ValueDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDefSeq *
+-IR::ValueDefSeq_var::_retn (void)
++ACE_INLINE ::IR_ValueDefSeq *
++IR_ValueDefSeq_var::_retn (void)
+ {
+- ::IR::ValueDefSeq *tmp = this->ptr_;
++ ::IR_ValueDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ValueDefSeq *
+-IR::ValueDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_ValueDefSeq *
++IR_ValueDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ValueDefSeq_out
++// Inline operations for class IR_ValueDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueDefSeq_out::ValueDefSeq_out (ValueDefSeq *&p)
++IR_ValueDefSeq_out::IR_ValueDefSeq_out (IR_ValueDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ValueDefSeq_out::ValueDefSeq_out (ValueDefSeq_var &p) // constructor from _var
++IR_ValueDefSeq_out::IR_ValueDefSeq_out (IR_ValueDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -3671,57 +3332,50 @@
+ }
+
+ ACE_INLINE
+-IR::ValueDefSeq_out::ValueDefSeq_out (const ::IR::ValueDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ValueDefSeq_out&, p).ptr_)
++IR_ValueDefSeq_out::IR_ValueDefSeq_out (const ::IR_ValueDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ValueDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ValueDefSeq_out &
+-IR::ValueDefSeq_out::operator= (const ::IR::ValueDefSeq_out &p)
++ACE_INLINE ::IR_ValueDefSeq_out &
++IR_ValueDefSeq_out::operator= (const ::IR_ValueDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ValueDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ValueDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ValueDefSeq_out &
+-IR::ValueDefSeq_out::operator= (ValueDefSeq *p)
++ACE_INLINE ::IR_ValueDefSeq_out &
++IR_ValueDefSeq_out::operator= (IR_ValueDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueDefSeq_out::operator ::IR::ValueDefSeq *&() // cast
++IR_ValueDefSeq_out::operator ::IR_ValueDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDefSeq *&
+-IR::ValueDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ValueDefSeq *&
++IR_ValueDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDefSeq *
+-IR::ValueDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_ValueDefSeq *
++IR_ValueDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ValueDef, IR::ValueDef_var>
+-IR::ValueDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ValueDef, IR_ValueDef_var>
++IR_ValueDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___CI_)
+-#define _TAO_IR_VALUEBOXDEF___CI_
+-
+ ACE_INLINE
+-IR::ValueBoxDef::ValueBoxDef (
++IR_ValueBoxDef::IR_ValueBoxDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -3731,185 +3385,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___VAR_CI_)
+-#define _TAO_IR_VALUEBOXDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueBoxDef_var
++// Inline operations for class IR_ValueBoxDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueBoxDef_var::ValueBoxDef_var (void) // default constructor
+- : ptr_ (IR::ValueBoxDef::_nil ())
++IR_ValueBoxDef_var::IR_ValueBoxDef_var (void) // default constructor
++ : ptr_ (IR_ValueBoxDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ValueBoxDef_ptr
+-IR::ValueBoxDef_var::ptr (void) const
++ACE_INLINE IR_ValueBoxDef_ptr
++IR_ValueBoxDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueBoxDef_var::ValueBoxDef_var (const IR::ValueBoxDef_var &p) // copy constructor
++IR_ValueBoxDef_var::IR_ValueBoxDef_var (const IR_ValueBoxDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ValueBoxDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ValueBoxDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ValueBoxDef_var::~ValueBoxDef_var (void) // destructor
++IR_ValueBoxDef_var::~IR_ValueBoxDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ValueBoxDef_var &
+-IR::ValueBoxDef_var::operator= (IR::ValueBoxDef_ptr p)
++ACE_INLINE IR_ValueBoxDef_var &
++IR_ValueBoxDef_var::operator= (IR_ValueBoxDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_var &
+-IR::ValueBoxDef_var::operator= (const IR::ValueBoxDef_var &p)
++ACE_INLINE IR_ValueBoxDef_var &
++IR_ValueBoxDef_var::operator= (const IR_ValueBoxDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ValueBoxDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ValueBoxDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueBoxDef_var::operator const IR::ValueBoxDef_ptr &() const // cast
++IR_ValueBoxDef_var::operator const IR_ValueBoxDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueBoxDef_var::operator IR::ValueBoxDef_ptr &() // cast
++IR_ValueBoxDef_var::operator IR_ValueBoxDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_ptr
+-IR::ValueBoxDef_var::operator-> (void) const
++ACE_INLINE IR_ValueBoxDef_ptr
++IR_ValueBoxDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_ptr
+-IR::ValueBoxDef_var::in (void) const
++ACE_INLINE IR_ValueBoxDef_ptr
++IR_ValueBoxDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_ptr &
+-IR::ValueBoxDef_var::inout (void)
++ACE_INLINE IR_ValueBoxDef_ptr &
++IR_ValueBoxDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_ptr &
+-IR::ValueBoxDef_var::out (void)
++ACE_INLINE IR_ValueBoxDef_ptr &
++IR_ValueBoxDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ValueBoxDef::_nil ();
++ this->ptr_ = IR_ValueBoxDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_ptr
+-IR::ValueBoxDef_var::_retn (void)
++ACE_INLINE IR_ValueBoxDef_ptr
++IR_ValueBoxDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ValueBoxDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ValueBoxDef::_nil ();
++ IR_ValueBoxDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ValueBoxDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEBOXDEF___OUT_CI_)
+-#define _TAO_IR_VALUEBOXDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueBoxDef_out
++// Inline operations for class IR_ValueBoxDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueBoxDef_out::ValueBoxDef_out (IR::ValueBoxDef_ptr &p)
++IR_ValueBoxDef_out::IR_ValueBoxDef_out (IR_ValueBoxDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ValueBoxDef::_nil ();
++ this->ptr_ = IR_ValueBoxDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ValueBoxDef_out::ValueBoxDef_out (IR::ValueBoxDef_var &p) // constructor from _var
++IR_ValueBoxDef_out::IR_ValueBoxDef_out (IR_ValueBoxDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ValueBoxDef::_nil ();
++ this->ptr_ = IR_ValueBoxDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ValueBoxDef_out::ValueBoxDef_out (const IR::ValueBoxDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ValueBoxDef_out&,p).ptr_)
++IR_ValueBoxDef_out::IR_ValueBoxDef_out (const IR_ValueBoxDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ValueBoxDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ValueBoxDef_out &
+-IR::ValueBoxDef_out::operator= (const IR::ValueBoxDef_out &p)
++ACE_INLINE IR_ValueBoxDef_out &
++IR_ValueBoxDef_out::operator= (const IR_ValueBoxDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ValueBoxDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ValueBoxDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_out &
+-IR::ValueBoxDef_out::operator= (const IR::ValueBoxDef_var &p)
++ACE_INLINE IR_ValueBoxDef_out &
++IR_ValueBoxDef_out::operator= (const IR_ValueBoxDef_var &p)
+ {
+- this->ptr_ = IR::ValueBoxDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ValueBoxDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_out &
+-IR::ValueBoxDef_out::operator= (IR::ValueBoxDef_ptr p)
++ACE_INLINE IR_ValueBoxDef_out &
++IR_ValueBoxDef_out::operator= (IR_ValueBoxDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueBoxDef_out::operator IR::ValueBoxDef_ptr &() // cast
++IR_ValueBoxDef_out::operator IR_ValueBoxDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_ptr &
+-IR::ValueBoxDef_out::ptr (void) // ptr
++ACE_INLINE IR_ValueBoxDef_ptr &
++IR_ValueBoxDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueBoxDef_ptr
+-IR::ValueBoxDef_out::operator-> (void)
++ACE_INLINE IR_ValueBoxDef_ptr
++IR_ValueBoxDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___CI_)
+-#define _TAO_IR_COMPONENTDEF___CI_
+-
+ ACE_INLINE
+-IR::ComponentDef::ComponentDef (
++IR_ComponentDef::IR_ComponentDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -3919,200 +3552,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___VAR_CI_)
+-#define _TAO_IR_COMPONENTDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ComponentDef_var
++// Inline operations for class IR_ComponentDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ComponentDef_var::ComponentDef_var (void) // default constructor
+- : ptr_ (IR::ComponentDef::_nil ())
++IR_ComponentDef_var::IR_ComponentDef_var (void) // default constructor
++ : ptr_ (IR_ComponentDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ComponentDef_ptr
+-IR::ComponentDef_var::ptr (void) const
++ACE_INLINE IR_ComponentDef_ptr
++IR_ComponentDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentDef_var::ComponentDef_var (const IR::ComponentDef_var &p) // copy constructor
++IR_ComponentDef_var::IR_ComponentDef_var (const IR_ComponentDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ComponentDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ComponentDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ComponentDef_var::~ComponentDef_var (void) // destructor
++IR_ComponentDef_var::~IR_ComponentDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ComponentDef_var &
+-IR::ComponentDef_var::operator= (IR::ComponentDef_ptr p)
++ACE_INLINE IR_ComponentDef_var &
++IR_ComponentDef_var::operator= (IR_ComponentDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ComponentDef_var &
+-IR::ComponentDef_var::operator= (const IR::ComponentDef_var &p)
++ACE_INLINE IR_ComponentDef_var &
++IR_ComponentDef_var::operator= (const IR_ComponentDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ComponentDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ComponentDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ComponentDef_var::operator const IR::ComponentDef_ptr &() const // cast
++IR_ComponentDef_var::operator const IR_ComponentDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentDef_var::operator IR::ComponentDef_ptr &() // cast
++IR_ComponentDef_var::operator IR_ComponentDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDef_ptr
+-IR::ComponentDef_var::operator-> (void) const
++ACE_INLINE IR_ComponentDef_ptr
++IR_ComponentDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDef_ptr
+-IR::ComponentDef_var::in (void) const
++ACE_INLINE IR_ComponentDef_ptr
++IR_ComponentDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDef_ptr &
+-IR::ComponentDef_var::inout (void)
++ACE_INLINE IR_ComponentDef_ptr &
++IR_ComponentDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDef_ptr &
+-IR::ComponentDef_var::out (void)
++ACE_INLINE IR_ComponentDef_ptr &
++IR_ComponentDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ComponentDef::_nil ();
++ this->ptr_ = IR_ComponentDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDef_ptr
+-IR::ComponentDef_var::_retn (void)
++ACE_INLINE IR_ComponentDef_ptr
++IR_ComponentDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ComponentDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ComponentDef::_nil ();
++ IR_ComponentDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ComponentDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTDEF___OUT_CI_)
+-#define _TAO_IR_COMPONENTDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ComponentDef_out
++// Inline operations for class IR_ComponentDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ComponentDef_out::ComponentDef_out (IR::ComponentDef_ptr &p)
++IR_ComponentDef_out::IR_ComponentDef_out (IR_ComponentDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ComponentDef::_nil ();
++ this->ptr_ = IR_ComponentDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ComponentDef_out::ComponentDef_out (IR::ComponentDef_var &p) // constructor from _var
++IR_ComponentDef_out::IR_ComponentDef_out (IR_ComponentDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ComponentDef::_nil ();
++ this->ptr_ = IR_ComponentDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ComponentDef_out::ComponentDef_out (const IR::ComponentDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ComponentDef_out&,p).ptr_)
++IR_ComponentDef_out::IR_ComponentDef_out (const IR_ComponentDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ComponentDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ComponentDef_out &
+-IR::ComponentDef_out::operator= (const IR::ComponentDef_out &p)
++ACE_INLINE IR_ComponentDef_out &
++IR_ComponentDef_out::operator= (const IR_ComponentDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ComponentDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ComponentDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ComponentDef_out &
+-IR::ComponentDef_out::operator= (const IR::ComponentDef_var &p)
++ACE_INLINE IR_ComponentDef_out &
++IR_ComponentDef_out::operator= (const IR_ComponentDef_var &p)
+ {
+- this->ptr_ = IR::ComponentDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ComponentDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ComponentDef_out &
+-IR::ComponentDef_out::operator= (IR::ComponentDef_ptr p)
++ACE_INLINE IR_ComponentDef_out &
++IR_ComponentDef_out::operator= (IR_ComponentDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ComponentDef_out::operator IR::ComponentDef_ptr &() // cast
++IR_ComponentDef_out::operator IR_ComponentDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDef_ptr &
+-IR::ComponentDef_out::ptr (void) // ptr
++ACE_INLINE IR_ComponentDef_ptr &
++IR_ComponentDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDef_ptr
+-IR::ComponentDef_out::operator-> (void)
++ACE_INLINE IR_ComponentDef_ptr
++IR_ComponentDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_COMPONENTDEFSEQ_CI_
+-
+- ACE_INLINE IR::ComponentDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_ComponentDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::ComponentDef **buf = 0;
++ IR_ComponentDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::ComponentDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_ComponentDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::ComponentDef::_nil ();
++ buf[i] = IR_ComponentDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR::ComponentDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::freebuf (IR_ComponentDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -4120,36 +3732,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ComponentDef* *value,
++ IR_ComponentDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ComponentDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
+- IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ComponentDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::allocbuf (this->maximum_);
++ IR_ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ComponentDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -4159,20 +3771,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::ComponentDef **tmp = ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
++ IR_ComponentDef **tmp = ACE_reinterpret_cast (IR_ComponentDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ComponentDef::_nil ();
++ tmp[i] = IR_ComponentDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -4185,28 +3797,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ComponentDef **tmp1 = ACE_reinterpret_cast (IR::ComponentDef **, this->buffer_);
+- IR::ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ComponentDef **tmp1 = ACE_reinterpret_cast (IR_ComponentDef **, this->buffer_);
++ IR_ComponentDef ** const tmp2 = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ComponentDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ComponentDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::ComponentDef ** const tmp = ACE_reinterpret_cast (IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::ComponentDef,IR::ComponentDef_var> (tmp + index, this->release_);
++ IR_ComponentDef ** const tmp = ACE_reinterpret_cast (IR_ComponentDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_ComponentDef,IR_ComponentDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::ComponentDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ComponentDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ComponentDef **result = 0;
++ IR_ComponentDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -4218,7 +3830,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ComponentDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ComponentDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -4227,7 +3839,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ComponentDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ComponentDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -4237,160 +3849,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ComponentDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_ComponentDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ComponentDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ComponentDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ComponentDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_COMPONENTDEFSEQ_CI_)
+-#define _TAO_IR_COMPONENTDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ComponentDefSeq_var
++// Inline operations for class IR_ComponentDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ComponentDefSeq_var::ComponentDefSeq_var (void) // default constructor
++IR_ComponentDefSeq_var::IR_ComponentDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ComponentDefSeq_var::ComponentDefSeq_var (ComponentDefSeq *p)
++IR_ComponentDefSeq_var::IR_ComponentDefSeq_var (IR_ComponentDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ComponentDefSeq_var::ComponentDefSeq_var (const ::IR::ComponentDefSeq_var &p) // copy constructor
++IR_ComponentDefSeq_var::IR_ComponentDefSeq_var (const ::IR_ComponentDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ComponentDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ComponentDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ComponentDefSeq_var::~ComponentDefSeq_var (void) // destructor
++IR_ComponentDefSeq_var::~IR_ComponentDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDefSeq_var &
+-IR::ComponentDefSeq_var::operator= (ComponentDefSeq *p)
++ACE_INLINE IR_ComponentDefSeq_var &
++IR_ComponentDefSeq_var::operator= (IR_ComponentDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ComponentDefSeq_var &
+-IR::ComponentDefSeq_var::operator= (const ::IR::ComponentDefSeq_var &p) // deep copy
++ACE_INLINE IR_ComponentDefSeq_var &
++IR_ComponentDefSeq_var::operator= (const ::IR_ComponentDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ComponentDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ComponentDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ComponentDefSeq *
+-IR::ComponentDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ComponentDefSeq *
++IR_ComponentDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDefSeq *
+-IR::ComponentDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_ComponentDefSeq *
++IR_ComponentDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentDefSeq_var::operator const ::IR::ComponentDefSeq &() const // cast
++IR_ComponentDefSeq_var::operator const ::IR_ComponentDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq &() // cast
++IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq &() const // cast
++IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ComponentDefSeq_var::operator ::IR::ComponentDefSeq *&() // cast
++IR_ComponentDefSeq_var::operator ::IR_ComponentDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ComponentDef, IR::ComponentDef_var>
+-IR::ComponentDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var>
++IR_ComponentDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::ComponentDefSeq &
+-IR::ComponentDefSeq_var::in (void) const
++ACE_INLINE const ::IR_ComponentDefSeq &
++IR_ComponentDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDefSeq &
+-IR::ComponentDefSeq_var::inout (void)
++ACE_INLINE ::IR_ComponentDefSeq &
++IR_ComponentDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ComponentDefSeq *&
+-IR::ComponentDefSeq_var::out (void)
++ACE_INLINE ::IR_ComponentDefSeq *&
++IR_ComponentDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDefSeq *
+-IR::ComponentDefSeq_var::_retn (void)
++ACE_INLINE ::IR_ComponentDefSeq *
++IR_ComponentDefSeq_var::_retn (void)
+ {
+- ::IR::ComponentDefSeq *tmp = this->ptr_;
++ ::IR_ComponentDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ComponentDefSeq *
+-IR::ComponentDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_ComponentDefSeq *
++IR_ComponentDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ComponentDefSeq_out
++// Inline operations for class IR_ComponentDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ComponentDefSeq_out::ComponentDefSeq_out (ComponentDefSeq *&p)
++IR_ComponentDefSeq_out::IR_ComponentDefSeq_out (IR_ComponentDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ComponentDefSeq_out::ComponentDefSeq_out (ComponentDefSeq_var &p) // constructor from _var
++IR_ComponentDefSeq_out::IR_ComponentDefSeq_out (IR_ComponentDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -4398,57 +4003,50 @@
+ }
+
+ ACE_INLINE
+-IR::ComponentDefSeq_out::ComponentDefSeq_out (const ::IR::ComponentDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ComponentDefSeq_out&, p).ptr_)
++IR_ComponentDefSeq_out::IR_ComponentDefSeq_out (const ::IR_ComponentDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ComponentDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ComponentDefSeq_out &
+-IR::ComponentDefSeq_out::operator= (const ::IR::ComponentDefSeq_out &p)
++ACE_INLINE ::IR_ComponentDefSeq_out &
++IR_ComponentDefSeq_out::operator= (const ::IR_ComponentDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ComponentDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ComponentDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ComponentDefSeq_out &
+-IR::ComponentDefSeq_out::operator= (ComponentDefSeq *p)
++ACE_INLINE ::IR_ComponentDefSeq_out &
++IR_ComponentDefSeq_out::operator= (IR_ComponentDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ComponentDefSeq_out::operator ::IR::ComponentDefSeq *&() // cast
++IR_ComponentDefSeq_out::operator ::IR_ComponentDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDefSeq *&
+-IR::ComponentDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ComponentDefSeq *&
++IR_ComponentDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDefSeq *
+-IR::ComponentDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_ComponentDefSeq *
++IR_ComponentDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ComponentDef, IR::ComponentDef_var>
+-IR::ComponentDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ComponentDef, IR_ComponentDef_var>
++IR_ComponentDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___CI_)
+-#define _TAO_IR_PROVIDESDEF___CI_
+-
+ ACE_INLINE
+-IR::ProvidesDef::ProvidesDef (
++IR_ProvidesDef::IR_ProvidesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -4458,200 +4056,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___VAR_CI_)
+-#define _TAO_IR_PROVIDESDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ProvidesDef_var
++// Inline operations for class IR_ProvidesDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ProvidesDef_var::ProvidesDef_var (void) // default constructor
+- : ptr_ (IR::ProvidesDef::_nil ())
++IR_ProvidesDef_var::IR_ProvidesDef_var (void) // default constructor
++ : ptr_ (IR_ProvidesDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ProvidesDef_ptr
+-IR::ProvidesDef_var::ptr (void) const
++ACE_INLINE IR_ProvidesDef_ptr
++IR_ProvidesDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDef_var::ProvidesDef_var (const IR::ProvidesDef_var &p) // copy constructor
++IR_ProvidesDef_var::IR_ProvidesDef_var (const IR_ProvidesDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ProvidesDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ProvidesDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ProvidesDef_var::~ProvidesDef_var (void) // destructor
++IR_ProvidesDef_var::~IR_ProvidesDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ProvidesDef_var &
+-IR::ProvidesDef_var::operator= (IR::ProvidesDef_ptr p)
++ACE_INLINE IR_ProvidesDef_var &
++IR_ProvidesDef_var::operator= (IR_ProvidesDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ProvidesDef_var &
+-IR::ProvidesDef_var::operator= (const IR::ProvidesDef_var &p)
++ACE_INLINE IR_ProvidesDef_var &
++IR_ProvidesDef_var::operator= (const IR_ProvidesDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ProvidesDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ProvidesDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDef_var::operator const IR::ProvidesDef_ptr &() const // cast
++IR_ProvidesDef_var::operator const IR_ProvidesDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDef_var::operator IR::ProvidesDef_ptr &() // cast
++IR_ProvidesDef_var::operator IR_ProvidesDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDef_ptr
+-IR::ProvidesDef_var::operator-> (void) const
++ACE_INLINE IR_ProvidesDef_ptr
++IR_ProvidesDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDef_ptr
+-IR::ProvidesDef_var::in (void) const
++ACE_INLINE IR_ProvidesDef_ptr
++IR_ProvidesDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDef_ptr &
+-IR::ProvidesDef_var::inout (void)
++ACE_INLINE IR_ProvidesDef_ptr &
++IR_ProvidesDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDef_ptr &
+-IR::ProvidesDef_var::out (void)
++ACE_INLINE IR_ProvidesDef_ptr &
++IR_ProvidesDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ProvidesDef::_nil ();
++ this->ptr_ = IR_ProvidesDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDef_ptr
+-IR::ProvidesDef_var::_retn (void)
++ACE_INLINE IR_ProvidesDef_ptr
++IR_ProvidesDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ProvidesDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ProvidesDef::_nil ();
++ IR_ProvidesDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ProvidesDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PROVIDESDEF___OUT_CI_)
+-#define _TAO_IR_PROVIDESDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ProvidesDef_out
++// Inline operations for class IR_ProvidesDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ProvidesDef_out::ProvidesDef_out (IR::ProvidesDef_ptr &p)
++IR_ProvidesDef_out::IR_ProvidesDef_out (IR_ProvidesDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ProvidesDef::_nil ();
++ this->ptr_ = IR_ProvidesDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ProvidesDef_out::ProvidesDef_out (IR::ProvidesDef_var &p) // constructor from _var
++IR_ProvidesDef_out::IR_ProvidesDef_out (IR_ProvidesDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ProvidesDef::_nil ();
++ this->ptr_ = IR_ProvidesDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ProvidesDef_out::ProvidesDef_out (const IR::ProvidesDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ProvidesDef_out&,p).ptr_)
++IR_ProvidesDef_out::IR_ProvidesDef_out (const IR_ProvidesDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ProvidesDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ProvidesDef_out &
+-IR::ProvidesDef_out::operator= (const IR::ProvidesDef_out &p)
++ACE_INLINE IR_ProvidesDef_out &
++IR_ProvidesDef_out::operator= (const IR_ProvidesDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ProvidesDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ProvidesDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ProvidesDef_out &
+-IR::ProvidesDef_out::operator= (const IR::ProvidesDef_var &p)
++ACE_INLINE IR_ProvidesDef_out &
++IR_ProvidesDef_out::operator= (const IR_ProvidesDef_var &p)
+ {
+- this->ptr_ = IR::ProvidesDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ProvidesDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ProvidesDef_out &
+-IR::ProvidesDef_out::operator= (IR::ProvidesDef_ptr p)
++ACE_INLINE IR_ProvidesDef_out &
++IR_ProvidesDef_out::operator= (IR_ProvidesDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDef_out::operator IR::ProvidesDef_ptr &() // cast
++IR_ProvidesDef_out::operator IR_ProvidesDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDef_ptr &
+-IR::ProvidesDef_out::ptr (void) // ptr
++ACE_INLINE IR_ProvidesDef_ptr &
++IR_ProvidesDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDef_ptr
+-IR::ProvidesDef_out::operator-> (void)
++ACE_INLINE IR_ProvidesDef_ptr
++IR_ProvidesDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PROVIDESDEFSEQ_CI_
+-
+- ACE_INLINE IR::ProvidesDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_ProvidesDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::ProvidesDef **buf = 0;
++ IR_ProvidesDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::ProvidesDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_ProvidesDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::ProvidesDef::_nil ();
++ buf[i] = IR_ProvidesDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR::ProvidesDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::freebuf (IR_ProvidesDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -4659,36 +4236,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ProvidesDef* *value,
++ IR_ProvidesDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ProvidesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
+- IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ProvidesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::allocbuf (this->maximum_);
++ IR_ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ProvidesDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -4698,20 +4275,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::ProvidesDef **tmp = ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
++ IR_ProvidesDef **tmp = ACE_reinterpret_cast (IR_ProvidesDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ProvidesDef::_nil ();
++ tmp[i] = IR_ProvidesDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -4724,28 +4301,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ProvidesDef **tmp1 = ACE_reinterpret_cast (IR::ProvidesDef **, this->buffer_);
+- IR::ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ProvidesDef **tmp1 = ACE_reinterpret_cast (IR_ProvidesDef **, this->buffer_);
++ IR_ProvidesDef ** const tmp2 = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ProvidesDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ProvidesDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::ProvidesDef ** const tmp = ACE_reinterpret_cast (IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::ProvidesDef,IR::ProvidesDef_var> (tmp + index, this->release_);
++ IR_ProvidesDef ** const tmp = ACE_reinterpret_cast (IR_ProvidesDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_ProvidesDef,IR_ProvidesDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::ProvidesDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ProvidesDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ProvidesDef **result = 0;
++ IR_ProvidesDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -4757,7 +4334,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ProvidesDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ProvidesDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -4766,7 +4343,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ProvidesDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ProvidesDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -4776,160 +4353,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ProvidesDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_ProvidesDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ProvidesDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ProvidesDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ProvidesDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PROVIDESDEFSEQ_CI_)
+-#define _TAO_IR_PROVIDESDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ProvidesDefSeq_var
++// Inline operations for class IR_ProvidesDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_var::ProvidesDefSeq_var (void) // default constructor
++IR_ProvidesDefSeq_var::IR_ProvidesDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_var::ProvidesDefSeq_var (ProvidesDefSeq *p)
++IR_ProvidesDefSeq_var::IR_ProvidesDefSeq_var (IR_ProvidesDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_var::ProvidesDefSeq_var (const ::IR::ProvidesDefSeq_var &p) // copy constructor
++IR_ProvidesDefSeq_var::IR_ProvidesDefSeq_var (const ::IR_ProvidesDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ProvidesDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ProvidesDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_var::~ProvidesDefSeq_var (void) // destructor
++IR_ProvidesDefSeq_var::~IR_ProvidesDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDefSeq_var &
+-IR::ProvidesDefSeq_var::operator= (ProvidesDefSeq *p)
++ACE_INLINE IR_ProvidesDefSeq_var &
++IR_ProvidesDefSeq_var::operator= (IR_ProvidesDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ProvidesDefSeq_var &
+-IR::ProvidesDefSeq_var::operator= (const ::IR::ProvidesDefSeq_var &p) // deep copy
++ACE_INLINE IR_ProvidesDefSeq_var &
++IR_ProvidesDefSeq_var::operator= (const ::IR_ProvidesDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ProvidesDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ProvidesDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ProvidesDefSeq *
+-IR::ProvidesDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ProvidesDefSeq *
++IR_ProvidesDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDefSeq *
+-IR::ProvidesDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_ProvidesDefSeq *
++IR_ProvidesDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_var::operator const ::IR::ProvidesDefSeq &() const // cast
++IR_ProvidesDefSeq_var::operator const ::IR_ProvidesDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq &() // cast
++IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq &() const // cast
++IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ProvidesDefSeq_var::operator ::IR::ProvidesDefSeq *&() // cast
++IR_ProvidesDefSeq_var::operator ::IR_ProvidesDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ProvidesDef, IR::ProvidesDef_var>
+-IR::ProvidesDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var>
++IR_ProvidesDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::ProvidesDefSeq &
+-IR::ProvidesDefSeq_var::in (void) const
++ACE_INLINE const ::IR_ProvidesDefSeq &
++IR_ProvidesDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDefSeq &
+-IR::ProvidesDefSeq_var::inout (void)
++ACE_INLINE ::IR_ProvidesDefSeq &
++IR_ProvidesDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ProvidesDefSeq *&
+-IR::ProvidesDefSeq_var::out (void)
++ACE_INLINE ::IR_ProvidesDefSeq *&
++IR_ProvidesDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDefSeq *
+-IR::ProvidesDefSeq_var::_retn (void)
++ACE_INLINE ::IR_ProvidesDefSeq *
++IR_ProvidesDefSeq_var::_retn (void)
+ {
+- ::IR::ProvidesDefSeq *tmp = this->ptr_;
++ ::IR_ProvidesDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ProvidesDefSeq *
+-IR::ProvidesDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_ProvidesDefSeq *
++IR_ProvidesDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ProvidesDefSeq_out
++// Inline operations for class IR_ProvidesDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_out::ProvidesDefSeq_out (ProvidesDefSeq *&p)
++IR_ProvidesDefSeq_out::IR_ProvidesDefSeq_out (IR_ProvidesDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_out::ProvidesDefSeq_out (ProvidesDefSeq_var &p) // constructor from _var
++IR_ProvidesDefSeq_out::IR_ProvidesDefSeq_out (IR_ProvidesDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -4937,57 +4507,50 @@
+ }
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_out::ProvidesDefSeq_out (const ::IR::ProvidesDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ProvidesDefSeq_out&, p).ptr_)
++IR_ProvidesDefSeq_out::IR_ProvidesDefSeq_out (const ::IR_ProvidesDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ProvidesDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ProvidesDefSeq_out &
+-IR::ProvidesDefSeq_out::operator= (const ::IR::ProvidesDefSeq_out &p)
++ACE_INLINE ::IR_ProvidesDefSeq_out &
++IR_ProvidesDefSeq_out::operator= (const ::IR_ProvidesDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ProvidesDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ProvidesDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ProvidesDefSeq_out &
+-IR::ProvidesDefSeq_out::operator= (ProvidesDefSeq *p)
++ACE_INLINE ::IR_ProvidesDefSeq_out &
++IR_ProvidesDefSeq_out::operator= (IR_ProvidesDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDefSeq_out::operator ::IR::ProvidesDefSeq *&() // cast
++IR_ProvidesDefSeq_out::operator ::IR_ProvidesDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDefSeq *&
+-IR::ProvidesDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ProvidesDefSeq *&
++IR_ProvidesDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDefSeq *
+-IR::ProvidesDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_ProvidesDefSeq *
++IR_ProvidesDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ProvidesDef, IR::ProvidesDef_var>
+-IR::ProvidesDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ProvidesDef, IR_ProvidesDef_var>
++IR_ProvidesDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEF___CI_)
+-#define _TAO_IR_USESDEF___CI_
+-
+ ACE_INLINE
+-IR::UsesDef::UsesDef (
++IR_UsesDef::IR_UsesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -4997,200 +4560,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEF___VAR_CI_)
+-#define _TAO_IR_USESDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::UsesDef_var
++// Inline operations for class IR_UsesDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UsesDef_var::UsesDef_var (void) // default constructor
+- : ptr_ (IR::UsesDef::_nil ())
++IR_UsesDef_var::IR_UsesDef_var (void) // default constructor
++ : ptr_ (IR_UsesDef::_nil ())
+ {}
+
+-ACE_INLINE IR::UsesDef_ptr
+-IR::UsesDef_var::ptr (void) const
++ACE_INLINE IR_UsesDef_ptr
++IR_UsesDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDef_var::UsesDef_var (const IR::UsesDef_var &p) // copy constructor
++IR_UsesDef_var::IR_UsesDef_var (const IR_UsesDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (UsesDef::_duplicate (p.ptr ()))
++ ptr_ (IR_UsesDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::UsesDef_var::~UsesDef_var (void) // destructor
++IR_UsesDef_var::~IR_UsesDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::UsesDef_var &
+-IR::UsesDef_var::operator= (IR::UsesDef_ptr p)
++ACE_INLINE IR_UsesDef_var &
++IR_UsesDef_var::operator= (IR_UsesDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::UsesDef_var &
+-IR::UsesDef_var::operator= (const IR::UsesDef_var &p)
++ACE_INLINE IR_UsesDef_var &
++IR_UsesDef_var::operator= (const IR_UsesDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::UsesDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_UsesDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UsesDef_var::operator const IR::UsesDef_ptr &() const // cast
++IR_UsesDef_var::operator const IR_UsesDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDef_var::operator IR::UsesDef_ptr &() // cast
++IR_UsesDef_var::operator IR_UsesDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDef_ptr
+-IR::UsesDef_var::operator-> (void) const
++ACE_INLINE IR_UsesDef_ptr
++IR_UsesDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDef_ptr
+-IR::UsesDef_var::in (void) const
++ACE_INLINE IR_UsesDef_ptr
++IR_UsesDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDef_ptr &
+-IR::UsesDef_var::inout (void)
++ACE_INLINE IR_UsesDef_ptr &
++IR_UsesDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDef_ptr &
+-IR::UsesDef_var::out (void)
++ACE_INLINE IR_UsesDef_ptr &
++IR_UsesDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::UsesDef::_nil ();
++ this->ptr_ = IR_UsesDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDef_ptr
+-IR::UsesDef_var::_retn (void)
++ACE_INLINE IR_UsesDef_ptr
++IR_UsesDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::UsesDef_ptr val = this->ptr_;
+- this->ptr_ = IR::UsesDef::_nil ();
++ IR_UsesDef_ptr val = this->ptr_;
++ this->ptr_ = IR_UsesDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_USESDEF___OUT_CI_)
+-#define _TAO_IR_USESDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::UsesDef_out
++// Inline operations for class IR_UsesDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UsesDef_out::UsesDef_out (IR::UsesDef_ptr &p)
++IR_UsesDef_out::IR_UsesDef_out (IR_UsesDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::UsesDef::_nil ();
++ this->ptr_ = IR_UsesDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::UsesDef_out::UsesDef_out (IR::UsesDef_var &p) // constructor from _var
++IR_UsesDef_out::IR_UsesDef_out (IR_UsesDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::UsesDef::_nil ();
++ this->ptr_ = IR_UsesDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::UsesDef_out::UsesDef_out (const IR::UsesDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::UsesDef_out&,p).ptr_)
++IR_UsesDef_out::IR_UsesDef_out (const IR_UsesDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_UsesDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::UsesDef_out &
+-IR::UsesDef_out::operator= (const IR::UsesDef_out &p)
++ACE_INLINE IR_UsesDef_out &
++IR_UsesDef_out::operator= (const IR_UsesDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::UsesDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_UsesDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::UsesDef_out &
+-IR::UsesDef_out::operator= (const IR::UsesDef_var &p)
++ACE_INLINE IR_UsesDef_out &
++IR_UsesDef_out::operator= (const IR_UsesDef_var &p)
+ {
+- this->ptr_ = IR::UsesDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_UsesDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::UsesDef_out &
+-IR::UsesDef_out::operator= (IR::UsesDef_ptr p)
++ACE_INLINE IR_UsesDef_out &
++IR_UsesDef_out::operator= (IR_UsesDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UsesDef_out::operator IR::UsesDef_ptr &() // cast
++IR_UsesDef_out::operator IR_UsesDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDef_ptr &
+-IR::UsesDef_out::ptr (void) // ptr
++ACE_INLINE IR_UsesDef_ptr &
++IR_UsesDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDef_ptr
+-IR::UsesDef_out::operator-> (void)
++ACE_INLINE IR_UsesDef_ptr
++IR_UsesDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_USESDEFSEQ_CI_
+-
+- ACE_INLINE IR::UsesDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_UsesDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::UsesDef **buf = 0;
++ IR_UsesDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::UsesDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_UsesDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::UsesDef::_nil ();
++ buf[i] = IR_UsesDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR::UsesDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::freebuf (IR_UsesDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -5198,36 +4740,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::UsesDef* *value,
++ IR_UsesDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::UsesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
+- IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_UsesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::allocbuf (this->maximum_);
++ IR_UsesDef ** const tmp2 = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_UsesDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -5237,20 +4779,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_UsesDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::UsesDef **tmp = ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
++ IR_UsesDef **tmp = ACE_reinterpret_cast (IR_UsesDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::UsesDef::_nil ();
++ tmp[i] = IR_UsesDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -5263,28 +4805,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::UsesDef **tmp1 = ACE_reinterpret_cast (IR::UsesDef **, this->buffer_);
+- IR::UsesDef ** const tmp2 = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_UsesDef **tmp1 = ACE_reinterpret_cast (IR_UsesDef **, this->buffer_);
++ IR_UsesDef ** const tmp2 = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::UsesDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_UsesDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::UsesDef ** const tmp = ACE_reinterpret_cast (IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::UsesDef,IR::UsesDef_var> (tmp + index, this->release_);
++ IR_UsesDef ** const tmp = ACE_reinterpret_cast (IR_UsesDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_UsesDef,IR_UsesDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::UsesDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_UsesDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::UsesDef **result = 0;
++ IR_UsesDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -5296,7 +4838,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::UsesDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_UsesDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -5305,7 +4847,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::UsesDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_UsesDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -5315,160 +4857,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::UsesDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_UsesDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_UsesDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::UsesDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_UsesDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_USESDEFSEQ_CI_)
+-#define _TAO_IR_USESDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::UsesDefSeq_var
++// Inline operations for class IR_UsesDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UsesDefSeq_var::UsesDefSeq_var (void) // default constructor
++IR_UsesDefSeq_var::IR_UsesDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::UsesDefSeq_var::UsesDefSeq_var (UsesDefSeq *p)
++IR_UsesDefSeq_var::IR_UsesDefSeq_var (IR_UsesDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::UsesDefSeq_var::UsesDefSeq_var (const ::IR::UsesDefSeq_var &p) // copy constructor
++IR_UsesDefSeq_var::IR_UsesDefSeq_var (const ::IR_UsesDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::UsesDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_UsesDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UsesDefSeq_var::~UsesDefSeq_var (void) // destructor
++IR_UsesDefSeq_var::~IR_UsesDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDefSeq_var &
+-IR::UsesDefSeq_var::operator= (UsesDefSeq *p)
++ACE_INLINE IR_UsesDefSeq_var &
++IR_UsesDefSeq_var::operator= (IR_UsesDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::UsesDefSeq_var &
+-IR::UsesDefSeq_var::operator= (const ::IR::UsesDefSeq_var &p) // deep copy
++ACE_INLINE IR_UsesDefSeq_var &
++IR_UsesDefSeq_var::operator= (const ::IR_UsesDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::UsesDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_UsesDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::UsesDefSeq *
+-IR::UsesDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_UsesDefSeq *
++IR_UsesDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDefSeq *
+-IR::UsesDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_UsesDefSeq *
++IR_UsesDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDefSeq_var::operator const ::IR::UsesDefSeq &() const // cast
++IR_UsesDefSeq_var::operator const ::IR_UsesDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDefSeq_var::operator ::IR::UsesDefSeq &() // cast
++IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDefSeq_var::operator ::IR::UsesDefSeq &() const // cast
++IR_UsesDefSeq_var::operator ::IR_UsesDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::UsesDefSeq_var::operator ::IR::UsesDefSeq *&() // cast
++IR_UsesDefSeq_var::operator ::IR_UsesDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::UsesDef, IR::UsesDef_var>
+-IR::UsesDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var>
++IR_UsesDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::UsesDefSeq &
+-IR::UsesDefSeq_var::in (void) const
++ACE_INLINE const ::IR_UsesDefSeq &
++IR_UsesDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDefSeq &
+-IR::UsesDefSeq_var::inout (void)
++ACE_INLINE ::IR_UsesDefSeq &
++IR_UsesDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::UsesDefSeq *&
+-IR::UsesDefSeq_var::out (void)
++ACE_INLINE ::IR_UsesDefSeq *&
++IR_UsesDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDefSeq *
+-IR::UsesDefSeq_var::_retn (void)
++ACE_INLINE ::IR_UsesDefSeq *
++IR_UsesDefSeq_var::_retn (void)
+ {
+- ::IR::UsesDefSeq *tmp = this->ptr_;
++ ::IR_UsesDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::UsesDefSeq *
+-IR::UsesDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_UsesDefSeq *
++IR_UsesDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::UsesDefSeq_out
++// Inline operations for class IR_UsesDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UsesDefSeq_out::UsesDefSeq_out (UsesDefSeq *&p)
++IR_UsesDefSeq_out::IR_UsesDefSeq_out (IR_UsesDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UsesDefSeq_out::UsesDefSeq_out (UsesDefSeq_var &p) // constructor from _var
++IR_UsesDefSeq_out::IR_UsesDefSeq_out (IR_UsesDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -5476,57 +5011,50 @@
+ }
+
+ ACE_INLINE
+-IR::UsesDefSeq_out::UsesDefSeq_out (const ::IR::UsesDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (UsesDefSeq_out&, p).ptr_)
++IR_UsesDefSeq_out::IR_UsesDefSeq_out (const ::IR_UsesDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_UsesDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::UsesDefSeq_out &
+-IR::UsesDefSeq_out::operator= (const ::IR::UsesDefSeq_out &p)
++ACE_INLINE ::IR_UsesDefSeq_out &
++IR_UsesDefSeq_out::operator= (const ::IR_UsesDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (UsesDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_UsesDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::UsesDefSeq_out &
+-IR::UsesDefSeq_out::operator= (UsesDefSeq *p)
++ACE_INLINE ::IR_UsesDefSeq_out &
++IR_UsesDefSeq_out::operator= (IR_UsesDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UsesDefSeq_out::operator ::IR::UsesDefSeq *&() // cast
++IR_UsesDefSeq_out::operator ::IR_UsesDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDefSeq *&
+-IR::UsesDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_UsesDefSeq *&
++IR_UsesDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDefSeq *
+-IR::UsesDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_UsesDefSeq *
++IR_UsesDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::UsesDef, IR::UsesDef_var>
+-IR::UsesDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_UsesDef, IR_UsesDef_var>
++IR_UsesDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_HOMEDEF___CI_)
+-#define _TAO_IR_HOMEDEF___CI_
+-
+ ACE_INLINE
+-IR::HomeDef::HomeDef (
++IR_HomeDef::IR_HomeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -5536,200 +5064,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_HOMEDEF___VAR_CI_)
+-#define _TAO_IR_HOMEDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::HomeDef_var
++// Inline operations for class IR_HomeDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::HomeDef_var::HomeDef_var (void) // default constructor
+- : ptr_ (IR::HomeDef::_nil ())
++IR_HomeDef_var::IR_HomeDef_var (void) // default constructor
++ : ptr_ (IR_HomeDef::_nil ())
+ {}
+
+-ACE_INLINE IR::HomeDef_ptr
+-IR::HomeDef_var::ptr (void) const
++ACE_INLINE IR_HomeDef_ptr
++IR_HomeDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::HomeDef_var::HomeDef_var (const IR::HomeDef_var &p) // copy constructor
++IR_HomeDef_var::IR_HomeDef_var (const IR_HomeDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (HomeDef::_duplicate (p.ptr ()))
++ ptr_ (IR_HomeDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::HomeDef_var::~HomeDef_var (void) // destructor
++IR_HomeDef_var::~IR_HomeDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::HomeDef_var &
+-IR::HomeDef_var::operator= (IR::HomeDef_ptr p)
++ACE_INLINE IR_HomeDef_var &
++IR_HomeDef_var::operator= (IR_HomeDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::HomeDef_var &
+-IR::HomeDef_var::operator= (const IR::HomeDef_var &p)
++ACE_INLINE IR_HomeDef_var &
++IR_HomeDef_var::operator= (const IR_HomeDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::HomeDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_HomeDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::HomeDef_var::operator const IR::HomeDef_ptr &() const // cast
++IR_HomeDef_var::operator const IR_HomeDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::HomeDef_var::operator IR::HomeDef_ptr &() // cast
++IR_HomeDef_var::operator IR_HomeDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDef_ptr
+-IR::HomeDef_var::operator-> (void) const
++ACE_INLINE IR_HomeDef_ptr
++IR_HomeDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDef_ptr
+-IR::HomeDef_var::in (void) const
++ACE_INLINE IR_HomeDef_ptr
++IR_HomeDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDef_ptr &
+-IR::HomeDef_var::inout (void)
++ACE_INLINE IR_HomeDef_ptr &
++IR_HomeDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDef_ptr &
+-IR::HomeDef_var::out (void)
++ACE_INLINE IR_HomeDef_ptr &
++IR_HomeDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::HomeDef::_nil ();
++ this->ptr_ = IR_HomeDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDef_ptr
+-IR::HomeDef_var::_retn (void)
++ACE_INLINE IR_HomeDef_ptr
++IR_HomeDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::HomeDef_ptr val = this->ptr_;
+- this->ptr_ = IR::HomeDef::_nil ();
++ IR_HomeDef_ptr val = this->ptr_;
++ this->ptr_ = IR_HomeDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_HOMEDEF___OUT_CI_)
+-#define _TAO_IR_HOMEDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::HomeDef_out
++// Inline operations for class IR_HomeDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::HomeDef_out::HomeDef_out (IR::HomeDef_ptr &p)
++IR_HomeDef_out::IR_HomeDef_out (IR_HomeDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::HomeDef::_nil ();
++ this->ptr_ = IR_HomeDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::HomeDef_out::HomeDef_out (IR::HomeDef_var &p) // constructor from _var
++IR_HomeDef_out::IR_HomeDef_out (IR_HomeDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::HomeDef::_nil ();
++ this->ptr_ = IR_HomeDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::HomeDef_out::HomeDef_out (const IR::HomeDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::HomeDef_out&,p).ptr_)
++IR_HomeDef_out::IR_HomeDef_out (const IR_HomeDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_HomeDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::HomeDef_out &
+-IR::HomeDef_out::operator= (const IR::HomeDef_out &p)
++ACE_INLINE IR_HomeDef_out &
++IR_HomeDef_out::operator= (const IR_HomeDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::HomeDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_HomeDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::HomeDef_out &
+-IR::HomeDef_out::operator= (const IR::HomeDef_var &p)
++ACE_INLINE IR_HomeDef_out &
++IR_HomeDef_out::operator= (const IR_HomeDef_var &p)
+ {
+- this->ptr_ = IR::HomeDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_HomeDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::HomeDef_out &
+-IR::HomeDef_out::operator= (IR::HomeDef_ptr p)
++ACE_INLINE IR_HomeDef_out &
++IR_HomeDef_out::operator= (IR_HomeDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::HomeDef_out::operator IR::HomeDef_ptr &() // cast
++IR_HomeDef_out::operator IR_HomeDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDef_ptr &
+-IR::HomeDef_out::ptr (void) // ptr
++ACE_INLINE IR_HomeDef_ptr &
++IR_HomeDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDef_ptr
+-IR::HomeDef_out::operator-> (void)
++ACE_INLINE IR_HomeDef_ptr
++IR_HomeDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_HOMEDEFSEQ_CI_
+-
+- ACE_INLINE IR::HomeDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_HomeDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::HomeDef **buf = 0;
++ IR_HomeDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::HomeDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_HomeDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::HomeDef::_nil ();
++ buf[i] = IR_HomeDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR::HomeDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::freebuf (IR_HomeDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -5737,36 +5244,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::HomeDef* *value,
++ IR_HomeDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq(const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::HomeDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
+- IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_HomeDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::allocbuf (this->maximum_);
++ IR_HomeDef ** const tmp2 = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_HomeDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -5776,20 +5283,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_HomeDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::HomeDef **tmp = ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
++ IR_HomeDef **tmp = ACE_reinterpret_cast (IR_HomeDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::HomeDef::_nil ();
++ tmp[i] = IR_HomeDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -5802,28 +5309,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::HomeDef **tmp1 = ACE_reinterpret_cast (IR::HomeDef **, this->buffer_);
+- IR::HomeDef ** const tmp2 = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_HomeDef **tmp1 = ACE_reinterpret_cast (IR_HomeDef **, this->buffer_);
++ IR_HomeDef ** const tmp2 = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::HomeDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_HomeDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::HomeDef ** const tmp = ACE_reinterpret_cast (IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::HomeDef,IR::HomeDef_var> (tmp + index, this->release_);
++ IR_HomeDef ** const tmp = ACE_reinterpret_cast (IR_HomeDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_HomeDef,IR_HomeDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::HomeDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_HomeDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::HomeDef **result = 0;
++ IR_HomeDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -5835,7 +5342,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::HomeDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_HomeDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -5844,7 +5351,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::HomeDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_HomeDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -5854,160 +5361,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::HomeDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_HomeDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_HomeDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::HomeDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_HomeDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_HOMEDEFSEQ_CI_)
+-#define _TAO_IR_HOMEDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::HomeDefSeq_var
++// Inline operations for class IR_HomeDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::HomeDefSeq_var::HomeDefSeq_var (void) // default constructor
++IR_HomeDefSeq_var::IR_HomeDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::HomeDefSeq_var::HomeDefSeq_var (HomeDefSeq *p)
++IR_HomeDefSeq_var::IR_HomeDefSeq_var (IR_HomeDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::HomeDefSeq_var::HomeDefSeq_var (const ::IR::HomeDefSeq_var &p) // copy constructor
++IR_HomeDefSeq_var::IR_HomeDefSeq_var (const ::IR_HomeDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::HomeDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_HomeDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::HomeDefSeq_var::~HomeDefSeq_var (void) // destructor
++IR_HomeDefSeq_var::~IR_HomeDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDefSeq_var &
+-IR::HomeDefSeq_var::operator= (HomeDefSeq *p)
++ACE_INLINE IR_HomeDefSeq_var &
++IR_HomeDefSeq_var::operator= (IR_HomeDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::HomeDefSeq_var &
+-IR::HomeDefSeq_var::operator= (const ::IR::HomeDefSeq_var &p) // deep copy
++ACE_INLINE IR_HomeDefSeq_var &
++IR_HomeDefSeq_var::operator= (const ::IR_HomeDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::HomeDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_HomeDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::HomeDefSeq *
+-IR::HomeDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_HomeDefSeq *
++IR_HomeDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDefSeq *
+-IR::HomeDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_HomeDefSeq *
++IR_HomeDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::HomeDefSeq_var::operator const ::IR::HomeDefSeq &() const // cast
++IR_HomeDefSeq_var::operator const ::IR_HomeDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::HomeDefSeq_var::operator ::IR::HomeDefSeq &() // cast
++IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::HomeDefSeq_var::operator ::IR::HomeDefSeq &() const // cast
++IR_HomeDefSeq_var::operator ::IR_HomeDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::HomeDefSeq_var::operator ::IR::HomeDefSeq *&() // cast
++IR_HomeDefSeq_var::operator ::IR_HomeDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::HomeDef, IR::HomeDef_var>
+-IR::HomeDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var>
++IR_HomeDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::HomeDefSeq &
+-IR::HomeDefSeq_var::in (void) const
++ACE_INLINE const ::IR_HomeDefSeq &
++IR_HomeDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDefSeq &
+-IR::HomeDefSeq_var::inout (void)
++ACE_INLINE ::IR_HomeDefSeq &
++IR_HomeDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::HomeDefSeq *&
+-IR::HomeDefSeq_var::out (void)
++ACE_INLINE ::IR_HomeDefSeq *&
++IR_HomeDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDefSeq *
+-IR::HomeDefSeq_var::_retn (void)
++ACE_INLINE ::IR_HomeDefSeq *
++IR_HomeDefSeq_var::_retn (void)
+ {
+- ::IR::HomeDefSeq *tmp = this->ptr_;
++ ::IR_HomeDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::HomeDefSeq *
+-IR::HomeDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_HomeDefSeq *
++IR_HomeDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::HomeDefSeq_out
++// Inline operations for class IR_HomeDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::HomeDefSeq_out::HomeDefSeq_out (HomeDefSeq *&p)
++IR_HomeDefSeq_out::IR_HomeDefSeq_out (IR_HomeDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::HomeDefSeq_out::HomeDefSeq_out (HomeDefSeq_var &p) // constructor from _var
++IR_HomeDefSeq_out::IR_HomeDefSeq_out (IR_HomeDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -6015,57 +5515,50 @@
+ }
+
+ ACE_INLINE
+-IR::HomeDefSeq_out::HomeDefSeq_out (const ::IR::HomeDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (HomeDefSeq_out&, p).ptr_)
++IR_HomeDefSeq_out::IR_HomeDefSeq_out (const ::IR_HomeDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_HomeDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::HomeDefSeq_out &
+-IR::HomeDefSeq_out::operator= (const ::IR::HomeDefSeq_out &p)
++ACE_INLINE ::IR_HomeDefSeq_out &
++IR_HomeDefSeq_out::operator= (const ::IR_HomeDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (HomeDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_HomeDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::HomeDefSeq_out &
+-IR::HomeDefSeq_out::operator= (HomeDefSeq *p)
++ACE_INLINE ::IR_HomeDefSeq_out &
++IR_HomeDefSeq_out::operator= (IR_HomeDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::HomeDefSeq_out::operator ::IR::HomeDefSeq *&() // cast
++IR_HomeDefSeq_out::operator ::IR_HomeDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDefSeq *&
+-IR::HomeDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_HomeDefSeq *&
++IR_HomeDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDefSeq *
+-IR::HomeDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_HomeDefSeq *
++IR_HomeDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::HomeDef, IR::HomeDef_var>
+-IR::HomeDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_HomeDef, IR_HomeDef_var>
++IR_HomeDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF___CI_)
+-#define _TAO_IR_EVENTDEF___CI_
+-
+ ACE_INLINE
+-IR::EventDef::EventDef (
++IR_EventDef::IR_EventDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -6075,185 +5568,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF___VAR_CI_)
+-#define _TAO_IR_EVENTDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::EventDef_var
++// Inline operations for class IR_EventDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EventDef_var::EventDef_var (void) // default constructor
+- : ptr_ (IR::EventDef::_nil ())
++IR_EventDef_var::IR_EventDef_var (void) // default constructor
++ : ptr_ (IR_EventDef::_nil ())
+ {}
+
+-ACE_INLINE IR::EventDef_ptr
+-IR::EventDef_var::ptr (void) const
++ACE_INLINE IR_EventDef_ptr
++IR_EventDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EventDef_var::EventDef_var (const IR::EventDef_var &p) // copy constructor
++IR_EventDef_var::IR_EventDef_var (const IR_EventDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (EventDef::_duplicate (p.ptr ()))
++ ptr_ (IR_EventDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::EventDef_var::~EventDef_var (void) // destructor
++IR_EventDef_var::~IR_EventDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::EventDef_var &
+-IR::EventDef_var::operator= (IR::EventDef_ptr p)
++ACE_INLINE IR_EventDef_var &
++IR_EventDef_var::operator= (IR_EventDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::EventDef_var &
+-IR::EventDef_var::operator= (const IR::EventDef_var &p)
++ACE_INLINE IR_EventDef_var &
++IR_EventDef_var::operator= (const IR_EventDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EventDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_EventDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EventDef_var::operator const IR::EventDef_ptr &() const // cast
++IR_EventDef_var::operator const IR_EventDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EventDef_var::operator IR::EventDef_ptr &() // cast
++IR_EventDef_var::operator IR_EventDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EventDef_ptr
+-IR::EventDef_var::operator-> (void) const
++ACE_INLINE IR_EventDef_ptr
++IR_EventDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EventDef_ptr
+-IR::EventDef_var::in (void) const
++ACE_INLINE IR_EventDef_ptr
++IR_EventDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EventDef_ptr &
+-IR::EventDef_var::inout (void)
++ACE_INLINE IR_EventDef_ptr &
++IR_EventDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EventDef_ptr &
+-IR::EventDef_var::out (void)
++ACE_INLINE IR_EventDef_ptr &
++IR_EventDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EventDef::_nil ();
++ this->ptr_ = IR_EventDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EventDef_ptr
+-IR::EventDef_var::_retn (void)
++ACE_INLINE IR_EventDef_ptr
++IR_EventDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::EventDef_ptr val = this->ptr_;
+- this->ptr_ = IR::EventDef::_nil ();
++ IR_EventDef_ptr val = this->ptr_;
++ this->ptr_ = IR_EventDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EVENTDEF___OUT_CI_)
+-#define _TAO_IR_EVENTDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::EventDef_out
++// Inline operations for class IR_EventDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EventDef_out::EventDef_out (IR::EventDef_ptr &p)
++IR_EventDef_out::IR_EventDef_out (IR_EventDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::EventDef::_nil ();
++ this->ptr_ = IR_EventDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::EventDef_out::EventDef_out (IR::EventDef_var &p) // constructor from _var
++IR_EventDef_out::IR_EventDef_out (IR_EventDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EventDef::_nil ();
++ this->ptr_ = IR_EventDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::EventDef_out::EventDef_out (const IR::EventDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::EventDef_out&,p).ptr_)
++IR_EventDef_out::IR_EventDef_out (const IR_EventDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_EventDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::EventDef_out &
+-IR::EventDef_out::operator= (const IR::EventDef_out &p)
++ACE_INLINE IR_EventDef_out &
++IR_EventDef_out::operator= (const IR_EventDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::EventDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_EventDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::EventDef_out &
+-IR::EventDef_out::operator= (const IR::EventDef_var &p)
++ACE_INLINE IR_EventDef_out &
++IR_EventDef_out::operator= (const IR_EventDef_var &p)
+ {
+- this->ptr_ = IR::EventDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_EventDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::EventDef_out &
+-IR::EventDef_out::operator= (IR::EventDef_ptr p)
++ACE_INLINE IR_EventDef_out &
++IR_EventDef_out::operator= (IR_EventDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EventDef_out::operator IR::EventDef_ptr &() // cast
++IR_EventDef_out::operator IR_EventDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EventDef_ptr &
+-IR::EventDef_out::ptr (void) // ptr
++ACE_INLINE IR_EventDef_ptr &
++IR_EventDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EventDef_ptr
+-IR::EventDef_out::operator-> (void)
++ACE_INLINE IR_EventDef_ptr
++IR_EventDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF___CI_)
+-#define _TAO_IR_EMITSDEF___CI_
+-
+ ACE_INLINE
+-IR::EmitsDef::EmitsDef (
++IR_EmitsDef::IR_EmitsDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -6263,200 +5735,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF___VAR_CI_)
+-#define _TAO_IR_EMITSDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::EmitsDef_var
++// Inline operations for class IR_EmitsDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EmitsDef_var::EmitsDef_var (void) // default constructor
+- : ptr_ (IR::EmitsDef::_nil ())
++IR_EmitsDef_var::IR_EmitsDef_var (void) // default constructor
++ : ptr_ (IR_EmitsDef::_nil ())
+ {}
+
+-ACE_INLINE IR::EmitsDef_ptr
+-IR::EmitsDef_var::ptr (void) const
++ACE_INLINE IR_EmitsDef_ptr
++IR_EmitsDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EmitsDef_var::EmitsDef_var (const IR::EmitsDef_var &p) // copy constructor
++IR_EmitsDef_var::IR_EmitsDef_var (const IR_EmitsDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (EmitsDef::_duplicate (p.ptr ()))
++ ptr_ (IR_EmitsDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::EmitsDef_var::~EmitsDef_var (void) // destructor
++IR_EmitsDef_var::~IR_EmitsDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::EmitsDef_var &
+-IR::EmitsDef_var::operator= (IR::EmitsDef_ptr p)
++ACE_INLINE IR_EmitsDef_var &
++IR_EmitsDef_var::operator= (IR_EmitsDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::EmitsDef_var &
+-IR::EmitsDef_var::operator= (const IR::EmitsDef_var &p)
++ACE_INLINE IR_EmitsDef_var &
++IR_EmitsDef_var::operator= (const IR_EmitsDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EmitsDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_EmitsDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EmitsDef_var::operator const IR::EmitsDef_ptr &() const // cast
++IR_EmitsDef_var::operator const IR_EmitsDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EmitsDef_var::operator IR::EmitsDef_ptr &() // cast
++IR_EmitsDef_var::operator IR_EmitsDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EmitsDef_ptr
+-IR::EmitsDef_var::operator-> (void) const
++ACE_INLINE IR_EmitsDef_ptr
++IR_EmitsDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EmitsDef_ptr
+-IR::EmitsDef_var::in (void) const
++ACE_INLINE IR_EmitsDef_ptr
++IR_EmitsDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EmitsDef_ptr &
+-IR::EmitsDef_var::inout (void)
++ACE_INLINE IR_EmitsDef_ptr &
++IR_EmitsDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EmitsDef_ptr &
+-IR::EmitsDef_var::out (void)
++ACE_INLINE IR_EmitsDef_ptr &
++IR_EmitsDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EmitsDef::_nil ();
++ this->ptr_ = IR_EmitsDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EmitsDef_ptr
+-IR::EmitsDef_var::_retn (void)
++ACE_INLINE IR_EmitsDef_ptr
++IR_EmitsDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::EmitsDef_ptr val = this->ptr_;
+- this->ptr_ = IR::EmitsDef::_nil ();
++ IR_EmitsDef_ptr val = this->ptr_;
++ this->ptr_ = IR_EmitsDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_EMITSDEF___OUT_CI_)
+-#define _TAO_IR_EMITSDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::EmitsDef_out
++// Inline operations for class IR_EmitsDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EmitsDef_out::EmitsDef_out (IR::EmitsDef_ptr &p)
++IR_EmitsDef_out::IR_EmitsDef_out (IR_EmitsDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::EmitsDef::_nil ();
++ this->ptr_ = IR_EmitsDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::EmitsDef_out::EmitsDef_out (IR::EmitsDef_var &p) // constructor from _var
++IR_EmitsDef_out::IR_EmitsDef_out (IR_EmitsDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::EmitsDef::_nil ();
++ this->ptr_ = IR_EmitsDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::EmitsDef_out::EmitsDef_out (const IR::EmitsDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::EmitsDef_out&,p).ptr_)
++IR_EmitsDef_out::IR_EmitsDef_out (const IR_EmitsDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_EmitsDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::EmitsDef_out &
+-IR::EmitsDef_out::operator= (const IR::EmitsDef_out &p)
++ACE_INLINE IR_EmitsDef_out &
++IR_EmitsDef_out::operator= (const IR_EmitsDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::EmitsDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_EmitsDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::EmitsDef_out &
+-IR::EmitsDef_out::operator= (const IR::EmitsDef_var &p)
++ACE_INLINE IR_EmitsDef_out &
++IR_EmitsDef_out::operator= (const IR_EmitsDef_var &p)
+ {
+- this->ptr_ = IR::EmitsDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_EmitsDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::EmitsDef_out &
+-IR::EmitsDef_out::operator= (IR::EmitsDef_ptr p)
++ACE_INLINE IR_EmitsDef_out &
++IR_EmitsDef_out::operator= (IR_EmitsDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EmitsDef_out::operator IR::EmitsDef_ptr &() // cast
++IR_EmitsDef_out::operator IR_EmitsDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EmitsDef_ptr &
+-IR::EmitsDef_out::ptr (void) // ptr
++ACE_INLINE IR_EmitsDef_ptr &
++IR_EmitsDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::EmitsDef_ptr
+-IR::EmitsDef_out::operator-> (void)
++ACE_INLINE IR_EmitsDef_ptr
++IR_EmitsDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EMITSDEFSEQ_CI_
+-
+- ACE_INLINE IR::EmitsDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_EmitsDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::EmitsDef **buf = 0;
++ IR_EmitsDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::EmitsDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_EmitsDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::EmitsDef::_nil ();
++ buf[i] = IR_EmitsDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR::EmitsDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::freebuf (IR_EmitsDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -6464,36 +5915,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::EmitsDef* *value,
++ IR_EmitsDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq(const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::EmitsDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
+- IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_EmitsDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::allocbuf (this->maximum_);
++ IR_EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_EmitsDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -6503,20 +5954,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::EmitsDef **tmp = ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
++ IR_EmitsDef **tmp = ACE_reinterpret_cast (IR_EmitsDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::EmitsDef::_nil ();
++ tmp[i] = IR_EmitsDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -6529,28 +5980,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::EmitsDef **tmp1 = ACE_reinterpret_cast (IR::EmitsDef **, this->buffer_);
+- IR::EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_EmitsDef **tmp1 = ACE_reinterpret_cast (IR_EmitsDef **, this->buffer_);
++ IR_EmitsDef ** const tmp2 = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::EmitsDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_EmitsDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::EmitsDef ** const tmp = ACE_reinterpret_cast (IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::EmitsDef,IR::EmitsDef_var> (tmp + index, this->release_);
++ IR_EmitsDef ** const tmp = ACE_reinterpret_cast (IR_EmitsDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_EmitsDef,IR_EmitsDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::EmitsDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_EmitsDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::EmitsDef **result = 0;
++ IR_EmitsDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -6562,7 +6013,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::EmitsDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_EmitsDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -6571,7 +6022,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::EmitsDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_EmitsDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -6581,160 +6032,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::EmitsDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_EmitsDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_EmitsDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::EmitsDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_EmitsDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EMITSDEFSEQ_CI_)
+-#define _TAO_IR_EMITSDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::EmitsDefSeq_var
++// Inline operations for class IR_EmitsDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EmitsDefSeq_var::EmitsDefSeq_var (void) // default constructor
++IR_EmitsDefSeq_var::IR_EmitsDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::EmitsDefSeq_var::EmitsDefSeq_var (EmitsDefSeq *p)
++IR_EmitsDefSeq_var::IR_EmitsDefSeq_var (IR_EmitsDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::EmitsDefSeq_var::EmitsDefSeq_var (const ::IR::EmitsDefSeq_var &p) // copy constructor
++IR_EmitsDefSeq_var::IR_EmitsDefSeq_var (const ::IR_EmitsDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::EmitsDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_EmitsDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::EmitsDefSeq_var::~EmitsDefSeq_var (void) // destructor
++IR_EmitsDefSeq_var::~IR_EmitsDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::EmitsDefSeq_var &
+-IR::EmitsDefSeq_var::operator= (EmitsDefSeq *p)
++ACE_INLINE IR_EmitsDefSeq_var &
++IR_EmitsDefSeq_var::operator= (IR_EmitsDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::EmitsDefSeq_var &
+-IR::EmitsDefSeq_var::operator= (const ::IR::EmitsDefSeq_var &p) // deep copy
++ACE_INLINE IR_EmitsDefSeq_var &
++IR_EmitsDefSeq_var::operator= (const ::IR_EmitsDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::EmitsDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_EmitsDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::EmitsDefSeq *
+-IR::EmitsDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_EmitsDefSeq *
++IR_EmitsDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EmitsDefSeq *
+-IR::EmitsDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_EmitsDefSeq *
++IR_EmitsDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EmitsDefSeq_var::operator const ::IR::EmitsDefSeq &() const // cast
++IR_EmitsDefSeq_var::operator const ::IR_EmitsDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq &() // cast
++IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq &() const // cast
++IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::EmitsDefSeq_var::operator ::IR::EmitsDefSeq *&() // cast
++IR_EmitsDefSeq_var::operator ::IR_EmitsDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::EmitsDef, IR::EmitsDef_var>
+-IR::EmitsDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var>
++IR_EmitsDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::EmitsDefSeq &
+-IR::EmitsDefSeq_var::in (void) const
++ACE_INLINE const ::IR_EmitsDefSeq &
++IR_EmitsDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EmitsDefSeq &
+-IR::EmitsDefSeq_var::inout (void)
++ACE_INLINE ::IR_EmitsDefSeq &
++IR_EmitsDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::EmitsDefSeq *&
+-IR::EmitsDefSeq_var::out (void)
++ACE_INLINE ::IR_EmitsDefSeq *&
++IR_EmitsDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EmitsDefSeq *
+-IR::EmitsDefSeq_var::_retn (void)
++ACE_INLINE ::IR_EmitsDefSeq *
++IR_EmitsDefSeq_var::_retn (void)
+ {
+- ::IR::EmitsDefSeq *tmp = this->ptr_;
++ ::IR_EmitsDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::EmitsDefSeq *
+-IR::EmitsDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_EmitsDefSeq *
++IR_EmitsDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::EmitsDefSeq_out
++// Inline operations for class IR_EmitsDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EmitsDefSeq_out::EmitsDefSeq_out (EmitsDefSeq *&p)
++IR_EmitsDefSeq_out::IR_EmitsDefSeq_out (IR_EmitsDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::EmitsDefSeq_out::EmitsDefSeq_out (EmitsDefSeq_var &p) // constructor from _var
++IR_EmitsDefSeq_out::IR_EmitsDefSeq_out (IR_EmitsDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -6742,57 +6186,50 @@
+ }
+
+ ACE_INLINE
+-IR::EmitsDefSeq_out::EmitsDefSeq_out (const ::IR::EmitsDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (EmitsDefSeq_out&, p).ptr_)
++IR_EmitsDefSeq_out::IR_EmitsDefSeq_out (const ::IR_EmitsDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_EmitsDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::EmitsDefSeq_out &
+-IR::EmitsDefSeq_out::operator= (const ::IR::EmitsDefSeq_out &p)
++ACE_INLINE ::IR_EmitsDefSeq_out &
++IR_EmitsDefSeq_out::operator= (const ::IR_EmitsDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (EmitsDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_EmitsDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::EmitsDefSeq_out &
+-IR::EmitsDefSeq_out::operator= (EmitsDefSeq *p)
++ACE_INLINE ::IR_EmitsDefSeq_out &
++IR_EmitsDefSeq_out::operator= (IR_EmitsDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EmitsDefSeq_out::operator ::IR::EmitsDefSeq *&() // cast
++IR_EmitsDefSeq_out::operator ::IR_EmitsDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EmitsDefSeq *&
+-IR::EmitsDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_EmitsDefSeq *&
++IR_EmitsDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EmitsDefSeq *
+-IR::EmitsDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_EmitsDefSeq *
++IR_EmitsDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::EmitsDef, IR::EmitsDef_var>
+-IR::EmitsDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_EmitsDef, IR_EmitsDef_var>
++IR_EmitsDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___CI_)
+-#define _TAO_IR_PUBLISHESDEF___CI_
+-
+ ACE_INLINE
+-IR::PublishesDef::PublishesDef (
++IR_PublishesDef::IR_PublishesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -6802,200 +6239,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___VAR_CI_)
+-#define _TAO_IR_PUBLISHESDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::PublishesDef_var
++// Inline operations for class IR_PublishesDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PublishesDef_var::PublishesDef_var (void) // default constructor
+- : ptr_ (IR::PublishesDef::_nil ())
++IR_PublishesDef_var::IR_PublishesDef_var (void) // default constructor
++ : ptr_ (IR_PublishesDef::_nil ())
+ {}
+
+-ACE_INLINE IR::PublishesDef_ptr
+-IR::PublishesDef_var::ptr (void) const
++ACE_INLINE IR_PublishesDef_ptr
++IR_PublishesDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PublishesDef_var::PublishesDef_var (const IR::PublishesDef_var &p) // copy constructor
++IR_PublishesDef_var::IR_PublishesDef_var (const IR_PublishesDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (PublishesDef::_duplicate (p.ptr ()))
++ ptr_ (IR_PublishesDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::PublishesDef_var::~PublishesDef_var (void) // destructor
++IR_PublishesDef_var::~IR_PublishesDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::PublishesDef_var &
+-IR::PublishesDef_var::operator= (IR::PublishesDef_ptr p)
++ACE_INLINE IR_PublishesDef_var &
++IR_PublishesDef_var::operator= (IR_PublishesDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::PublishesDef_var &
+-IR::PublishesDef_var::operator= (const IR::PublishesDef_var &p)
++ACE_INLINE IR_PublishesDef_var &
++IR_PublishesDef_var::operator= (const IR_PublishesDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PublishesDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_PublishesDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::PublishesDef_var::operator const IR::PublishesDef_ptr &() const // cast
++IR_PublishesDef_var::operator const IR_PublishesDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PublishesDef_var::operator IR::PublishesDef_ptr &() // cast
++IR_PublishesDef_var::operator IR_PublishesDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PublishesDef_ptr
+-IR::PublishesDef_var::operator-> (void) const
++ACE_INLINE IR_PublishesDef_ptr
++IR_PublishesDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PublishesDef_ptr
+-IR::PublishesDef_var::in (void) const
++ACE_INLINE IR_PublishesDef_ptr
++IR_PublishesDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PublishesDef_ptr &
+-IR::PublishesDef_var::inout (void)
++ACE_INLINE IR_PublishesDef_ptr &
++IR_PublishesDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PublishesDef_ptr &
+-IR::PublishesDef_var::out (void)
++ACE_INLINE IR_PublishesDef_ptr &
++IR_PublishesDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PublishesDef::_nil ();
++ this->ptr_ = IR_PublishesDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PublishesDef_ptr
+-IR::PublishesDef_var::_retn (void)
++ACE_INLINE IR_PublishesDef_ptr
++IR_PublishesDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::PublishesDef_ptr val = this->ptr_;
+- this->ptr_ = IR::PublishesDef::_nil ();
++ IR_PublishesDef_ptr val = this->ptr_;
++ this->ptr_ = IR_PublishesDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PUBLISHESDEF___OUT_CI_)
+-#define _TAO_IR_PUBLISHESDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::PublishesDef_out
++// Inline operations for class IR_PublishesDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PublishesDef_out::PublishesDef_out (IR::PublishesDef_ptr &p)
++IR_PublishesDef_out::IR_PublishesDef_out (IR_PublishesDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::PublishesDef::_nil ();
++ this->ptr_ = IR_PublishesDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::PublishesDef_out::PublishesDef_out (IR::PublishesDef_var &p) // constructor from _var
++IR_PublishesDef_out::IR_PublishesDef_out (IR_PublishesDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PublishesDef::_nil ();
++ this->ptr_ = IR_PublishesDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::PublishesDef_out::PublishesDef_out (const IR::PublishesDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::PublishesDef_out&,p).ptr_)
++IR_PublishesDef_out::IR_PublishesDef_out (const IR_PublishesDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_PublishesDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::PublishesDef_out &
+-IR::PublishesDef_out::operator= (const IR::PublishesDef_out &p)
++ACE_INLINE IR_PublishesDef_out &
++IR_PublishesDef_out::operator= (const IR_PublishesDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::PublishesDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_PublishesDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::PublishesDef_out &
+-IR::PublishesDef_out::operator= (const IR::PublishesDef_var &p)
++ACE_INLINE IR_PublishesDef_out &
++IR_PublishesDef_out::operator= (const IR_PublishesDef_var &p)
+ {
+- this->ptr_ = IR::PublishesDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_PublishesDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::PublishesDef_out &
+-IR::PublishesDef_out::operator= (IR::PublishesDef_ptr p)
++ACE_INLINE IR_PublishesDef_out &
++IR_PublishesDef_out::operator= (IR_PublishesDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::PublishesDef_out::operator IR::PublishesDef_ptr &() // cast
++IR_PublishesDef_out::operator IR_PublishesDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PublishesDef_ptr &
+-IR::PublishesDef_out::ptr (void) // ptr
++ACE_INLINE IR_PublishesDef_ptr &
++IR_PublishesDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PublishesDef_ptr
+-IR::PublishesDef_out::operator-> (void)
++ACE_INLINE IR_PublishesDef_ptr
++IR_PublishesDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_PUBLISHESDEFSEQ_CI_
+-
+- ACE_INLINE IR::PublishesDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_PublishesDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::PublishesDef **buf = 0;
++ IR_PublishesDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::PublishesDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_PublishesDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::PublishesDef::_nil ();
++ buf[i] = IR_PublishesDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR::PublishesDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::freebuf (IR_PublishesDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -7003,36 +6419,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::PublishesDef* *value,
++ IR_PublishesDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::PublishesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
+- IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_PublishesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::allocbuf (this->maximum_);
++ IR_PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_PublishesDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -7042,20 +6458,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::PublishesDef **tmp = ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
++ IR_PublishesDef **tmp = ACE_reinterpret_cast (IR_PublishesDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::PublishesDef::_nil ();
++ tmp[i] = IR_PublishesDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -7068,28 +6484,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::PublishesDef **tmp1 = ACE_reinterpret_cast (IR::PublishesDef **, this->buffer_);
+- IR::PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_PublishesDef **tmp1 = ACE_reinterpret_cast (IR_PublishesDef **, this->buffer_);
++ IR_PublishesDef ** const tmp2 = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::PublishesDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_PublishesDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::PublishesDef ** const tmp = ACE_reinterpret_cast (IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::PublishesDef,IR::PublishesDef_var> (tmp + index, this->release_);
++ IR_PublishesDef ** const tmp = ACE_reinterpret_cast (IR_PublishesDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_PublishesDef,IR_PublishesDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::PublishesDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_PublishesDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::PublishesDef **result = 0;
++ IR_PublishesDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -7101,7 +6517,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::PublishesDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_PublishesDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -7110,7 +6526,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::PublishesDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_PublishesDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -7120,160 +6536,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::PublishesDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_PublishesDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_PublishesDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::PublishesDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_PublishesDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PUBLISHESDEFSEQ_CI_)
+-#define _TAO_IR_PUBLISHESDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::PublishesDefSeq_var
++// Inline operations for class IR_PublishesDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PublishesDefSeq_var::PublishesDefSeq_var (void) // default constructor
++IR_PublishesDefSeq_var::IR_PublishesDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::PublishesDefSeq_var::PublishesDefSeq_var (PublishesDefSeq *p)
++IR_PublishesDefSeq_var::IR_PublishesDefSeq_var (IR_PublishesDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::PublishesDefSeq_var::PublishesDefSeq_var (const ::IR::PublishesDefSeq_var &p) // copy constructor
++IR_PublishesDefSeq_var::IR_PublishesDefSeq_var (const ::IR_PublishesDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::PublishesDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_PublishesDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::PublishesDefSeq_var::~PublishesDefSeq_var (void) // destructor
++IR_PublishesDefSeq_var::~IR_PublishesDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::PublishesDefSeq_var &
+-IR::PublishesDefSeq_var::operator= (PublishesDefSeq *p)
++ACE_INLINE IR_PublishesDefSeq_var &
++IR_PublishesDefSeq_var::operator= (IR_PublishesDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::PublishesDefSeq_var &
+-IR::PublishesDefSeq_var::operator= (const ::IR::PublishesDefSeq_var &p) // deep copy
++ACE_INLINE IR_PublishesDefSeq_var &
++IR_PublishesDefSeq_var::operator= (const ::IR_PublishesDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::PublishesDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_PublishesDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::PublishesDefSeq *
+-IR::PublishesDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_PublishesDefSeq *
++IR_PublishesDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PublishesDefSeq *
+-IR::PublishesDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_PublishesDefSeq *
++IR_PublishesDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PublishesDefSeq_var::operator const ::IR::PublishesDefSeq &() const // cast
++IR_PublishesDefSeq_var::operator const ::IR_PublishesDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq &() // cast
++IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq &() const // cast
++IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::PublishesDefSeq_var::operator ::IR::PublishesDefSeq *&() // cast
++IR_PublishesDefSeq_var::operator ::IR_PublishesDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::PublishesDef, IR::PublishesDef_var>
+-IR::PublishesDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var>
++IR_PublishesDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::PublishesDefSeq &
+-IR::PublishesDefSeq_var::in (void) const
++ACE_INLINE const ::IR_PublishesDefSeq &
++IR_PublishesDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PublishesDefSeq &
+-IR::PublishesDefSeq_var::inout (void)
++ACE_INLINE ::IR_PublishesDefSeq &
++IR_PublishesDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::PublishesDefSeq *&
+-IR::PublishesDefSeq_var::out (void)
++ACE_INLINE ::IR_PublishesDefSeq *&
++IR_PublishesDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PublishesDefSeq *
+-IR::PublishesDefSeq_var::_retn (void)
++ACE_INLINE ::IR_PublishesDefSeq *
++IR_PublishesDefSeq_var::_retn (void)
+ {
+- ::IR::PublishesDefSeq *tmp = this->ptr_;
++ ::IR_PublishesDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::PublishesDefSeq *
+-IR::PublishesDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_PublishesDefSeq *
++IR_PublishesDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::PublishesDefSeq_out
++// Inline operations for class IR_PublishesDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PublishesDefSeq_out::PublishesDefSeq_out (PublishesDefSeq *&p)
++IR_PublishesDefSeq_out::IR_PublishesDefSeq_out (IR_PublishesDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::PublishesDefSeq_out::PublishesDefSeq_out (PublishesDefSeq_var &p) // constructor from _var
++IR_PublishesDefSeq_out::IR_PublishesDefSeq_out (IR_PublishesDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -7281,57 +6690,50 @@
+ }
+
+ ACE_INLINE
+-IR::PublishesDefSeq_out::PublishesDefSeq_out (const ::IR::PublishesDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (PublishesDefSeq_out&, p).ptr_)
++IR_PublishesDefSeq_out::IR_PublishesDefSeq_out (const ::IR_PublishesDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_PublishesDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::PublishesDefSeq_out &
+-IR::PublishesDefSeq_out::operator= (const ::IR::PublishesDefSeq_out &p)
++ACE_INLINE ::IR_PublishesDefSeq_out &
++IR_PublishesDefSeq_out::operator= (const ::IR_PublishesDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (PublishesDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_PublishesDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::PublishesDefSeq_out &
+-IR::PublishesDefSeq_out::operator= (PublishesDefSeq *p)
++ACE_INLINE ::IR_PublishesDefSeq_out &
++IR_PublishesDefSeq_out::operator= (IR_PublishesDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::PublishesDefSeq_out::operator ::IR::PublishesDefSeq *&() // cast
++IR_PublishesDefSeq_out::operator ::IR_PublishesDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PublishesDefSeq *&
+-IR::PublishesDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_PublishesDefSeq *&
++IR_PublishesDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PublishesDefSeq *
+-IR::PublishesDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_PublishesDefSeq *
++IR_PublishesDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::PublishesDef, IR::PublishesDef_var>
+-IR::PublishesDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_PublishesDef, IR_PublishesDef_var>
++IR_PublishesDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___CI_)
+-#define _TAO_IR_CONSUMESDEF___CI_
+-
+ ACE_INLINE
+-IR::ConsumesDef::ConsumesDef (
++IR_ConsumesDef::IR_ConsumesDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -7341,200 +6743,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___VAR_CI_)
+-#define _TAO_IR_CONSUMESDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ConsumesDef_var
++// Inline operations for class IR_ConsumesDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ConsumesDef_var::ConsumesDef_var (void) // default constructor
+- : ptr_ (IR::ConsumesDef::_nil ())
++IR_ConsumesDef_var::IR_ConsumesDef_var (void) // default constructor
++ : ptr_ (IR_ConsumesDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ConsumesDef_ptr
+-IR::ConsumesDef_var::ptr (void) const
++ACE_INLINE IR_ConsumesDef_ptr
++IR_ConsumesDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDef_var::ConsumesDef_var (const IR::ConsumesDef_var &p) // copy constructor
++IR_ConsumesDef_var::IR_ConsumesDef_var (const IR_ConsumesDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ConsumesDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ConsumesDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ConsumesDef_var::~ConsumesDef_var (void) // destructor
++IR_ConsumesDef_var::~IR_ConsumesDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ConsumesDef_var &
+-IR::ConsumesDef_var::operator= (IR::ConsumesDef_ptr p)
++ACE_INLINE IR_ConsumesDef_var &
++IR_ConsumesDef_var::operator= (IR_ConsumesDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ConsumesDef_var &
+-IR::ConsumesDef_var::operator= (const IR::ConsumesDef_var &p)
++ACE_INLINE IR_ConsumesDef_var &
++IR_ConsumesDef_var::operator= (const IR_ConsumesDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ConsumesDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ConsumesDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDef_var::operator const IR::ConsumesDef_ptr &() const // cast
++IR_ConsumesDef_var::operator const IR_ConsumesDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDef_var::operator IR::ConsumesDef_ptr &() // cast
++IR_ConsumesDef_var::operator IR_ConsumesDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConsumesDef_ptr
+-IR::ConsumesDef_var::operator-> (void) const
++ACE_INLINE IR_ConsumesDef_ptr
++IR_ConsumesDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConsumesDef_ptr
+-IR::ConsumesDef_var::in (void) const
++ACE_INLINE IR_ConsumesDef_ptr
++IR_ConsumesDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConsumesDef_ptr &
+-IR::ConsumesDef_var::inout (void)
++ACE_INLINE IR_ConsumesDef_ptr &
++IR_ConsumesDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConsumesDef_ptr &
+-IR::ConsumesDef_var::out (void)
++ACE_INLINE IR_ConsumesDef_ptr &
++IR_ConsumesDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ConsumesDef::_nil ();
++ this->ptr_ = IR_ConsumesDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConsumesDef_ptr
+-IR::ConsumesDef_var::_retn (void)
++ACE_INLINE IR_ConsumesDef_ptr
++IR_ConsumesDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ConsumesDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ConsumesDef::_nil ();
++ IR_ConsumesDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ConsumesDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONSUMESDEF___OUT_CI_)
+-#define _TAO_IR_CONSUMESDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ConsumesDef_out
++// Inline operations for class IR_ConsumesDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ConsumesDef_out::ConsumesDef_out (IR::ConsumesDef_ptr &p)
++IR_ConsumesDef_out::IR_ConsumesDef_out (IR_ConsumesDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ConsumesDef::_nil ();
++ this->ptr_ = IR_ConsumesDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ConsumesDef_out::ConsumesDef_out (IR::ConsumesDef_var &p) // constructor from _var
++IR_ConsumesDef_out::IR_ConsumesDef_out (IR_ConsumesDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ConsumesDef::_nil ();
++ this->ptr_ = IR_ConsumesDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ConsumesDef_out::ConsumesDef_out (const IR::ConsumesDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ConsumesDef_out&,p).ptr_)
++IR_ConsumesDef_out::IR_ConsumesDef_out (const IR_ConsumesDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ConsumesDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ConsumesDef_out &
+-IR::ConsumesDef_out::operator= (const IR::ConsumesDef_out &p)
++ACE_INLINE IR_ConsumesDef_out &
++IR_ConsumesDef_out::operator= (const IR_ConsumesDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ConsumesDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ConsumesDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ConsumesDef_out &
+-IR::ConsumesDef_out::operator= (const IR::ConsumesDef_var &p)
++ACE_INLINE IR_ConsumesDef_out &
++IR_ConsumesDef_out::operator= (const IR_ConsumesDef_var &p)
+ {
+- this->ptr_ = IR::ConsumesDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ConsumesDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ConsumesDef_out &
+-IR::ConsumesDef_out::operator= (IR::ConsumesDef_ptr p)
++ACE_INLINE IR_ConsumesDef_out &
++IR_ConsumesDef_out::operator= (IR_ConsumesDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDef_out::operator IR::ConsumesDef_ptr &() // cast
++IR_ConsumesDef_out::operator IR_ConsumesDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConsumesDef_ptr &
+-IR::ConsumesDef_out::ptr (void) // ptr
++ACE_INLINE IR_ConsumesDef_ptr &
++IR_ConsumesDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ConsumesDef_ptr
+-IR::ConsumesDef_out::operator-> (void)
++ACE_INLINE IR_ConsumesDef_ptr
++IR_ConsumesDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONSUMESDEFSEQ_CI_
+-
+- ACE_INLINE IR::ConsumesDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_ConsumesDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::ConsumesDef **buf = 0;
++ IR_ConsumesDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::ConsumesDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_ConsumesDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::ConsumesDef::_nil ();
++ buf[i] = IR_ConsumesDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR::ConsumesDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::freebuf (IR_ConsumesDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -7542,36 +6923,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ConsumesDef* *value,
++ IR_ConsumesDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ConsumesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
+- IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ConsumesDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::allocbuf (this->maximum_);
++ IR_ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ConsumesDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -7581,20 +6962,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::ConsumesDef **tmp = ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
++ IR_ConsumesDef **tmp = ACE_reinterpret_cast (IR_ConsumesDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ConsumesDef::_nil ();
++ tmp[i] = IR_ConsumesDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -7607,28 +6988,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ConsumesDef **tmp1 = ACE_reinterpret_cast (IR::ConsumesDef **, this->buffer_);
+- IR::ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ConsumesDef **tmp1 = ACE_reinterpret_cast (IR_ConsumesDef **, this->buffer_);
++ IR_ConsumesDef ** const tmp2 = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ConsumesDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ConsumesDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::ConsumesDef ** const tmp = ACE_reinterpret_cast (IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::ConsumesDef,IR::ConsumesDef_var> (tmp + index, this->release_);
++ IR_ConsumesDef ** const tmp = ACE_reinterpret_cast (IR_ConsumesDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_ConsumesDef,IR_ConsumesDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::ConsumesDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ConsumesDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ConsumesDef **result = 0;
++ IR_ConsumesDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -7640,7 +7021,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ConsumesDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ConsumesDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -7649,7 +7030,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ConsumesDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ConsumesDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -7659,160 +7040,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ConsumesDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_ConsumesDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ConsumesDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ConsumesDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ConsumesDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONSUMESDEFSEQ_CI_)
+-#define _TAO_IR_CONSUMESDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ConsumesDefSeq_var
++// Inline operations for class IR_ConsumesDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_var::ConsumesDefSeq_var (void) // default constructor
++IR_ConsumesDefSeq_var::IR_ConsumesDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_var::ConsumesDefSeq_var (ConsumesDefSeq *p)
++IR_ConsumesDefSeq_var::IR_ConsumesDefSeq_var (IR_ConsumesDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_var::ConsumesDefSeq_var (const ::IR::ConsumesDefSeq_var &p) // copy constructor
++IR_ConsumesDefSeq_var::IR_ConsumesDefSeq_var (const ::IR_ConsumesDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ConsumesDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ConsumesDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_var::~ConsumesDefSeq_var (void) // destructor
++IR_ConsumesDefSeq_var::~IR_ConsumesDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ConsumesDefSeq_var &
+-IR::ConsumesDefSeq_var::operator= (ConsumesDefSeq *p)
++ACE_INLINE IR_ConsumesDefSeq_var &
++IR_ConsumesDefSeq_var::operator= (IR_ConsumesDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ConsumesDefSeq_var &
+-IR::ConsumesDefSeq_var::operator= (const ::IR::ConsumesDefSeq_var &p) // deep copy
++ACE_INLINE IR_ConsumesDefSeq_var &
++IR_ConsumesDefSeq_var::operator= (const ::IR_ConsumesDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ConsumesDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ConsumesDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ConsumesDefSeq *
+-IR::ConsumesDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ConsumesDefSeq *
++IR_ConsumesDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConsumesDefSeq *
+-IR::ConsumesDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_ConsumesDefSeq *
++IR_ConsumesDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_var::operator const ::IR::ConsumesDefSeq &() const // cast
++IR_ConsumesDefSeq_var::operator const ::IR_ConsumesDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq &() // cast
++IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq &() const // cast
++IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ConsumesDefSeq_var::operator ::IR::ConsumesDefSeq *&() // cast
++IR_ConsumesDefSeq_var::operator ::IR_ConsumesDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ConsumesDef, IR::ConsumesDef_var>
+-IR::ConsumesDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var>
++IR_ConsumesDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::ConsumesDefSeq &
+-IR::ConsumesDefSeq_var::in (void) const
++ACE_INLINE const ::IR_ConsumesDefSeq &
++IR_ConsumesDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConsumesDefSeq &
+-IR::ConsumesDefSeq_var::inout (void)
++ACE_INLINE ::IR_ConsumesDefSeq &
++IR_ConsumesDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ConsumesDefSeq *&
+-IR::ConsumesDefSeq_var::out (void)
++ACE_INLINE ::IR_ConsumesDefSeq *&
++IR_ConsumesDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConsumesDefSeq *
+-IR::ConsumesDefSeq_var::_retn (void)
++ACE_INLINE ::IR_ConsumesDefSeq *
++IR_ConsumesDefSeq_var::_retn (void)
+ {
+- ::IR::ConsumesDefSeq *tmp = this->ptr_;
++ ::IR_ConsumesDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ConsumesDefSeq *
+-IR::ConsumesDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_ConsumesDefSeq *
++IR_ConsumesDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ConsumesDefSeq_out
++// Inline operations for class IR_ConsumesDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_out::ConsumesDefSeq_out (ConsumesDefSeq *&p)
++IR_ConsumesDefSeq_out::IR_ConsumesDefSeq_out (IR_ConsumesDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_out::ConsumesDefSeq_out (ConsumesDefSeq_var &p) // constructor from _var
++IR_ConsumesDefSeq_out::IR_ConsumesDefSeq_out (IR_ConsumesDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -7820,57 +7194,50 @@
+ }
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_out::ConsumesDefSeq_out (const ::IR::ConsumesDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ConsumesDefSeq_out&, p).ptr_)
++IR_ConsumesDefSeq_out::IR_ConsumesDefSeq_out (const ::IR_ConsumesDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ConsumesDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ConsumesDefSeq_out &
+-IR::ConsumesDefSeq_out::operator= (const ::IR::ConsumesDefSeq_out &p)
++ACE_INLINE ::IR_ConsumesDefSeq_out &
++IR_ConsumesDefSeq_out::operator= (const ::IR_ConsumesDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ConsumesDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ConsumesDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ConsumesDefSeq_out &
+-IR::ConsumesDefSeq_out::operator= (ConsumesDefSeq *p)
++ACE_INLINE ::IR_ConsumesDefSeq_out &
++IR_ConsumesDefSeq_out::operator= (IR_ConsumesDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ConsumesDefSeq_out::operator ::IR::ConsumesDefSeq *&() // cast
++IR_ConsumesDefSeq_out::operator ::IR_ConsumesDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConsumesDefSeq *&
+-IR::ConsumesDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ConsumesDefSeq *&
++IR_ConsumesDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConsumesDefSeq *
+-IR::ConsumesDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_ConsumesDefSeq *
++IR_ConsumesDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ConsumesDef, IR::ConsumesDef_var>
+-IR::ConsumesDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ConsumesDef, IR_ConsumesDef_var>
++IR_ConsumesDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF___CI_)
+-#define _TAO_IR_FACTORYDEF___CI_
+-
+ ACE_INLINE
+-IR::FactoryDef::FactoryDef (
++IR_FactoryDef::IR_FactoryDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -7880,200 +7247,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF___VAR_CI_)
+-#define _TAO_IR_FACTORYDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::FactoryDef_var
++// Inline operations for class IR_FactoryDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FactoryDef_var::FactoryDef_var (void) // default constructor
+- : ptr_ (IR::FactoryDef::_nil ())
++IR_FactoryDef_var::IR_FactoryDef_var (void) // default constructor
++ : ptr_ (IR_FactoryDef::_nil ())
+ {}
+
+-ACE_INLINE IR::FactoryDef_ptr
+-IR::FactoryDef_var::ptr (void) const
++ACE_INLINE IR_FactoryDef_ptr
++IR_FactoryDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FactoryDef_var::FactoryDef_var (const IR::FactoryDef_var &p) // copy constructor
++IR_FactoryDef_var::IR_FactoryDef_var (const IR_FactoryDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (FactoryDef::_duplicate (p.ptr ()))
++ ptr_ (IR_FactoryDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::FactoryDef_var::~FactoryDef_var (void) // destructor
++IR_FactoryDef_var::~IR_FactoryDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::FactoryDef_var &
+-IR::FactoryDef_var::operator= (IR::FactoryDef_ptr p)
++ACE_INLINE IR_FactoryDef_var &
++IR_FactoryDef_var::operator= (IR_FactoryDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::FactoryDef_var &
+-IR::FactoryDef_var::operator= (const IR::FactoryDef_var &p)
++ACE_INLINE IR_FactoryDef_var &
++IR_FactoryDef_var::operator= (const IR_FactoryDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FactoryDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_FactoryDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::FactoryDef_var::operator const IR::FactoryDef_ptr &() const // cast
++IR_FactoryDef_var::operator const IR_FactoryDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FactoryDef_var::operator IR::FactoryDef_ptr &() // cast
++IR_FactoryDef_var::operator IR_FactoryDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FactoryDef_ptr
+-IR::FactoryDef_var::operator-> (void) const
++ACE_INLINE IR_FactoryDef_ptr
++IR_FactoryDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FactoryDef_ptr
+-IR::FactoryDef_var::in (void) const
++ACE_INLINE IR_FactoryDef_ptr
++IR_FactoryDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FactoryDef_ptr &
+-IR::FactoryDef_var::inout (void)
++ACE_INLINE IR_FactoryDef_ptr &
++IR_FactoryDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FactoryDef_ptr &
+-IR::FactoryDef_var::out (void)
++ACE_INLINE IR_FactoryDef_ptr &
++IR_FactoryDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FactoryDef::_nil ();
++ this->ptr_ = IR_FactoryDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FactoryDef_ptr
+-IR::FactoryDef_var::_retn (void)
++ACE_INLINE IR_FactoryDef_ptr
++IR_FactoryDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::FactoryDef_ptr val = this->ptr_;
+- this->ptr_ = IR::FactoryDef::_nil ();
++ IR_FactoryDef_ptr val = this->ptr_;
++ this->ptr_ = IR_FactoryDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FACTORYDEF___OUT_CI_)
+-#define _TAO_IR_FACTORYDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::FactoryDef_out
++// Inline operations for class IR_FactoryDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FactoryDef_out::FactoryDef_out (IR::FactoryDef_ptr &p)
++IR_FactoryDef_out::IR_FactoryDef_out (IR_FactoryDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::FactoryDef::_nil ();
++ this->ptr_ = IR_FactoryDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::FactoryDef_out::FactoryDef_out (IR::FactoryDef_var &p) // constructor from _var
++IR_FactoryDef_out::IR_FactoryDef_out (IR_FactoryDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FactoryDef::_nil ();
++ this->ptr_ = IR_FactoryDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::FactoryDef_out::FactoryDef_out (const IR::FactoryDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::FactoryDef_out&,p).ptr_)
++IR_FactoryDef_out::IR_FactoryDef_out (const IR_FactoryDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_FactoryDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::FactoryDef_out &
+-IR::FactoryDef_out::operator= (const IR::FactoryDef_out &p)
++ACE_INLINE IR_FactoryDef_out &
++IR_FactoryDef_out::operator= (const IR_FactoryDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::FactoryDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_FactoryDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::FactoryDef_out &
+-IR::FactoryDef_out::operator= (const IR::FactoryDef_var &p)
++ACE_INLINE IR_FactoryDef_out &
++IR_FactoryDef_out::operator= (const IR_FactoryDef_var &p)
+ {
+- this->ptr_ = IR::FactoryDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_FactoryDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::FactoryDef_out &
+-IR::FactoryDef_out::operator= (IR::FactoryDef_ptr p)
++ACE_INLINE IR_FactoryDef_out &
++IR_FactoryDef_out::operator= (IR_FactoryDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::FactoryDef_out::operator IR::FactoryDef_ptr &() // cast
++IR_FactoryDef_out::operator IR_FactoryDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FactoryDef_ptr &
+-IR::FactoryDef_out::ptr (void) // ptr
++ACE_INLINE IR_FactoryDef_ptr &
++IR_FactoryDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FactoryDef_ptr
+-IR::FactoryDef_out::operator-> (void)
++ACE_INLINE IR_FactoryDef_ptr
++IR_FactoryDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FACTORYDEFSEQ_CI_
+-
+- ACE_INLINE IR::FactoryDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_FactoryDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::FactoryDef **buf = 0;
++ IR_FactoryDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::FactoryDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_FactoryDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::FactoryDef::_nil ();
++ buf[i] = IR_FactoryDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR::FactoryDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::freebuf (IR_FactoryDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -8081,36 +7427,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::FactoryDef* *value,
++ IR_FactoryDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::FactoryDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
+- IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_FactoryDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::allocbuf (this->maximum_);
++ IR_FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_FactoryDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -8120,20 +7466,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::FactoryDef **tmp = ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
++ IR_FactoryDef **tmp = ACE_reinterpret_cast (IR_FactoryDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::FactoryDef::_nil ();
++ tmp[i] = IR_FactoryDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -8146,28 +7492,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::FactoryDef **tmp1 = ACE_reinterpret_cast (IR::FactoryDef **, this->buffer_);
+- IR::FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_FactoryDef **tmp1 = ACE_reinterpret_cast (IR_FactoryDef **, this->buffer_);
++ IR_FactoryDef ** const tmp2 = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::FactoryDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_FactoryDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::FactoryDef ** const tmp = ACE_reinterpret_cast (IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::FactoryDef,IR::FactoryDef_var> (tmp + index, this->release_);
++ IR_FactoryDef ** const tmp = ACE_reinterpret_cast (IR_FactoryDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_FactoryDef,IR_FactoryDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::FactoryDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_FactoryDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::FactoryDef **result = 0;
++ IR_FactoryDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -8179,7 +7525,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::FactoryDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_FactoryDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -8188,7 +7534,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::FactoryDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_FactoryDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -8198,160 +7544,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::FactoryDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_FactoryDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_FactoryDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::FactoryDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_FactoryDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_FACTORYDEFSEQ_CI_)
+-#define _TAO_IR_FACTORYDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::FactoryDefSeq_var
++// Inline operations for class IR_FactoryDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FactoryDefSeq_var::FactoryDefSeq_var (void) // default constructor
++IR_FactoryDefSeq_var::IR_FactoryDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::FactoryDefSeq_var::FactoryDefSeq_var (FactoryDefSeq *p)
++IR_FactoryDefSeq_var::IR_FactoryDefSeq_var (IR_FactoryDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::FactoryDefSeq_var::FactoryDefSeq_var (const ::IR::FactoryDefSeq_var &p) // copy constructor
++IR_FactoryDefSeq_var::IR_FactoryDefSeq_var (const ::IR_FactoryDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::FactoryDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_FactoryDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::FactoryDefSeq_var::~FactoryDefSeq_var (void) // destructor
++IR_FactoryDefSeq_var::~IR_FactoryDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::FactoryDefSeq_var &
+-IR::FactoryDefSeq_var::operator= (FactoryDefSeq *p)
++ACE_INLINE IR_FactoryDefSeq_var &
++IR_FactoryDefSeq_var::operator= (IR_FactoryDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::FactoryDefSeq_var &
+-IR::FactoryDefSeq_var::operator= (const ::IR::FactoryDefSeq_var &p) // deep copy
++ACE_INLINE IR_FactoryDefSeq_var &
++IR_FactoryDefSeq_var::operator= (const ::IR_FactoryDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::FactoryDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_FactoryDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::FactoryDefSeq *
+-IR::FactoryDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_FactoryDefSeq *
++IR_FactoryDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FactoryDefSeq *
+-IR::FactoryDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_FactoryDefSeq *
++IR_FactoryDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FactoryDefSeq_var::operator const ::IR::FactoryDefSeq &() const // cast
++IR_FactoryDefSeq_var::operator const ::IR_FactoryDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq &() // cast
++IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq &() const // cast
++IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::FactoryDefSeq_var::operator ::IR::FactoryDefSeq *&() // cast
++IR_FactoryDefSeq_var::operator ::IR_FactoryDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::FactoryDef, IR::FactoryDef_var>
+-IR::FactoryDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var>
++IR_FactoryDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::FactoryDefSeq &
+-IR::FactoryDefSeq_var::in (void) const
++ACE_INLINE const ::IR_FactoryDefSeq &
++IR_FactoryDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FactoryDefSeq &
+-IR::FactoryDefSeq_var::inout (void)
++ACE_INLINE ::IR_FactoryDefSeq &
++IR_FactoryDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::FactoryDefSeq *&
+-IR::FactoryDefSeq_var::out (void)
++ACE_INLINE ::IR_FactoryDefSeq *&
++IR_FactoryDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FactoryDefSeq *
+-IR::FactoryDefSeq_var::_retn (void)
++ACE_INLINE ::IR_FactoryDefSeq *
++IR_FactoryDefSeq_var::_retn (void)
+ {
+- ::IR::FactoryDefSeq *tmp = this->ptr_;
++ ::IR_FactoryDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::FactoryDefSeq *
+-IR::FactoryDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_FactoryDefSeq *
++IR_FactoryDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::FactoryDefSeq_out
++// Inline operations for class IR_FactoryDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FactoryDefSeq_out::FactoryDefSeq_out (FactoryDefSeq *&p)
++IR_FactoryDefSeq_out::IR_FactoryDefSeq_out (IR_FactoryDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::FactoryDefSeq_out::FactoryDefSeq_out (FactoryDefSeq_var &p) // constructor from _var
++IR_FactoryDefSeq_out::IR_FactoryDefSeq_out (IR_FactoryDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -8359,57 +7698,50 @@
+ }
+
+ ACE_INLINE
+-IR::FactoryDefSeq_out::FactoryDefSeq_out (const ::IR::FactoryDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (FactoryDefSeq_out&, p).ptr_)
++IR_FactoryDefSeq_out::IR_FactoryDefSeq_out (const ::IR_FactoryDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_FactoryDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::FactoryDefSeq_out &
+-IR::FactoryDefSeq_out::operator= (const ::IR::FactoryDefSeq_out &p)
++ACE_INLINE ::IR_FactoryDefSeq_out &
++IR_FactoryDefSeq_out::operator= (const ::IR_FactoryDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (FactoryDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_FactoryDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::FactoryDefSeq_out &
+-IR::FactoryDefSeq_out::operator= (FactoryDefSeq *p)
++ACE_INLINE ::IR_FactoryDefSeq_out &
++IR_FactoryDefSeq_out::operator= (IR_FactoryDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::FactoryDefSeq_out::operator ::IR::FactoryDefSeq *&() // cast
++IR_FactoryDefSeq_out::operator ::IR_FactoryDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FactoryDefSeq *&
+-IR::FactoryDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_FactoryDefSeq *&
++IR_FactoryDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FactoryDefSeq *
+-IR::FactoryDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_FactoryDefSeq *
++IR_FactoryDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::FactoryDef, IR::FactoryDef_var>
+-IR::FactoryDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_FactoryDef, IR_FactoryDef_var>
++IR_FactoryDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF___CI_)
+-#define _TAO_IR_FINDERDEF___CI_
+-
+ ACE_INLINE
+-IR::FinderDef::FinderDef (
++IR_FinderDef::IR_FinderDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -8419,200 +7751,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF___VAR_CI_)
+-#define _TAO_IR_FINDERDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::FinderDef_var
++// Inline operations for class IR_FinderDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FinderDef_var::FinderDef_var (void) // default constructor
+- : ptr_ (IR::FinderDef::_nil ())
++IR_FinderDef_var::IR_FinderDef_var (void) // default constructor
++ : ptr_ (IR_FinderDef::_nil ())
+ {}
+
+-ACE_INLINE IR::FinderDef_ptr
+-IR::FinderDef_var::ptr (void) const
++ACE_INLINE IR_FinderDef_ptr
++IR_FinderDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FinderDef_var::FinderDef_var (const IR::FinderDef_var &p) // copy constructor
++IR_FinderDef_var::IR_FinderDef_var (const IR_FinderDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (FinderDef::_duplicate (p.ptr ()))
++ ptr_ (IR_FinderDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::FinderDef_var::~FinderDef_var (void) // destructor
++IR_FinderDef_var::~IR_FinderDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::FinderDef_var &
+-IR::FinderDef_var::operator= (IR::FinderDef_ptr p)
++ACE_INLINE IR_FinderDef_var &
++IR_FinderDef_var::operator= (IR_FinderDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::FinderDef_var &
+-IR::FinderDef_var::operator= (const IR::FinderDef_var &p)
++ACE_INLINE IR_FinderDef_var &
++IR_FinderDef_var::operator= (const IR_FinderDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FinderDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_FinderDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::FinderDef_var::operator const IR::FinderDef_ptr &() const // cast
++IR_FinderDef_var::operator const IR_FinderDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FinderDef_var::operator IR::FinderDef_ptr &() // cast
++IR_FinderDef_var::operator IR_FinderDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FinderDef_ptr
+-IR::FinderDef_var::operator-> (void) const
++ACE_INLINE IR_FinderDef_ptr
++IR_FinderDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FinderDef_ptr
+-IR::FinderDef_var::in (void) const
++ACE_INLINE IR_FinderDef_ptr
++IR_FinderDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FinderDef_ptr &
+-IR::FinderDef_var::inout (void)
++ACE_INLINE IR_FinderDef_ptr &
++IR_FinderDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FinderDef_ptr &
+-IR::FinderDef_var::out (void)
++ACE_INLINE IR_FinderDef_ptr &
++IR_FinderDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FinderDef::_nil ();
++ this->ptr_ = IR_FinderDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FinderDef_ptr
+-IR::FinderDef_var::_retn (void)
++ACE_INLINE IR_FinderDef_ptr
++IR_FinderDef_var::_retn (void)
+ {
+- // yield ownership of managed obj reference
+- IR::FinderDef_ptr val = this->ptr_;
+- this->ptr_ = IR::FinderDef::_nil ();
+- return val;
+-}
+-
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FINDERDEF___OUT_CI_)
+-#define _TAO_IR_FINDERDEF___OUT_CI_
++ // yield ownership of managed obj reference
++ IR_FinderDef_ptr val = this->ptr_;
++ this->ptr_ = IR_FinderDef::_nil ();
++ return val;
++}
+
+ // *************************************************************
+-// Inline operations for class IR::FinderDef_out
++// Inline operations for class IR_FinderDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FinderDef_out::FinderDef_out (IR::FinderDef_ptr &p)
++IR_FinderDef_out::IR_FinderDef_out (IR_FinderDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::FinderDef::_nil ();
++ this->ptr_ = IR_FinderDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::FinderDef_out::FinderDef_out (IR::FinderDef_var &p) // constructor from _var
++IR_FinderDef_out::IR_FinderDef_out (IR_FinderDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FinderDef::_nil ();
++ this->ptr_ = IR_FinderDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::FinderDef_out::FinderDef_out (const IR::FinderDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::FinderDef_out&,p).ptr_)
++IR_FinderDef_out::IR_FinderDef_out (const IR_FinderDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_FinderDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::FinderDef_out &
+-IR::FinderDef_out::operator= (const IR::FinderDef_out &p)
++ACE_INLINE IR_FinderDef_out &
++IR_FinderDef_out::operator= (const IR_FinderDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::FinderDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_FinderDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::FinderDef_out &
+-IR::FinderDef_out::operator= (const IR::FinderDef_var &p)
++ACE_INLINE IR_FinderDef_out &
++IR_FinderDef_out::operator= (const IR_FinderDef_var &p)
+ {
+- this->ptr_ = IR::FinderDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_FinderDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::FinderDef_out &
+-IR::FinderDef_out::operator= (IR::FinderDef_ptr p)
++ACE_INLINE IR_FinderDef_out &
++IR_FinderDef_out::operator= (IR_FinderDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::FinderDef_out::operator IR::FinderDef_ptr &() // cast
++IR_FinderDef_out::operator IR_FinderDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FinderDef_ptr &
+-IR::FinderDef_out::ptr (void) // ptr
++ACE_INLINE IR_FinderDef_ptr &
++IR_FinderDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FinderDef_ptr
+-IR::FinderDef_out::operator-> (void)
++ACE_INLINE IR_FinderDef_ptr
++IR_FinderDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_FINDERDEFSEQ_CI_
+-
+- ACE_INLINE IR::FinderDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_FinderDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::FinderDef **buf = 0;
++ IR_FinderDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::FinderDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_FinderDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::FinderDef::_nil ();
++ buf[i] = IR_FinderDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR::FinderDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::freebuf (IR_FinderDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -8620,36 +7931,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::FinderDef* *value,
++ IR_FinderDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq(const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::FinderDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
+- IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_FinderDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::allocbuf (this->maximum_);
++ IR_FinderDef ** const tmp2 = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_FinderDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -8659,20 +7970,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_FinderDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::FinderDef **tmp = ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
++ IR_FinderDef **tmp = ACE_reinterpret_cast (IR_FinderDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::FinderDef::_nil ();
++ tmp[i] = IR_FinderDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -8685,28 +7996,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::FinderDef **tmp1 = ACE_reinterpret_cast (IR::FinderDef **, this->buffer_);
+- IR::FinderDef ** const tmp2 = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_FinderDef **tmp1 = ACE_reinterpret_cast (IR_FinderDef **, this->buffer_);
++ IR_FinderDef ** const tmp2 = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::FinderDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_FinderDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::FinderDef ** const tmp = ACE_reinterpret_cast (IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::FinderDef,IR::FinderDef_var> (tmp + index, this->release_);
++ IR_FinderDef ** const tmp = ACE_reinterpret_cast (IR_FinderDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_FinderDef,IR_FinderDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::FinderDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_FinderDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::FinderDef **result = 0;
++ IR_FinderDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -8718,7 +8029,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::FinderDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_FinderDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -8727,7 +8038,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::FinderDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_FinderDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -8737,160 +8048,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::FinderDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_FinderDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_FinderDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::FinderDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_FinderDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_FINDERDEFSEQ_CI_)
+-#define _TAO_IR_FINDERDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::FinderDefSeq_var
++// Inline operations for class IR_FinderDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FinderDefSeq_var::FinderDefSeq_var (void) // default constructor
++IR_FinderDefSeq_var::IR_FinderDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::FinderDefSeq_var::FinderDefSeq_var (FinderDefSeq *p)
++IR_FinderDefSeq_var::IR_FinderDefSeq_var (IR_FinderDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::FinderDefSeq_var::FinderDefSeq_var (const ::IR::FinderDefSeq_var &p) // copy constructor
++IR_FinderDefSeq_var::IR_FinderDefSeq_var (const ::IR_FinderDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::FinderDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_FinderDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::FinderDefSeq_var::~FinderDefSeq_var (void) // destructor
++IR_FinderDefSeq_var::~IR_FinderDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::FinderDefSeq_var &
+-IR::FinderDefSeq_var::operator= (FinderDefSeq *p)
++ACE_INLINE IR_FinderDefSeq_var &
++IR_FinderDefSeq_var::operator= (IR_FinderDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::FinderDefSeq_var &
+-IR::FinderDefSeq_var::operator= (const ::IR::FinderDefSeq_var &p) // deep copy
++ACE_INLINE IR_FinderDefSeq_var &
++IR_FinderDefSeq_var::operator= (const ::IR_FinderDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::FinderDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_FinderDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::FinderDefSeq *
+-IR::FinderDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_FinderDefSeq *
++IR_FinderDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FinderDefSeq *
+-IR::FinderDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_FinderDefSeq *
++IR_FinderDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FinderDefSeq_var::operator const ::IR::FinderDefSeq &() const // cast
++IR_FinderDefSeq_var::operator const ::IR_FinderDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FinderDefSeq_var::operator ::IR::FinderDefSeq &() // cast
++IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FinderDefSeq_var::operator ::IR::FinderDefSeq &() const // cast
++IR_FinderDefSeq_var::operator ::IR_FinderDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::FinderDefSeq_var::operator ::IR::FinderDefSeq *&() // cast
++IR_FinderDefSeq_var::operator ::IR_FinderDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::FinderDef, IR::FinderDef_var>
+-IR::FinderDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var>
++IR_FinderDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::FinderDefSeq &
+-IR::FinderDefSeq_var::in (void) const
++ACE_INLINE const ::IR_FinderDefSeq &
++IR_FinderDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FinderDefSeq &
+-IR::FinderDefSeq_var::inout (void)
++ACE_INLINE ::IR_FinderDefSeq &
++IR_FinderDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::FinderDefSeq *&
+-IR::FinderDefSeq_var::out (void)
++ACE_INLINE ::IR_FinderDefSeq *&
++IR_FinderDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FinderDefSeq *
+-IR::FinderDefSeq_var::_retn (void)
++ACE_INLINE ::IR_FinderDefSeq *
++IR_FinderDefSeq_var::_retn (void)
+ {
+- ::IR::FinderDefSeq *tmp = this->ptr_;
++ ::IR_FinderDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::FinderDefSeq *
+-IR::FinderDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_FinderDefSeq *
++IR_FinderDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::FinderDefSeq_out
++// Inline operations for class IR_FinderDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FinderDefSeq_out::FinderDefSeq_out (FinderDefSeq *&p)
++IR_FinderDefSeq_out::IR_FinderDefSeq_out (IR_FinderDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::FinderDefSeq_out::FinderDefSeq_out (FinderDefSeq_var &p) // constructor from _var
++IR_FinderDefSeq_out::IR_FinderDefSeq_out (IR_FinderDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -8898,57 +8202,50 @@
+ }
+
+ ACE_INLINE
+-IR::FinderDefSeq_out::FinderDefSeq_out (const ::IR::FinderDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (FinderDefSeq_out&, p).ptr_)
++IR_FinderDefSeq_out::IR_FinderDefSeq_out (const ::IR_FinderDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_FinderDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::FinderDefSeq_out &
+-IR::FinderDefSeq_out::operator= (const ::IR::FinderDefSeq_out &p)
++ACE_INLINE ::IR_FinderDefSeq_out &
++IR_FinderDefSeq_out::operator= (const ::IR_FinderDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (FinderDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_FinderDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::FinderDefSeq_out &
+-IR::FinderDefSeq_out::operator= (FinderDefSeq *p)
++ACE_INLINE ::IR_FinderDefSeq_out &
++IR_FinderDefSeq_out::operator= (IR_FinderDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::FinderDefSeq_out::operator ::IR::FinderDefSeq *&() // cast
++IR_FinderDefSeq_out::operator ::IR_FinderDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FinderDefSeq *&
+-IR::FinderDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_FinderDefSeq *&
++IR_FinderDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::FinderDefSeq *
+-IR::FinderDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_FinderDefSeq *
++IR_FinderDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::FinderDef, IR::FinderDef_var>
+-IR::FinderDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_FinderDef, IR_FinderDef_var>
++IR_FinderDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___CI_)
+-#define _TAO_IR_PRIMARYKEYDEF___CI_
+-
+ ACE_INLINE
+-IR::PrimaryKeyDef::PrimaryKeyDef (
++IR_PrimaryKeyDef::IR_PrimaryKeyDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -8958,200 +8255,179 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___VAR_CI_)
+-#define _TAO_IR_PRIMARYKEYDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::PrimaryKeyDef_var
++// Inline operations for class IR_PrimaryKeyDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_var::PrimaryKeyDef_var (void) // default constructor
+- : ptr_ (IR::PrimaryKeyDef::_nil ())
++IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (void) // default constructor
++ : ptr_ (IR_PrimaryKeyDef::_nil ())
+ {}
+
+-ACE_INLINE IR::PrimaryKeyDef_ptr
+-IR::PrimaryKeyDef_var::ptr (void) const
++ACE_INLINE IR_PrimaryKeyDef_ptr
++IR_PrimaryKeyDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_var::PrimaryKeyDef_var (const IR::PrimaryKeyDef_var &p) // copy constructor
++IR_PrimaryKeyDef_var::IR_PrimaryKeyDef_var (const IR_PrimaryKeyDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (PrimaryKeyDef::_duplicate (p.ptr ()))
++ ptr_ (IR_PrimaryKeyDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_var::~PrimaryKeyDef_var (void) // destructor
++IR_PrimaryKeyDef_var::~IR_PrimaryKeyDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_var &
+-IR::PrimaryKeyDef_var::operator= (IR::PrimaryKeyDef_ptr p)
++ACE_INLINE IR_PrimaryKeyDef_var &
++IR_PrimaryKeyDef_var::operator= (IR_PrimaryKeyDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_var &
+-IR::PrimaryKeyDef_var::operator= (const IR::PrimaryKeyDef_var &p)
++ACE_INLINE IR_PrimaryKeyDef_var &
++IR_PrimaryKeyDef_var::operator= (const IR_PrimaryKeyDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PrimaryKeyDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_PrimaryKeyDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_var::operator const IR::PrimaryKeyDef_ptr &() const // cast
++IR_PrimaryKeyDef_var::operator const IR_PrimaryKeyDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_var::operator IR::PrimaryKeyDef_ptr &() // cast
++IR_PrimaryKeyDef_var::operator IR_PrimaryKeyDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_ptr
+-IR::PrimaryKeyDef_var::operator-> (void) const
++ACE_INLINE IR_PrimaryKeyDef_ptr
++IR_PrimaryKeyDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_ptr
+-IR::PrimaryKeyDef_var::in (void) const
++ACE_INLINE IR_PrimaryKeyDef_ptr
++IR_PrimaryKeyDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_ptr &
+-IR::PrimaryKeyDef_var::inout (void)
++ACE_INLINE IR_PrimaryKeyDef_ptr &
++IR_PrimaryKeyDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_ptr &
+-IR::PrimaryKeyDef_var::out (void)
++ACE_INLINE IR_PrimaryKeyDef_ptr &
++IR_PrimaryKeyDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PrimaryKeyDef::_nil ();
++ this->ptr_ = IR_PrimaryKeyDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_ptr
+-IR::PrimaryKeyDef_var::_retn (void)
++ACE_INLINE IR_PrimaryKeyDef_ptr
++IR_PrimaryKeyDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::PrimaryKeyDef_ptr val = this->ptr_;
+- this->ptr_ = IR::PrimaryKeyDef::_nil ();
++ IR_PrimaryKeyDef_ptr val = this->ptr_;
++ this->ptr_ = IR_PrimaryKeyDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMARYKEYDEF___OUT_CI_)
+-#define _TAO_IR_PRIMARYKEYDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::PrimaryKeyDef_out
++// Inline operations for class IR_PrimaryKeyDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (IR::PrimaryKeyDef_ptr &p)
++IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::PrimaryKeyDef::_nil ();
++ this->ptr_ = IR_PrimaryKeyDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (IR::PrimaryKeyDef_var &p) // constructor from _var
++IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (IR_PrimaryKeyDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PrimaryKeyDef::_nil ();
++ this->ptr_ = IR_PrimaryKeyDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_out::PrimaryKeyDef_out (const IR::PrimaryKeyDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::PrimaryKeyDef_out&,p).ptr_)
++IR_PrimaryKeyDef_out::IR_PrimaryKeyDef_out (const IR_PrimaryKeyDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_PrimaryKeyDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::PrimaryKeyDef_out &
+-IR::PrimaryKeyDef_out::operator= (const IR::PrimaryKeyDef_out &p)
++ACE_INLINE IR_PrimaryKeyDef_out &
++IR_PrimaryKeyDef_out::operator= (const IR_PrimaryKeyDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::PrimaryKeyDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_PrimaryKeyDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_out &
+-IR::PrimaryKeyDef_out::operator= (const IR::PrimaryKeyDef_var &p)
++ACE_INLINE IR_PrimaryKeyDef_out &
++IR_PrimaryKeyDef_out::operator= (const IR_PrimaryKeyDef_var &p)
+ {
+- this->ptr_ = IR::PrimaryKeyDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_PrimaryKeyDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_out &
+-IR::PrimaryKeyDef_out::operator= (IR::PrimaryKeyDef_ptr p)
++ACE_INLINE IR_PrimaryKeyDef_out &
++IR_PrimaryKeyDef_out::operator= (IR_PrimaryKeyDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDef_out::operator IR::PrimaryKeyDef_ptr &() // cast
++IR_PrimaryKeyDef_out::operator IR_PrimaryKeyDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_ptr &
+-IR::PrimaryKeyDef_out::ptr (void) // ptr
++ACE_INLINE IR_PrimaryKeyDef_ptr &
++IR_PrimaryKeyDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDef_ptr
+-IR::PrimaryKeyDef_out::operator-> (void)
++ACE_INLINE IR_PrimaryKeyDef_ptr
++IR_PrimaryKeyDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_CONTAINEDSEQ_CI_
+-
+- ACE_INLINE IR::Contained **
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_Contained **
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::Contained **buf = 0;
++ IR_Contained **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::Contained*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_Contained*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::Contained::_nil ();
++ buf[i] = IR_Contained::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (IR::Contained **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::freebuf (IR_Contained **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -9159,36 +8435,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::Contained* *value,
++ IR_Contained* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq(const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::Contained **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (this->maximum_);
+- IR::Contained ** const tmp2 = ACE_reinterpret_cast (IR::Contained ** ACE_CAST_CONST, rhs.buffer_);
++ IR_Contained **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ContainedSeq::allocbuf (this->maximum_);
++ IR_Contained ** const tmp2 = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::Contained::_duplicate (tmp2[i]);
++ tmp1[i] = IR_Contained::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -9198,20 +8474,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ContainedSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::Contained **tmp = ACE_reinterpret_cast (IR::Contained **, this->buffer_);
++ IR_Contained **tmp = ACE_reinterpret_cast (IR_Contained **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::Contained::_nil ();
++ tmp[i] = IR_Contained::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -9224,28 +8500,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::Contained **tmp1 = ACE_reinterpret_cast (IR::Contained **, this->buffer_);
+- IR::Contained ** const tmp2 = ACE_reinterpret_cast (IR::Contained ** ACE_CAST_CONST, rhs.buffer_);
++ IR_Contained **tmp1 = ACE_reinterpret_cast (IR_Contained **, this->buffer_);
++ IR_Contained ** const tmp2 = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::Contained::_duplicate (tmp2[i]);
++ tmp1[i] = IR_Contained::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::Contained,IR::Contained_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_Contained,IR_Contained_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::Contained ** const tmp = ACE_reinterpret_cast (IR::Contained ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::Contained,IR::Contained_var> (tmp + index, this->release_);
++ IR_Contained ** const tmp = ACE_reinterpret_cast (IR_Contained ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_Contained,IR_Contained_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::Contained* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_Contained* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::Contained **result = 0;
++ IR_Contained **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -9257,7 +8533,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::Contained**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_Contained**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -9266,7 +8542,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::Contained**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_Contained**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -9276,160 +8552,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::Contained* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (void) const
++ ACE_INLINE const IR_Contained* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ContainedSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::Contained ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_Contained ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONTAINEDSEQ_CI_)
+-#define _TAO_IR_CONTAINEDSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ContainedSeq_var
++// Inline operations for class IR_ContainedSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ContainedSeq_var::ContainedSeq_var (void) // default constructor
++IR_ContainedSeq_var::IR_ContainedSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ContainedSeq_var::ContainedSeq_var (ContainedSeq *p)
++IR_ContainedSeq_var::IR_ContainedSeq_var (IR_ContainedSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ContainedSeq_var::ContainedSeq_var (const ::IR::ContainedSeq_var &p) // copy constructor
++IR_ContainedSeq_var::IR_ContainedSeq_var (const ::IR_ContainedSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ContainedSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ContainedSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ContainedSeq_var::~ContainedSeq_var (void) // destructor
++IR_ContainedSeq_var::~IR_ContainedSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ContainedSeq_var &
+-IR::ContainedSeq_var::operator= (ContainedSeq *p)
++ACE_INLINE IR_ContainedSeq_var &
++IR_ContainedSeq_var::operator= (IR_ContainedSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ContainedSeq_var &
+-IR::ContainedSeq_var::operator= (const ::IR::ContainedSeq_var &p) // deep copy
++ACE_INLINE IR_ContainedSeq_var &
++IR_ContainedSeq_var::operator= (const ::IR_ContainedSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ContainedSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ContainedSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ContainedSeq *
+-IR::ContainedSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ContainedSeq *
++IR_ContainedSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContainedSeq *
+-IR::ContainedSeq_var::operator-> (void)
++ACE_INLINE ::IR_ContainedSeq *
++IR_ContainedSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ContainedSeq_var::operator const ::IR::ContainedSeq &() const // cast
++IR_ContainedSeq_var::operator const ::IR_ContainedSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ContainedSeq_var::operator ::IR::ContainedSeq &() // cast
++IR_ContainedSeq_var::operator ::IR_ContainedSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ContainedSeq_var::operator ::IR::ContainedSeq &() const // cast
++IR_ContainedSeq_var::operator ::IR_ContainedSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ContainedSeq_var::operator ::IR::ContainedSeq *&() // cast
++IR_ContainedSeq_var::operator ::IR_ContainedSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::Contained, IR::Contained_var>
+-IR::ContainedSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_Contained, IR_Contained_var>
++IR_ContainedSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::ContainedSeq &
+-IR::ContainedSeq_var::in (void) const
++ACE_INLINE const ::IR_ContainedSeq &
++IR_ContainedSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContainedSeq &
+-IR::ContainedSeq_var::inout (void)
++ACE_INLINE ::IR_ContainedSeq &
++IR_ContainedSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ContainedSeq *&
+-IR::ContainedSeq_var::out (void)
++ACE_INLINE ::IR_ContainedSeq *&
++IR_ContainedSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContainedSeq *
+-IR::ContainedSeq_var::_retn (void)
++ACE_INLINE ::IR_ContainedSeq *
++IR_ContainedSeq_var::_retn (void)
+ {
+- ::IR::ContainedSeq *tmp = this->ptr_;
++ ::IR_ContainedSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ContainedSeq *
+-IR::ContainedSeq_var::ptr (void) const
++ACE_INLINE ::IR_ContainedSeq *
++IR_ContainedSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ContainedSeq_out
++// Inline operations for class IR_ContainedSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ContainedSeq_out::ContainedSeq_out (ContainedSeq *&p)
++IR_ContainedSeq_out::IR_ContainedSeq_out (IR_ContainedSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ContainedSeq_out::ContainedSeq_out (ContainedSeq_var &p) // constructor from _var
++IR_ContainedSeq_out::IR_ContainedSeq_out (IR_ContainedSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -9437,184 +8706,181 @@
+ }
+
+ ACE_INLINE
+-IR::ContainedSeq_out::ContainedSeq_out (const ::IR::ContainedSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ContainedSeq_out&, p).ptr_)
++IR_ContainedSeq_out::IR_ContainedSeq_out (const ::IR_ContainedSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ContainedSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ContainedSeq_out &
+-IR::ContainedSeq_out::operator= (const ::IR::ContainedSeq_out &p)
++ACE_INLINE ::IR_ContainedSeq_out &
++IR_ContainedSeq_out::operator= (const ::IR_ContainedSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ContainedSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ContainedSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ContainedSeq_out &
+-IR::ContainedSeq_out::operator= (ContainedSeq *p)
++ACE_INLINE ::IR_ContainedSeq_out &
++IR_ContainedSeq_out::operator= (IR_ContainedSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ContainedSeq_out::operator ::IR::ContainedSeq *&() // cast
++IR_ContainedSeq_out::operator ::IR_ContainedSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContainedSeq *&
+-IR::ContainedSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ContainedSeq *&
++IR_ContainedSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContainedSeq *
+-IR::ContainedSeq_out::operator-> (void)
++ACE_INLINE ::IR_ContainedSeq *
++IR_ContainedSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::Contained, IR::Contained_var>
+-IR::ContainedSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_Contained, IR_Contained_var>
++IR_ContainedSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::StructMember_var
++// Inline operations for class IR_StructMember_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::StructMember_var::StructMember_var (void) // default constructor
++IR_StructMember_var::IR_StructMember_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::StructMember_var::StructMember_var (StructMember *p)
++IR_StructMember_var::IR_StructMember_var (IR_StructMember *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::StructMember_var::StructMember_var (const ::IR::StructMember_var &p) // copy constructor
++IR_StructMember_var::IR_StructMember_var (const ::IR_StructMember_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::StructMember (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_StructMember (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::StructMember_var::~StructMember_var (void) // destructor
++IR_StructMember_var::~IR_StructMember_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::StructMember_var &
+-IR::StructMember_var::operator= (StructMember *p)
++ACE_INLINE IR_StructMember_var &
++IR_StructMember_var::operator= (IR_StructMember *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::StructMember_var &
+-IR::StructMember_var::operator= (const ::IR::StructMember_var &p)
++ACE_INLINE ::IR_StructMember_var &
++IR_StructMember_var::operator= (const ::IR_StructMember_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::StructMember (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_StructMember (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::StructMember *
+-IR::StructMember_var::operator-> (void) const
++ACE_INLINE const ::IR_StructMember *
++IR_StructMember_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMember *
+-IR::StructMember_var::operator-> (void)
++ACE_INLINE ::IR_StructMember *
++IR_StructMember_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StructMember_var::operator const ::IR::StructMember &() const // cast
++IR_StructMember_var::operator const ::IR_StructMember &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StructMember_var::operator ::IR::StructMember &() // cast
++IR_StructMember_var::operator ::IR_StructMember &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StructMember_var::operator ::IR::StructMember &() const // cast
++IR_StructMember_var::operator ::IR_StructMember &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::StructMember_var::operator ::IR::StructMember *&() // cast
++IR_StructMember_var::operator ::IR_StructMember *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::StructMember &
+-IR::StructMember_var::in (void) const
++ACE_INLINE const ::IR_StructMember &
++IR_StructMember_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMember &
+-IR::StructMember_var::inout (void)
++ACE_INLINE ::IR_StructMember &
++IR_StructMember_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::StructMember *&
+-IR::StructMember_var::out (void)
++ACE_INLINE ::IR_StructMember *&
++IR_StructMember_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMember *
+-IR::StructMember_var::_retn (void)
++ACE_INLINE ::IR_StructMember *
++IR_StructMember_var::_retn (void)
+ {
+- ::IR::StructMember *tmp = this->ptr_;
++ ::IR_StructMember *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::StructMember *
+-IR::StructMember_var::ptr (void) const
++ACE_INLINE ::IR_StructMember *
++IR_StructMember_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::StructMember_out
++// Inline operations for class IR_StructMember_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::StructMember_out::StructMember_out (::IR::StructMember *&p)
++IR_StructMember_out::IR_StructMember_out (::IR_StructMember *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::StructMember_out::StructMember_out (StructMember_var &p) // constructor from _var
++IR_StructMember_out::IR_StructMember_out (IR_StructMember_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -9622,38 +8888,38 @@
+ }
+
+ ACE_INLINE
+-IR::StructMember_out::StructMember_out (const ::IR::StructMember_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (StructMember_out&, p).ptr_)
++IR_StructMember_out::IR_StructMember_out (const ::IR_StructMember_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_StructMember_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::StructMember_out &
+-IR::StructMember_out::operator= (const ::IR::StructMember_out &p)
++ACE_INLINE IR_StructMember_out &
++IR_StructMember_out::operator= (const ::IR_StructMember_out &p)
+ {
+- this->ptr_ = ACE_const_cast (StructMember_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_StructMember_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::StructMember_out &
+-IR::StructMember_out::operator= (StructMember *p)
++ACE_INLINE IR_StructMember_out &
++IR_StructMember_out::operator= (IR_StructMember *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::StructMember_out::operator ::IR::StructMember *&() // cast
++IR_StructMember_out::operator ::IR_StructMember *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMember *&
+-IR::StructMember_out::ptr (void) // ptr
++ACE_INLINE ::IR_StructMember *&
++IR_StructMember_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMember *
+-IR::StructMember_out::operator-> (void)
++ACE_INLINE ::IR_StructMember *
++IR_StructMember_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+@@ -9661,54 +8927,51 @@
+
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_STRUCTMEMBERSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::StructMember *
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_StructMember *
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::StructMember *retval = 0;
+- ACE_NEW_RETURN (retval, IR::StructMember[size], 0);
++ IR_StructMember *retval = 0;
++ ACE_NEW_RETURN (retval, IR_StructMember[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (IR::StructMember *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (IR_StructMember *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::StructMember *data,
++ IR_StructMember *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::_TAO_Unbounded_Sequence_IR_StructMemberSeq (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::StructMember *tmp1 = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (this->maximum_);
+- IR::StructMember * const tmp2 = ACE_reinterpret_cast (IR::StructMember * ACE_CAST_CONST, rhs.buffer_);
++ IR_StructMember *tmp1 = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (this->maximum_);
++ IR_StructMember * const tmp2 = ACE_reinterpret_cast (IR_StructMember * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -9721,8 +8984,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq &
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_StructMemberSeq &
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_StructMemberSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -9733,7 +8996,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::StructMember *tmp = ACE_reinterpret_cast (IR::StructMember *, this->buffer_);
++ IR_StructMember *tmp = ACE_reinterpret_cast (IR_StructMember *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_StructMemberSeq::allocbuf (rhs.maximum_);
+ }
+@@ -9743,8 +9006,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::StructMember *tmp1 = ACE_reinterpret_cast (IR::StructMember *, this->buffer_);
+- IR::StructMember * const tmp2 = ACE_reinterpret_cast (IR::StructMember * ACE_CAST_CONST, rhs.buffer_);
++ IR_StructMember *tmp1 = ACE_reinterpret_cast (IR_StructMember *, this->buffer_);
++ IR_StructMember * const tmp2 = ACE_reinterpret_cast (IR_StructMember * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -9753,30 +9016,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::StructMember &
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_StructMember &
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::StructMember* tmp = ACE_reinterpret_cast(IR::StructMember*,this->buffer_);
++ IR_StructMember* tmp = ACE_reinterpret_cast(IR_StructMember*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::StructMember &
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_StructMember &
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::StructMember * const tmp = ACE_reinterpret_cast (IR::StructMember* ACE_CAST_CONST, this->buffer_);
++ IR_StructMember * const tmp = ACE_reinterpret_cast (IR_StructMember* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::StructMember *
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_StructMember *
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::StructMember *result = 0;
++ IR_StructMember *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -9788,7 +9051,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::StructMember*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_StructMember*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -9797,7 +9060,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::StructMember*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_StructMember*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -9807,182 +9070,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::StructMember *
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (void) const
++ ACE_INLINE const IR_StructMember *
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::StructMember * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_StructMember * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_StructMemberSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_StructMemberSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::StructMember *data,
++ IR_StructMember *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::StructMember *tmp = ACE_reinterpret_cast(IR::StructMember*,this->buffer_);
++ IR_StructMember *tmp = ACE_reinterpret_cast(IR_StructMember*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_StructMemberSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_STRUCTMEMBERSEQ_CI_)
+-#define _TAO_IR_STRUCTMEMBERSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::StructMemberSeq_var
++// Inline operations for class IR_StructMemberSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::StructMemberSeq_var::StructMemberSeq_var (void) // default constructor
++IR_StructMemberSeq_var::IR_StructMemberSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::StructMemberSeq_var::StructMemberSeq_var (StructMemberSeq *p)
++IR_StructMemberSeq_var::IR_StructMemberSeq_var (IR_StructMemberSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::StructMemberSeq_var::StructMemberSeq_var (const ::IR::StructMemberSeq_var &p) // copy constructor
++IR_StructMemberSeq_var::IR_StructMemberSeq_var (const ::IR_StructMemberSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::StructMemberSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_StructMemberSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::StructMemberSeq_var::~StructMemberSeq_var (void) // destructor
++IR_StructMemberSeq_var::~IR_StructMemberSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::StructMemberSeq_var &
+-IR::StructMemberSeq_var::operator= (StructMemberSeq *p)
++ACE_INLINE IR_StructMemberSeq_var &
++IR_StructMemberSeq_var::operator= (IR_StructMemberSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::StructMemberSeq_var &
+-IR::StructMemberSeq_var::operator= (const ::IR::StructMemberSeq_var &p) // deep copy
++ACE_INLINE IR_StructMemberSeq_var &
++IR_StructMemberSeq_var::operator= (const ::IR_StructMemberSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::StructMemberSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_StructMemberSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::StructMemberSeq *
+-IR::StructMemberSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_StructMemberSeq *
++IR_StructMemberSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMemberSeq *
+-IR::StructMemberSeq_var::operator-> (void)
++ACE_INLINE ::IR_StructMemberSeq *
++IR_StructMemberSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StructMemberSeq_var::operator const ::IR::StructMemberSeq &() const // cast
++IR_StructMemberSeq_var::operator const ::IR_StructMemberSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StructMemberSeq_var::operator ::IR::StructMemberSeq &() // cast
++IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StructMemberSeq_var::operator ::IR::StructMemberSeq &() const // cast
++IR_StructMemberSeq_var::operator ::IR_StructMemberSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::StructMemberSeq_var::operator ::IR::StructMemberSeq *&() // cast
++IR_StructMemberSeq_var::operator ::IR_StructMemberSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructMember &
+-IR::StructMemberSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_StructMember &
++IR_StructMemberSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::StructMember &
+-IR::StructMemberSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_StructMember &
++IR_StructMemberSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::StructMember &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_StructMember &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::StructMemberSeq &
+-IR::StructMemberSeq_var::in (void) const
++ACE_INLINE const ::IR_StructMemberSeq &
++IR_StructMemberSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMemberSeq &
+-IR::StructMemberSeq_var::inout (void)
++ACE_INLINE ::IR_StructMemberSeq &
++IR_StructMemberSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::StructMemberSeq *&
+-IR::StructMemberSeq_var::out (void)
++ACE_INLINE ::IR_StructMemberSeq *&
++IR_StructMemberSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMemberSeq *
+-IR::StructMemberSeq_var::_retn (void)
++ACE_INLINE ::IR_StructMemberSeq *
++IR_StructMemberSeq_var::_retn (void)
+ {
+- ::IR::StructMemberSeq *tmp = this->ptr_;
++ ::IR_StructMemberSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::StructMemberSeq *
+-IR::StructMemberSeq_var::ptr (void) const
++ACE_INLINE ::IR_StructMemberSeq *
++IR_StructMemberSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::StructMemberSeq_out
++// Inline operations for class IR_StructMemberSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::StructMemberSeq_out::StructMemberSeq_out (StructMemberSeq *&p)
++IR_StructMemberSeq_out::IR_StructMemberSeq_out (IR_StructMemberSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::StructMemberSeq_out::StructMemberSeq_out (StructMemberSeq_var &p) // constructor from _var
++IR_StructMemberSeq_out::IR_StructMemberSeq_out (IR_StructMemberSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -9990,184 +9247,181 @@
+ }
+
+ ACE_INLINE
+-IR::StructMemberSeq_out::StructMemberSeq_out (const ::IR::StructMemberSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (StructMemberSeq_out&, p).ptr_)
++IR_StructMemberSeq_out::IR_StructMemberSeq_out (const ::IR_StructMemberSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_StructMemberSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::StructMemberSeq_out &
+-IR::StructMemberSeq_out::operator= (const ::IR::StructMemberSeq_out &p)
++ACE_INLINE ::IR_StructMemberSeq_out &
++IR_StructMemberSeq_out::operator= (const ::IR_StructMemberSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (StructMemberSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_StructMemberSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::StructMemberSeq_out &
+-IR::StructMemberSeq_out::operator= (StructMemberSeq *p)
++ACE_INLINE ::IR_StructMemberSeq_out &
++IR_StructMemberSeq_out::operator= (IR_StructMemberSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::StructMemberSeq_out::operator ::IR::StructMemberSeq *&() // cast
++IR_StructMemberSeq_out::operator ::IR_StructMemberSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMemberSeq *&
+-IR::StructMemberSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_StructMemberSeq *&
++IR_StructMemberSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::StructMemberSeq *
+-IR::StructMemberSeq_out::operator-> (void)
++ACE_INLINE ::IR_StructMemberSeq *
++IR_StructMemberSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StructMember &
+-IR::StructMemberSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_StructMember &
++IR_StructMemberSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::Initializer_var
++// Inline operations for class IR_Initializer_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Initializer_var::Initializer_var (void) // default constructor
++IR_Initializer_var::IR_Initializer_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::Initializer_var::Initializer_var (Initializer *p)
++IR_Initializer_var::IR_Initializer_var (IR_Initializer *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::Initializer_var::Initializer_var (const ::IR::Initializer_var &p) // copy constructor
++IR_Initializer_var::IR_Initializer_var (const ::IR_Initializer_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::Initializer (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_Initializer (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::Initializer_var::~Initializer_var (void) // destructor
++IR_Initializer_var::~IR_Initializer_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::Initializer_var &
+-IR::Initializer_var::operator= (Initializer *p)
++ACE_INLINE IR_Initializer_var &
++IR_Initializer_var::operator= (IR_Initializer *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::Initializer_var &
+-IR::Initializer_var::operator= (const ::IR::Initializer_var &p)
++ACE_INLINE ::IR_Initializer_var &
++IR_Initializer_var::operator= (const ::IR_Initializer_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::Initializer (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_Initializer (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::Initializer *
+-IR::Initializer_var::operator-> (void) const
++ACE_INLINE const ::IR_Initializer *
++IR_Initializer_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Initializer *
+-IR::Initializer_var::operator-> (void)
++ACE_INLINE ::IR_Initializer *
++IR_Initializer_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Initializer_var::operator const ::IR::Initializer &() const // cast
++IR_Initializer_var::operator const ::IR_Initializer &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Initializer_var::operator ::IR::Initializer &() // cast
++IR_Initializer_var::operator ::IR_Initializer &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Initializer_var::operator ::IR::Initializer &() const // cast
++IR_Initializer_var::operator ::IR_Initializer &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::Initializer_var::operator ::IR::Initializer *&() // cast
++IR_Initializer_var::operator ::IR_Initializer *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::Initializer &
+-IR::Initializer_var::in (void) const
++ACE_INLINE const ::IR_Initializer &
++IR_Initializer_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Initializer &
+-IR::Initializer_var::inout (void)
++ACE_INLINE ::IR_Initializer &
++IR_Initializer_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::Initializer *&
+-IR::Initializer_var::out (void)
++ACE_INLINE ::IR_Initializer *&
++IR_Initializer_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Initializer *
+-IR::Initializer_var::_retn (void)
++ACE_INLINE ::IR_Initializer *
++IR_Initializer_var::_retn (void)
+ {
+- ::IR::Initializer *tmp = this->ptr_;
++ ::IR_Initializer *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::Initializer *
+-IR::Initializer_var::ptr (void) const
++ACE_INLINE ::IR_Initializer *
++IR_Initializer_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::Initializer_out
++// Inline operations for class IR_Initializer_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Initializer_out::Initializer_out (::IR::Initializer *&p)
++IR_Initializer_out::IR_Initializer_out (::IR_Initializer *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::Initializer_out::Initializer_out (Initializer_var &p) // constructor from _var
++IR_Initializer_out::IR_Initializer_out (IR_Initializer_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -10175,93 +9429,89 @@
+ }
+
+ ACE_INLINE
+-IR::Initializer_out::Initializer_out (const ::IR::Initializer_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (Initializer_out&, p).ptr_)
++IR_Initializer_out::IR_Initializer_out (const ::IR_Initializer_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_Initializer_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::Initializer_out &
+-IR::Initializer_out::operator= (const ::IR::Initializer_out &p)
++ACE_INLINE IR_Initializer_out &
++IR_Initializer_out::operator= (const ::IR_Initializer_out &p)
+ {
+- this->ptr_ = ACE_const_cast (Initializer_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_Initializer_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::Initializer_out &
+-IR::Initializer_out::operator= (Initializer *p)
++ACE_INLINE IR_Initializer_out &
++IR_Initializer_out::operator= (IR_Initializer *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Initializer_out::operator ::IR::Initializer *&() // cast
++IR_Initializer_out::operator ::IR_Initializer *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Initializer *&
+-IR::Initializer_out::ptr (void) // ptr
++ACE_INLINE ::IR_Initializer *&
++IR_Initializer_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Initializer *
+-IR::Initializer_out::operator-> (void)
++ACE_INLINE ::IR_Initializer *
++IR_Initializer_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_INITIALIZERSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::Initializer *
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_Initializer *
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::Initializer *retval = 0;
+- ACE_NEW_RETURN (retval, IR::Initializer[size], 0);
++ IR_Initializer *retval = 0;
++ ACE_NEW_RETURN (retval, IR_Initializer[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (IR::Initializer *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (IR_Initializer *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::Initializer *data,
++ IR_Initializer *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::_TAO_Unbounded_Sequence_IR_InitializerSeq (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::Initializer *tmp1 = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (this->maximum_);
+- IR::Initializer * const tmp2 = ACE_reinterpret_cast (IR::Initializer * ACE_CAST_CONST, rhs.buffer_);
++ IR_Initializer *tmp1 = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (this->maximum_);
++ IR_Initializer * const tmp2 = ACE_reinterpret_cast (IR_Initializer * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -10274,8 +9524,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_InitializerSeq &
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_InitializerSeq &
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::operator= (const _TAO_Unbounded_Sequence_IR_InitializerSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -10286,7 +9536,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::Initializer *tmp = ACE_reinterpret_cast (IR::Initializer *, this->buffer_);
++ IR_Initializer *tmp = ACE_reinterpret_cast (IR_Initializer *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_InitializerSeq::allocbuf (rhs.maximum_);
+ }
+@@ -10296,8 +9546,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::Initializer *tmp1 = ACE_reinterpret_cast (IR::Initializer *, this->buffer_);
+- IR::Initializer * const tmp2 = ACE_reinterpret_cast (IR::Initializer * ACE_CAST_CONST, rhs.buffer_);
++ IR_Initializer *tmp1 = ACE_reinterpret_cast (IR_Initializer *, this->buffer_);
++ IR_Initializer * const tmp2 = ACE_reinterpret_cast (IR_Initializer * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -10306,30 +9556,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::Initializer &
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_Initializer &
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::Initializer* tmp = ACE_reinterpret_cast(IR::Initializer*,this->buffer_);
++ IR_Initializer* tmp = ACE_reinterpret_cast(IR_Initializer*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::Initializer &
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_Initializer &
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::Initializer * const tmp = ACE_reinterpret_cast (IR::Initializer* ACE_CAST_CONST, this->buffer_);
++ IR_Initializer * const tmp = ACE_reinterpret_cast (IR_Initializer* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::Initializer *
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_Initializer *
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::Initializer *result = 0;
++ IR_Initializer *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -10341,7 +9591,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::Initializer*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_Initializer*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -10350,7 +9600,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::Initializer*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_Initializer*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -10360,182 +9610,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::Initializer *
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (void) const
++ ACE_INLINE const IR_Initializer *
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::Initializer * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_Initializer * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_InitializerSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_InitializerSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::Initializer *data,
++ IR_Initializer *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::Initializer *tmp = ACE_reinterpret_cast(IR::Initializer*,this->buffer_);
++ IR_Initializer *tmp = ACE_reinterpret_cast(IR_Initializer*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_InitializerSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_INITIALIZERSEQ_CI_)
+-#define _TAO_IR_INITIALIZERSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::InitializerSeq_var
++// Inline operations for class IR_InitializerSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::InitializerSeq_var::InitializerSeq_var (void) // default constructor
++IR_InitializerSeq_var::IR_InitializerSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::InitializerSeq_var::InitializerSeq_var (InitializerSeq *p)
++IR_InitializerSeq_var::IR_InitializerSeq_var (IR_InitializerSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::InitializerSeq_var::InitializerSeq_var (const ::IR::InitializerSeq_var &p) // copy constructor
++IR_InitializerSeq_var::IR_InitializerSeq_var (const ::IR_InitializerSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::InitializerSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_InitializerSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::InitializerSeq_var::~InitializerSeq_var (void) // destructor
++IR_InitializerSeq_var::~IR_InitializerSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::InitializerSeq_var &
+-IR::InitializerSeq_var::operator= (InitializerSeq *p)
++ACE_INLINE IR_InitializerSeq_var &
++IR_InitializerSeq_var::operator= (IR_InitializerSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::InitializerSeq_var &
+-IR::InitializerSeq_var::operator= (const ::IR::InitializerSeq_var &p) // deep copy
++ACE_INLINE IR_InitializerSeq_var &
++IR_InitializerSeq_var::operator= (const ::IR_InitializerSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::InitializerSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_InitializerSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::InitializerSeq *
+-IR::InitializerSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_InitializerSeq *
++IR_InitializerSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InitializerSeq *
+-IR::InitializerSeq_var::operator-> (void)
++ACE_INLINE ::IR_InitializerSeq *
++IR_InitializerSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InitializerSeq_var::operator const ::IR::InitializerSeq &() const // cast
++IR_InitializerSeq_var::operator const ::IR_InitializerSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InitializerSeq_var::operator ::IR::InitializerSeq &() // cast
++IR_InitializerSeq_var::operator ::IR_InitializerSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InitializerSeq_var::operator ::IR::InitializerSeq &() const // cast
++IR_InitializerSeq_var::operator ::IR_InitializerSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::InitializerSeq_var::operator ::IR::InitializerSeq *&() // cast
++IR_InitializerSeq_var::operator ::IR_InitializerSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Initializer &
+-IR::InitializerSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_Initializer &
++IR_InitializerSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::Initializer &
+-IR::InitializerSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_Initializer &
++IR_InitializerSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::Initializer &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_Initializer &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::InitializerSeq &
+-IR::InitializerSeq_var::in (void) const
++ACE_INLINE const ::IR_InitializerSeq &
++IR_InitializerSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InitializerSeq &
+-IR::InitializerSeq_var::inout (void)
++ACE_INLINE ::IR_InitializerSeq &
++IR_InitializerSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::InitializerSeq *&
+-IR::InitializerSeq_var::out (void)
++ACE_INLINE ::IR_InitializerSeq *&
++IR_InitializerSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InitializerSeq *
+-IR::InitializerSeq_var::_retn (void)
++ACE_INLINE ::IR_InitializerSeq *
++IR_InitializerSeq_var::_retn (void)
+ {
+- ::IR::InitializerSeq *tmp = this->ptr_;
++ ::IR_InitializerSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::InitializerSeq *
+-IR::InitializerSeq_var::ptr (void) const
++ACE_INLINE ::IR_InitializerSeq *
++IR_InitializerSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::InitializerSeq_out
++// Inline operations for class IR_InitializerSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::InitializerSeq_out::InitializerSeq_out (InitializerSeq *&p)
++IR_InitializerSeq_out::IR_InitializerSeq_out (IR_InitializerSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::InitializerSeq_out::InitializerSeq_out (InitializerSeq_var &p) // constructor from _var
++IR_InitializerSeq_out::IR_InitializerSeq_out (IR_InitializerSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -10543,184 +9787,181 @@
+ }
+
+ ACE_INLINE
+-IR::InitializerSeq_out::InitializerSeq_out (const ::IR::InitializerSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (InitializerSeq_out&, p).ptr_)
++IR_InitializerSeq_out::IR_InitializerSeq_out (const ::IR_InitializerSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_InitializerSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::InitializerSeq_out &
+-IR::InitializerSeq_out::operator= (const ::IR::InitializerSeq_out &p)
++ACE_INLINE ::IR_InitializerSeq_out &
++IR_InitializerSeq_out::operator= (const ::IR_InitializerSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (InitializerSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_InitializerSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::InitializerSeq_out &
+-IR::InitializerSeq_out::operator= (InitializerSeq *p)
++ACE_INLINE ::IR_InitializerSeq_out &
++IR_InitializerSeq_out::operator= (IR_InitializerSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::InitializerSeq_out::operator ::IR::InitializerSeq *&() // cast
++IR_InitializerSeq_out::operator ::IR_InitializerSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InitializerSeq *&
+-IR::InitializerSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_InitializerSeq *&
++IR_InitializerSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InitializerSeq *
+-IR::InitializerSeq_out::operator-> (void)
++ACE_INLINE ::IR_InitializerSeq *
++IR_InitializerSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Initializer &
+-IR::InitializerSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_Initializer &
++IR_InitializerSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::UnionMember_var
++// Inline operations for class IR_UnionMember_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UnionMember_var::UnionMember_var (void) // default constructor
++IR_UnionMember_var::IR_UnionMember_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::UnionMember_var::UnionMember_var (UnionMember *p)
++IR_UnionMember_var::IR_UnionMember_var (IR_UnionMember *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::UnionMember_var::UnionMember_var (const ::IR::UnionMember_var &p) // copy constructor
++IR_UnionMember_var::IR_UnionMember_var (const ::IR_UnionMember_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::UnionMember (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_UnionMember (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UnionMember_var::~UnionMember_var (void) // destructor
++IR_UnionMember_var::~IR_UnionMember_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionMember_var &
+-IR::UnionMember_var::operator= (UnionMember *p)
++ACE_INLINE IR_UnionMember_var &
++IR_UnionMember_var::operator= (IR_UnionMember *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::UnionMember_var &
+-IR::UnionMember_var::operator= (const ::IR::UnionMember_var &p)
++ACE_INLINE ::IR_UnionMember_var &
++IR_UnionMember_var::operator= (const ::IR_UnionMember_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::UnionMember (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_UnionMember (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::UnionMember *
+-IR::UnionMember_var::operator-> (void) const
++ACE_INLINE const ::IR_UnionMember *
++IR_UnionMember_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMember *
+-IR::UnionMember_var::operator-> (void)
++ACE_INLINE ::IR_UnionMember *
++IR_UnionMember_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UnionMember_var::operator const ::IR::UnionMember &() const // cast
++IR_UnionMember_var::operator const ::IR_UnionMember &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UnionMember_var::operator ::IR::UnionMember &() // cast
++IR_UnionMember_var::operator ::IR_UnionMember &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UnionMember_var::operator ::IR::UnionMember &() const // cast
++IR_UnionMember_var::operator ::IR_UnionMember &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::UnionMember_var::operator ::IR::UnionMember *&() // cast
++IR_UnionMember_var::operator ::IR_UnionMember *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::UnionMember &
+-IR::UnionMember_var::in (void) const
++ACE_INLINE const ::IR_UnionMember &
++IR_UnionMember_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMember &
+-IR::UnionMember_var::inout (void)
++ACE_INLINE ::IR_UnionMember &
++IR_UnionMember_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::UnionMember *&
+-IR::UnionMember_var::out (void)
++ACE_INLINE ::IR_UnionMember *&
++IR_UnionMember_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMember *
+-IR::UnionMember_var::_retn (void)
++ACE_INLINE ::IR_UnionMember *
++IR_UnionMember_var::_retn (void)
+ {
+- ::IR::UnionMember *tmp = this->ptr_;
++ ::IR_UnionMember *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::UnionMember *
+-IR::UnionMember_var::ptr (void) const
++ACE_INLINE ::IR_UnionMember *
++IR_UnionMember_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::UnionMember_out
++// Inline operations for class IR_UnionMember_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UnionMember_out::UnionMember_out (::IR::UnionMember *&p)
++IR_UnionMember_out::IR_UnionMember_out (::IR_UnionMember *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UnionMember_out::UnionMember_out (UnionMember_var &p) // constructor from _var
++IR_UnionMember_out::IR_UnionMember_out (IR_UnionMember_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -10728,93 +9969,89 @@
+ }
+
+ ACE_INLINE
+-IR::UnionMember_out::UnionMember_out (const ::IR::UnionMember_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (UnionMember_out&, p).ptr_)
++IR_UnionMember_out::IR_UnionMember_out (const ::IR_UnionMember_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_UnionMember_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::UnionMember_out &
+-IR::UnionMember_out::operator= (const ::IR::UnionMember_out &p)
++ACE_INLINE IR_UnionMember_out &
++IR_UnionMember_out::operator= (const ::IR_UnionMember_out &p)
+ {
+- this->ptr_ = ACE_const_cast (UnionMember_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_UnionMember_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::UnionMember_out &
+-IR::UnionMember_out::operator= (UnionMember *p)
++ACE_INLINE IR_UnionMember_out &
++IR_UnionMember_out::operator= (IR_UnionMember *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UnionMember_out::operator ::IR::UnionMember *&() // cast
++IR_UnionMember_out::operator ::IR_UnionMember *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMember *&
+-IR::UnionMember_out::ptr (void) // ptr
++ACE_INLINE ::IR_UnionMember *&
++IR_UnionMember_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMember *
+-IR::UnionMember_out::operator-> (void)
++ACE_INLINE ::IR_UnionMember *
++IR_UnionMember_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_UNIONMEMBERSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::UnionMember *
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_UnionMember *
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::UnionMember *retval = 0;
+- ACE_NEW_RETURN (retval, IR::UnionMember[size], 0);
++ IR_UnionMember *retval = 0;
++ ACE_NEW_RETURN (retval, IR_UnionMember[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (IR::UnionMember *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (IR_UnionMember *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::UnionMember *data,
++ IR_UnionMember *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::_TAO_Unbounded_Sequence_IR_UnionMemberSeq (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::UnionMember *tmp1 = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (this->maximum_);
+- IR::UnionMember * const tmp2 = ACE_reinterpret_cast (IR::UnionMember * ACE_CAST_CONST, rhs.buffer_);
++ IR_UnionMember *tmp1 = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (this->maximum_);
++ IR_UnionMember * const tmp2 = ACE_reinterpret_cast (IR_UnionMember * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -10827,8 +10064,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq &
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq &
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_UnionMemberSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -10839,7 +10076,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::UnionMember *tmp = ACE_reinterpret_cast (IR::UnionMember *, this->buffer_);
++ IR_UnionMember *tmp = ACE_reinterpret_cast (IR_UnionMember *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_UnionMemberSeq::allocbuf (rhs.maximum_);
+ }
+@@ -10849,8 +10086,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::UnionMember *tmp1 = ACE_reinterpret_cast (IR::UnionMember *, this->buffer_);
+- IR::UnionMember * const tmp2 = ACE_reinterpret_cast (IR::UnionMember * ACE_CAST_CONST, rhs.buffer_);
++ IR_UnionMember *tmp1 = ACE_reinterpret_cast (IR_UnionMember *, this->buffer_);
++ IR_UnionMember * const tmp2 = ACE_reinterpret_cast (IR_UnionMember * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -10859,30 +10096,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::UnionMember &
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_UnionMember &
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::UnionMember* tmp = ACE_reinterpret_cast(IR::UnionMember*,this->buffer_);
++ IR_UnionMember* tmp = ACE_reinterpret_cast(IR_UnionMember*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::UnionMember &
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_UnionMember &
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::UnionMember * const tmp = ACE_reinterpret_cast (IR::UnionMember* ACE_CAST_CONST, this->buffer_);
++ IR_UnionMember * const tmp = ACE_reinterpret_cast (IR_UnionMember* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::UnionMember *
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_UnionMember *
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::UnionMember *result = 0;
++ IR_UnionMember *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -10894,7 +10131,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::UnionMember*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_UnionMember*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -10903,7 +10140,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::UnionMember*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_UnionMember*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -10913,182 +10150,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::UnionMember *
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (void) const
++ ACE_INLINE const IR_UnionMember *
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::UnionMember * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_UnionMember * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_UnionMemberSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_UnionMemberSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::UnionMember *data,
++ IR_UnionMember *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::UnionMember *tmp = ACE_reinterpret_cast(IR::UnionMember*,this->buffer_);
++ IR_UnionMember *tmp = ACE_reinterpret_cast(IR_UnionMember*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_UnionMemberSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_UNIONMEMBERSEQ_CI_)
+-#define _TAO_IR_UNIONMEMBERSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::UnionMemberSeq_var
++// Inline operations for class IR_UnionMemberSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UnionMemberSeq_var::UnionMemberSeq_var (void) // default constructor
++IR_UnionMemberSeq_var::IR_UnionMemberSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::UnionMemberSeq_var::UnionMemberSeq_var (UnionMemberSeq *p)
++IR_UnionMemberSeq_var::IR_UnionMemberSeq_var (IR_UnionMemberSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::UnionMemberSeq_var::UnionMemberSeq_var (const ::IR::UnionMemberSeq_var &p) // copy constructor
++IR_UnionMemberSeq_var::IR_UnionMemberSeq_var (const ::IR_UnionMemberSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::UnionMemberSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_UnionMemberSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UnionMemberSeq_var::~UnionMemberSeq_var (void) // destructor
++IR_UnionMemberSeq_var::~IR_UnionMemberSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionMemberSeq_var &
+-IR::UnionMemberSeq_var::operator= (UnionMemberSeq *p)
++ACE_INLINE IR_UnionMemberSeq_var &
++IR_UnionMemberSeq_var::operator= (IR_UnionMemberSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::UnionMemberSeq_var &
+-IR::UnionMemberSeq_var::operator= (const ::IR::UnionMemberSeq_var &p) // deep copy
++ACE_INLINE IR_UnionMemberSeq_var &
++IR_UnionMemberSeq_var::operator= (const ::IR_UnionMemberSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::UnionMemberSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_UnionMemberSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::UnionMemberSeq *
+-IR::UnionMemberSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_UnionMemberSeq *
++IR_UnionMemberSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMemberSeq *
+-IR::UnionMemberSeq_var::operator-> (void)
++ACE_INLINE ::IR_UnionMemberSeq *
++IR_UnionMemberSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UnionMemberSeq_var::operator const ::IR::UnionMemberSeq &() const // cast
++IR_UnionMemberSeq_var::operator const ::IR_UnionMemberSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UnionMemberSeq_var::operator ::IR::UnionMemberSeq &() // cast
++IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UnionMemberSeq_var::operator ::IR::UnionMemberSeq &() const // cast
++IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::UnionMemberSeq_var::operator ::IR::UnionMemberSeq *&() // cast
++IR_UnionMemberSeq_var::operator ::IR_UnionMemberSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionMember &
+-IR::UnionMemberSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_UnionMember &
++IR_UnionMemberSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::UnionMember &
+-IR::UnionMemberSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_UnionMember &
++IR_UnionMemberSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::UnionMember &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_UnionMember &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::UnionMemberSeq &
+-IR::UnionMemberSeq_var::in (void) const
++ACE_INLINE const ::IR_UnionMemberSeq &
++IR_UnionMemberSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMemberSeq &
+-IR::UnionMemberSeq_var::inout (void)
++ACE_INLINE ::IR_UnionMemberSeq &
++IR_UnionMemberSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::UnionMemberSeq *&
+-IR::UnionMemberSeq_var::out (void)
++ACE_INLINE ::IR_UnionMemberSeq *&
++IR_UnionMemberSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMemberSeq *
+-IR::UnionMemberSeq_var::_retn (void)
++ACE_INLINE ::IR_UnionMemberSeq *
++IR_UnionMemberSeq_var::_retn (void)
+ {
+- ::IR::UnionMemberSeq *tmp = this->ptr_;
++ ::IR_UnionMemberSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::UnionMemberSeq *
+-IR::UnionMemberSeq_var::ptr (void) const
++ACE_INLINE ::IR_UnionMemberSeq *
++IR_UnionMemberSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::UnionMemberSeq_out
++// Inline operations for class IR_UnionMemberSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UnionMemberSeq_out::UnionMemberSeq_out (UnionMemberSeq *&p)
++IR_UnionMemberSeq_out::IR_UnionMemberSeq_out (IR_UnionMemberSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UnionMemberSeq_out::UnionMemberSeq_out (UnionMemberSeq_var &p) // constructor from _var
++IR_UnionMemberSeq_out::IR_UnionMemberSeq_out (IR_UnionMemberSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -11096,194 +10327,187 @@
+ }
+
+ ACE_INLINE
+-IR::UnionMemberSeq_out::UnionMemberSeq_out (const ::IR::UnionMemberSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (UnionMemberSeq_out&, p).ptr_)
++IR_UnionMemberSeq_out::IR_UnionMemberSeq_out (const ::IR_UnionMemberSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_UnionMemberSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::UnionMemberSeq_out &
+-IR::UnionMemberSeq_out::operator= (const ::IR::UnionMemberSeq_out &p)
++ACE_INLINE ::IR_UnionMemberSeq_out &
++IR_UnionMemberSeq_out::operator= (const ::IR_UnionMemberSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (UnionMemberSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_UnionMemberSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::UnionMemberSeq_out &
+-IR::UnionMemberSeq_out::operator= (UnionMemberSeq *p)
++ACE_INLINE ::IR_UnionMemberSeq_out &
++IR_UnionMemberSeq_out::operator= (IR_UnionMemberSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UnionMemberSeq_out::operator ::IR::UnionMemberSeq *&() // cast
++IR_UnionMemberSeq_out::operator ::IR_UnionMemberSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMemberSeq *&
+-IR::UnionMemberSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_UnionMemberSeq *&
++IR_UnionMemberSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UnionMemberSeq *
+-IR::UnionMemberSeq_out::operator-> (void)
++ACE_INLINE ::IR_UnionMemberSeq *
++IR_UnionMemberSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UnionMember &
+-IR::UnionMemberSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_UnionMember &
++IR_UnionMemberSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ENUMMEMBERSEQ_CI_)
+-#define _TAO_IR_ENUMMEMBERSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::EnumMemberSeq_var
++// Inline operations for class IR_EnumMemberSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EnumMemberSeq_var::EnumMemberSeq_var (void) // default constructor
++IR_EnumMemberSeq_var::IR_EnumMemberSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::EnumMemberSeq_var::EnumMemberSeq_var (EnumMemberSeq *p)
++IR_EnumMemberSeq_var::IR_EnumMemberSeq_var (IR_EnumMemberSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::EnumMemberSeq_var::EnumMemberSeq_var (const ::IR::EnumMemberSeq_var &p) // copy constructor
++IR_EnumMemberSeq_var::IR_EnumMemberSeq_var (const ::IR_EnumMemberSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::EnumMemberSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_EnumMemberSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::EnumMemberSeq_var::~EnumMemberSeq_var (void) // destructor
++IR_EnumMemberSeq_var::~IR_EnumMemberSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::EnumMemberSeq_var &
+-IR::EnumMemberSeq_var::operator= (EnumMemberSeq *p)
++ACE_INLINE IR_EnumMemberSeq_var &
++IR_EnumMemberSeq_var::operator= (IR_EnumMemberSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::EnumMemberSeq_var &
+-IR::EnumMemberSeq_var::operator= (const ::IR::EnumMemberSeq_var &p) // deep copy
++ACE_INLINE IR_EnumMemberSeq_var &
++IR_EnumMemberSeq_var::operator= (const ::IR_EnumMemberSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::EnumMemberSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_EnumMemberSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::EnumMemberSeq *
+-IR::EnumMemberSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_EnumMemberSeq *
++IR_EnumMemberSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EnumMemberSeq *
+-IR::EnumMemberSeq_var::operator-> (void)
++ACE_INLINE ::IR_EnumMemberSeq *
++IR_EnumMemberSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EnumMemberSeq_var::operator const ::IR::EnumMemberSeq &() const // cast
++IR_EnumMemberSeq_var::operator const ::IR_EnumMemberSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EnumMemberSeq_var::operator ::IR::EnumMemberSeq &() // cast
++IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EnumMemberSeq_var::operator ::IR::EnumMemberSeq &() const // cast
++IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::EnumMemberSeq_var::operator ::IR::EnumMemberSeq *&() // cast
++IR_EnumMemberSeq_var::operator ::IR_EnumMemberSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE TAO_SeqElem_String_Manager
+-IR::EnumMemberSeq_var::operator[] (CORBA::ULong index)
++IR_EnumMemberSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::EnumMemberSeq &
+-IR::EnumMemberSeq_var::in (void) const
++ACE_INLINE const ::IR_EnumMemberSeq &
++IR_EnumMemberSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EnumMemberSeq &
+-IR::EnumMemberSeq_var::inout (void)
++ACE_INLINE ::IR_EnumMemberSeq &
++IR_EnumMemberSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::EnumMemberSeq *&
+-IR::EnumMemberSeq_var::out (void)
++ACE_INLINE ::IR_EnumMemberSeq *&
++IR_EnumMemberSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EnumMemberSeq *
+-IR::EnumMemberSeq_var::_retn (void)
++ACE_INLINE ::IR_EnumMemberSeq *
++IR_EnumMemberSeq_var::_retn (void)
+ {
+- ::IR::EnumMemberSeq *tmp = this->ptr_;
++ ::IR_EnumMemberSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::EnumMemberSeq *
+-IR::EnumMemberSeq_var::ptr (void) const
++ACE_INLINE ::IR_EnumMemberSeq *
++IR_EnumMemberSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::EnumMemberSeq_out
++// Inline operations for class IR_EnumMemberSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EnumMemberSeq_out::EnumMemberSeq_out (EnumMemberSeq *&p)
++IR_EnumMemberSeq_out::IR_EnumMemberSeq_out (IR_EnumMemberSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::EnumMemberSeq_out::EnumMemberSeq_out (EnumMemberSeq_var &p) // constructor from _var
++IR_EnumMemberSeq_out::IR_EnumMemberSeq_out (IR_EnumMemberSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -11291,184 +10515,181 @@
+ }
+
+ ACE_INLINE
+-IR::EnumMemberSeq_out::EnumMemberSeq_out (const ::IR::EnumMemberSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (EnumMemberSeq_out&, p).ptr_)
++IR_EnumMemberSeq_out::IR_EnumMemberSeq_out (const ::IR_EnumMemberSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_EnumMemberSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::EnumMemberSeq_out &
+-IR::EnumMemberSeq_out::operator= (const ::IR::EnumMemberSeq_out &p)
++ACE_INLINE ::IR_EnumMemberSeq_out &
++IR_EnumMemberSeq_out::operator= (const ::IR_EnumMemberSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (EnumMemberSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_EnumMemberSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::EnumMemberSeq_out &
+-IR::EnumMemberSeq_out::operator= (EnumMemberSeq *p)
++ACE_INLINE ::IR_EnumMemberSeq_out &
++IR_EnumMemberSeq_out::operator= (IR_EnumMemberSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EnumMemberSeq_out::operator ::IR::EnumMemberSeq *&() // cast
++IR_EnumMemberSeq_out::operator ::IR_EnumMemberSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EnumMemberSeq *&
+-IR::EnumMemberSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_EnumMemberSeq *&
++IR_EnumMemberSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EnumMemberSeq *
+-IR::EnumMemberSeq_out::operator-> (void)
++ACE_INLINE ::IR_EnumMemberSeq *
++IR_EnumMemberSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE TAO_SeqElem_String_Manager
+-IR::EnumMemberSeq_out::operator[] (CORBA::ULong index)
++IR_EnumMemberSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::Container::Description_var
++// Inline operations for class IR_Container::Description_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Container::Description_var::Description_var (void) // default constructor
++IR_Container::Description_var::Description_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::Container::Description_var::Description_var (Description *p)
++IR_Container::Description_var::Description_var (Description *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::Container::Description_var::Description_var (const ::IR::Container::Description_var &p) // copy constructor
++IR_Container::Description_var::Description_var (const ::IR_Container::Description_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::Container::Description (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_Container::Description (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::Container::Description_var::~Description_var (void) // destructor
++IR_Container::Description_var::~Description_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::Container::Description_var &
+-IR::Container::Description_var::operator= (Description *p)
++ACE_INLINE IR_Container::Description_var &
++IR_Container::Description_var::operator= (Description *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::Container::Description_var &
+-IR::Container::Description_var::operator= (const ::IR::Container::Description_var &p)
++ACE_INLINE ::IR_Container::Description_var &
++IR_Container::Description_var::operator= (const ::IR_Container::Description_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::Container::Description (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_Container::Description (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::Container::Description *
+-IR::Container::Description_var::operator-> (void) const
++ACE_INLINE const ::IR_Container::Description *
++IR_Container::Description_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::Description *
+-IR::Container::Description_var::operator-> (void)
++ACE_INLINE ::IR_Container::Description *
++IR_Container::Description_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Container::Description_var::operator const ::IR::Container::Description &() const // cast
++IR_Container::Description_var::operator const ::IR_Container::Description &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Container::Description_var::operator ::IR::Container::Description &() // cast
++IR_Container::Description_var::operator ::IR_Container::Description &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Container::Description_var::operator ::IR::Container::Description &() const // cast
++IR_Container::Description_var::operator ::IR_Container::Description &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::Container::Description_var::operator ::IR::Container::Description *&() // cast
++IR_Container::Description_var::operator ::IR_Container::Description *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::Container::Description &
+-IR::Container::Description_var::in (void) const
++ACE_INLINE const ::IR_Container::Description &
++IR_Container::Description_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::Description &
+-IR::Container::Description_var::inout (void)
++ACE_INLINE ::IR_Container::Description &
++IR_Container::Description_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::Container::Description *&
+-IR::Container::Description_var::out (void)
++ACE_INLINE ::IR_Container::Description *&
++IR_Container::Description_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::Description *
+-IR::Container::Description_var::_retn (void)
++ACE_INLINE ::IR_Container::Description *
++IR_Container::Description_var::_retn (void)
+ {
+- ::IR::Container::Description *tmp = this->ptr_;
++ ::IR_Container::Description *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::Container::Description *
+-IR::Container::Description_var::ptr (void) const
++ACE_INLINE ::IR_Container::Description *
++IR_Container::Description_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::Container::Description_out
++// Inline operations for class IR_Container::Description_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Container::Description_out::Description_out (::IR::Container::Description *&p)
++IR_Container::Description_out::Description_out (::IR_Container::Description *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::Container::Description_out::Description_out (Description_var &p) // constructor from _var
++IR_Container::Description_out::Description_out (Description_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -11476,93 +10697,89 @@
+ }
+
+ ACE_INLINE
+-IR::Container::Description_out::Description_out (const ::IR::Container::Description_out &p) // copy constructor
++IR_Container::Description_out::Description_out (const ::IR_Container::Description_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (Description_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::Container::Description_out &
+-IR::Container::Description_out::operator= (const ::IR::Container::Description_out &p)
++ACE_INLINE IR_Container::Description_out &
++IR_Container::Description_out::operator= (const ::IR_Container::Description_out &p)
+ {
+ this->ptr_ = ACE_const_cast (Description_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::Container::Description_out &
+-IR::Container::Description_out::operator= (Description *p)
++ACE_INLINE IR_Container::Description_out &
++IR_Container::Description_out::operator= (Description *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Container::Description_out::operator ::IR::Container::Description *&() // cast
++IR_Container::Description_out::operator ::IR_Container::Description *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::Description *&
+-IR::Container::Description_out::ptr (void) // ptr
++ACE_INLINE ::IR_Container::Description *&
++IR_Container::Description_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::Description *
+-IR::Container::Description_out::operator-> (void)
++ACE_INLINE ::IR_Container::Description *
++IR_Container::Description_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_CONTAINER_DESCRIPTIONSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::Container::Description *
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_Container::Description *
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::Container::Description *retval = 0;
+- ACE_NEW_RETURN (retval, IR::Container::Description[size], 0);
++ IR_Container::Description *retval = 0;
++ ACE_NEW_RETURN (retval, IR_Container::Description[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (IR::Container::Description *buffer)
++ ACE_INLINE void IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (IR_Container::Description *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Default constructor.
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum,
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::Container::Description *data,
++ IR_Container::Description *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::Container::Description *tmp1 = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (this->maximum_);
+- IR::Container::Description * const tmp2 = ACE_reinterpret_cast (IR::Container::Description * ACE_CAST_CONST, rhs.buffer_);
++ IR_Container::Description *tmp1 = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (this->maximum_);
++ IR_Container::Description * const tmp2 = ACE_reinterpret_cast (IR_Container::Description * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -11575,8 +10792,8 @@
+ }
+ }
+
+- ACE_INLINE IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
++ ACE_INLINE IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -11587,7 +10804,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::Container::Description *tmp = ACE_reinterpret_cast (IR::Container::Description *, this->buffer_);
++ IR_Container::Description *tmp = ACE_reinterpret_cast (IR_Container::Description *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::allocbuf (rhs.maximum_);
+ }
+@@ -11597,8 +10814,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::Container::Description *tmp1 = ACE_reinterpret_cast (IR::Container::Description *, this->buffer_);
+- IR::Container::Description * const tmp2 = ACE_reinterpret_cast (IR::Container::Description * ACE_CAST_CONST, rhs.buffer_);
++ IR_Container::Description *tmp1 = ACE_reinterpret_cast (IR_Container::Description *, this->buffer_);
++ IR_Container::Description * const tmp2 = ACE_reinterpret_cast (IR_Container::Description * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -11607,30 +10824,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::Container::Description &
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_Container::Description &
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::Container::Description* tmp = ACE_reinterpret_cast(IR::Container::Description*,this->buffer_);
++ IR_Container::Description* tmp = ACE_reinterpret_cast(IR_Container::Description*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::Container::Description &
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_Container::Description &
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::Container::Description * const tmp = ACE_reinterpret_cast (IR::Container::Description* ACE_CAST_CONST, this->buffer_);
++ IR_Container::Description * const tmp = ACE_reinterpret_cast (IR_Container::Description* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::Container::Description *
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_Container::Description *
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::Container::Description *result = 0;
++ IR_Container::Description *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -11642,7 +10859,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::Container::Description*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_Container::Description*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -11651,7 +10868,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::Container::Description*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_Container::Description*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -11661,182 +10878,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::Container::Description *
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (void) const
++ ACE_INLINE const IR_Container::Description *
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::Container::Description * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_Container::Description * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::replace (CORBA::ULong max,
++ IR_Container::_TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::Container::Description *data,
++ IR_Container::Description *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::Container::Description *tmp = ACE_reinterpret_cast(IR::Container::Description*,this->buffer_);
++ IR_Container::Description *tmp = ACE_reinterpret_cast(IR_Container::Description*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_Container_DescriptionSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_CONTAINER_DESCRIPTIONSEQ_CI_)
+-#define _TAO_IR_CONTAINER_DESCRIPTIONSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::Container::DescriptionSeq_var
++// Inline operations for class IR_Container::DescriptionSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_var::DescriptionSeq_var (void) // default constructor
++IR_Container::DescriptionSeq_var::DescriptionSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_var::DescriptionSeq_var (DescriptionSeq *p)
++IR_Container::DescriptionSeq_var::DescriptionSeq_var (DescriptionSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_var::DescriptionSeq_var (const ::IR::Container::DescriptionSeq_var &p) // copy constructor
++IR_Container::DescriptionSeq_var::DescriptionSeq_var (const ::IR_Container::DescriptionSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::Container::DescriptionSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_Container::DescriptionSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_var::~DescriptionSeq_var (void) // destructor
++IR_Container::DescriptionSeq_var::~DescriptionSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::Container::DescriptionSeq_var &
+-IR::Container::DescriptionSeq_var::operator= (DescriptionSeq *p)
++ACE_INLINE IR_Container::DescriptionSeq_var &
++IR_Container::DescriptionSeq_var::operator= (DescriptionSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::Container::DescriptionSeq_var &
+-IR::Container::DescriptionSeq_var::operator= (const ::IR::Container::DescriptionSeq_var &p) // deep copy
++ACE_INLINE IR_Container::DescriptionSeq_var &
++IR_Container::DescriptionSeq_var::operator= (const ::IR_Container::DescriptionSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::Container::DescriptionSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_Container::DescriptionSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::Container::DescriptionSeq *
+-IR::Container::DescriptionSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_Container::DescriptionSeq *
++IR_Container::DescriptionSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::DescriptionSeq *
+-IR::Container::DescriptionSeq_var::operator-> (void)
++ACE_INLINE ::IR_Container::DescriptionSeq *
++IR_Container::DescriptionSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_var::operator const ::IR::Container::DescriptionSeq &() const // cast
++IR_Container::DescriptionSeq_var::operator const ::IR_Container::DescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_var::operator ::IR::Container::DescriptionSeq &() // cast
++IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_var::operator ::IR::Container::DescriptionSeq &() const // cast
++IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::Container::DescriptionSeq_var::operator ::IR::Container::DescriptionSeq *&() // cast
++IR_Container::DescriptionSeq_var::operator ::IR_Container::DescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container::Description &
+-IR::Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_Container::Description &
++IR_Container::DescriptionSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::Container::Description &
+-IR::Container::DescriptionSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_Container::Description &
++IR_Container::DescriptionSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::Container::Description &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_Container::Description &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::Container::DescriptionSeq &
+-IR::Container::DescriptionSeq_var::in (void) const
++ACE_INLINE const ::IR_Container::DescriptionSeq &
++IR_Container::DescriptionSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::DescriptionSeq &
+-IR::Container::DescriptionSeq_var::inout (void)
++ACE_INLINE ::IR_Container::DescriptionSeq &
++IR_Container::DescriptionSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::Container::DescriptionSeq *&
+-IR::Container::DescriptionSeq_var::out (void)
++ACE_INLINE ::IR_Container::DescriptionSeq *&
++IR_Container::DescriptionSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::DescriptionSeq *
+-IR::Container::DescriptionSeq_var::_retn (void)
++ACE_INLINE ::IR_Container::DescriptionSeq *
++IR_Container::DescriptionSeq_var::_retn (void)
+ {
+- ::IR::Container::DescriptionSeq *tmp = this->ptr_;
++ ::IR_Container::DescriptionSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::Container::DescriptionSeq *
+-IR::Container::DescriptionSeq_var::ptr (void) const
++ACE_INLINE ::IR_Container::DescriptionSeq *
++IR_Container::DescriptionSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::Container::DescriptionSeq_out
++// Inline operations for class IR_Container::DescriptionSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq *&p)
++IR_Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq_var &p) // constructor from _var
++IR_Container::DescriptionSeq_out::DescriptionSeq_out (DescriptionSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -11844,57 +11055,50 @@
+ }
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_out::DescriptionSeq_out (const ::IR::Container::DescriptionSeq_out &p) // copy constructor
++IR_Container::DescriptionSeq_out::DescriptionSeq_out (const ::IR_Container::DescriptionSeq_out &p) // copy constructor
+ : ptr_ (ACE_const_cast (DescriptionSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::Container::DescriptionSeq_out &
+-IR::Container::DescriptionSeq_out::operator= (const ::IR::Container::DescriptionSeq_out &p)
++ACE_INLINE ::IR_Container::DescriptionSeq_out &
++IR_Container::DescriptionSeq_out::operator= (const ::IR_Container::DescriptionSeq_out &p)
+ {
+ this->ptr_ = ACE_const_cast (DescriptionSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::Container::DescriptionSeq_out &
+-IR::Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
++ACE_INLINE ::IR_Container::DescriptionSeq_out &
++IR_Container::DescriptionSeq_out::operator= (DescriptionSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::Container::DescriptionSeq_out::operator ::IR::Container::DescriptionSeq *&() // cast
++IR_Container::DescriptionSeq_out::operator ::IR_Container::DescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::DescriptionSeq *&
+-IR::Container::DescriptionSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_Container::DescriptionSeq *&
++IR_Container::DescriptionSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::Container::DescriptionSeq *
+-IR::Container::DescriptionSeq_out::operator-> (void)
++ACE_INLINE ::IR_Container::DescriptionSeq *
++IR_Container::DescriptionSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::Container::Description &
+-IR::Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_Container::Description &
++IR_Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___CI_)
+-#define _TAO_IR_PRIMITIVEDEF___CI_
+-
+ ACE_INLINE
+-IR::PrimitiveDef::PrimitiveDef (
++IR_PrimitiveDef::IR_PrimitiveDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -11904,185 +11108,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___VAR_CI_)
+-#define _TAO_IR_PRIMITIVEDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::PrimitiveDef_var
++// Inline operations for class IR_PrimitiveDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PrimitiveDef_var::PrimitiveDef_var (void) // default constructor
+- : ptr_ (IR::PrimitiveDef::_nil ())
++IR_PrimitiveDef_var::IR_PrimitiveDef_var (void) // default constructor
++ : ptr_ (IR_PrimitiveDef::_nil ())
+ {}
+
+-ACE_INLINE IR::PrimitiveDef_ptr
+-IR::PrimitiveDef_var::ptr (void) const
++ACE_INLINE IR_PrimitiveDef_ptr
++IR_PrimitiveDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PrimitiveDef_var::PrimitiveDef_var (const IR::PrimitiveDef_var &p) // copy constructor
++IR_PrimitiveDef_var::IR_PrimitiveDef_var (const IR_PrimitiveDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (PrimitiveDef::_duplicate (p.ptr ()))
++ ptr_ (IR_PrimitiveDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::PrimitiveDef_var::~PrimitiveDef_var (void) // destructor
++IR_PrimitiveDef_var::~IR_PrimitiveDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::PrimitiveDef_var &
+-IR::PrimitiveDef_var::operator= (IR::PrimitiveDef_ptr p)
++ACE_INLINE IR_PrimitiveDef_var &
++IR_PrimitiveDef_var::operator= (IR_PrimitiveDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_var &
+-IR::PrimitiveDef_var::operator= (const IR::PrimitiveDef_var &p)
++ACE_INLINE IR_PrimitiveDef_var &
++IR_PrimitiveDef_var::operator= (const IR_PrimitiveDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PrimitiveDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_PrimitiveDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::PrimitiveDef_var::operator const IR::PrimitiveDef_ptr &() const // cast
++IR_PrimitiveDef_var::operator const IR_PrimitiveDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PrimitiveDef_var::operator IR::PrimitiveDef_ptr &() // cast
++IR_PrimitiveDef_var::operator IR_PrimitiveDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_ptr
+-IR::PrimitiveDef_var::operator-> (void) const
++ACE_INLINE IR_PrimitiveDef_ptr
++IR_PrimitiveDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_ptr
+-IR::PrimitiveDef_var::in (void) const
++ACE_INLINE IR_PrimitiveDef_ptr
++IR_PrimitiveDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_ptr &
+-IR::PrimitiveDef_var::inout (void)
++ACE_INLINE IR_PrimitiveDef_ptr &
++IR_PrimitiveDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_ptr &
+-IR::PrimitiveDef_var::out (void)
++ACE_INLINE IR_PrimitiveDef_ptr &
++IR_PrimitiveDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PrimitiveDef::_nil ();
++ this->ptr_ = IR_PrimitiveDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_ptr
+-IR::PrimitiveDef_var::_retn (void)
++ACE_INLINE IR_PrimitiveDef_ptr
++IR_PrimitiveDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::PrimitiveDef_ptr val = this->ptr_;
+- this->ptr_ = IR::PrimitiveDef::_nil ();
++ IR_PrimitiveDef_ptr val = this->ptr_;
++ this->ptr_ = IR_PrimitiveDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_PRIMITIVEDEF___OUT_CI_)
+-#define _TAO_IR_PRIMITIVEDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::PrimitiveDef_out
++// Inline operations for class IR_PrimitiveDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PrimitiveDef_out::PrimitiveDef_out (IR::PrimitiveDef_ptr &p)
++IR_PrimitiveDef_out::IR_PrimitiveDef_out (IR_PrimitiveDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::PrimitiveDef::_nil ();
++ this->ptr_ = IR_PrimitiveDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::PrimitiveDef_out::PrimitiveDef_out (IR::PrimitiveDef_var &p) // constructor from _var
++IR_PrimitiveDef_out::IR_PrimitiveDef_out (IR_PrimitiveDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::PrimitiveDef::_nil ();
++ this->ptr_ = IR_PrimitiveDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::PrimitiveDef_out::PrimitiveDef_out (const IR::PrimitiveDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::PrimitiveDef_out&,p).ptr_)
++IR_PrimitiveDef_out::IR_PrimitiveDef_out (const IR_PrimitiveDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_PrimitiveDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::PrimitiveDef_out &
+-IR::PrimitiveDef_out::operator= (const IR::PrimitiveDef_out &p)
++ACE_INLINE IR_PrimitiveDef_out &
++IR_PrimitiveDef_out::operator= (const IR_PrimitiveDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::PrimitiveDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_PrimitiveDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_out &
+-IR::PrimitiveDef_out::operator= (const IR::PrimitiveDef_var &p)
++ACE_INLINE IR_PrimitiveDef_out &
++IR_PrimitiveDef_out::operator= (const IR_PrimitiveDef_var &p)
+ {
+- this->ptr_ = IR::PrimitiveDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_PrimitiveDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_out &
+-IR::PrimitiveDef_out::operator= (IR::PrimitiveDef_ptr p)
++ACE_INLINE IR_PrimitiveDef_out &
++IR_PrimitiveDef_out::operator= (IR_PrimitiveDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::PrimitiveDef_out::operator IR::PrimitiveDef_ptr &() // cast
++IR_PrimitiveDef_out::operator IR_PrimitiveDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_ptr &
+-IR::PrimitiveDef_out::ptr (void) // ptr
++ACE_INLINE IR_PrimitiveDef_ptr &
++IR_PrimitiveDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimitiveDef_ptr
+-IR::PrimitiveDef_out::operator-> (void)
++ACE_INLINE IR_PrimitiveDef_ptr
++IR_PrimitiveDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF___CI_)
+-#define _TAO_IR_STRINGDEF___CI_
+-
+ ACE_INLINE
+-IR::StringDef::StringDef (
++IR_StringDef::IR_StringDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -12092,185 +11275,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF___VAR_CI_)
+-#define _TAO_IR_STRINGDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::StringDef_var
++// Inline operations for class IR_StringDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::StringDef_var::StringDef_var (void) // default constructor
+- : ptr_ (IR::StringDef::_nil ())
++IR_StringDef_var::IR_StringDef_var (void) // default constructor
++ : ptr_ (IR_StringDef::_nil ())
+ {}
+
+-ACE_INLINE IR::StringDef_ptr
+-IR::StringDef_var::ptr (void) const
++ACE_INLINE IR_StringDef_ptr
++IR_StringDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StringDef_var::StringDef_var (const IR::StringDef_var &p) // copy constructor
++IR_StringDef_var::IR_StringDef_var (const IR_StringDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (StringDef::_duplicate (p.ptr ()))
++ ptr_ (IR_StringDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::StringDef_var::~StringDef_var (void) // destructor
++IR_StringDef_var::~IR_StringDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::StringDef_var &
+-IR::StringDef_var::operator= (IR::StringDef_ptr p)
++ACE_INLINE IR_StringDef_var &
++IR_StringDef_var::operator= (IR_StringDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::StringDef_var &
+-IR::StringDef_var::operator= (const IR::StringDef_var &p)
++ACE_INLINE IR_StringDef_var &
++IR_StringDef_var::operator= (const IR_StringDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::StringDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_StringDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::StringDef_var::operator const IR::StringDef_ptr &() const // cast
++IR_StringDef_var::operator const IR_StringDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::StringDef_var::operator IR::StringDef_ptr &() // cast
++IR_StringDef_var::operator IR_StringDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StringDef_ptr
+-IR::StringDef_var::operator-> (void) const
++ACE_INLINE IR_StringDef_ptr
++IR_StringDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StringDef_ptr
+-IR::StringDef_var::in (void) const
++ACE_INLINE IR_StringDef_ptr
++IR_StringDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StringDef_ptr &
+-IR::StringDef_var::inout (void)
++ACE_INLINE IR_StringDef_ptr &
++IR_StringDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StringDef_ptr &
+-IR::StringDef_var::out (void)
++ACE_INLINE IR_StringDef_ptr &
++IR_StringDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::StringDef::_nil ();
++ this->ptr_ = IR_StringDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StringDef_ptr
+-IR::StringDef_var::_retn (void)
++ACE_INLINE IR_StringDef_ptr
++IR_StringDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::StringDef_ptr val = this->ptr_;
+- this->ptr_ = IR::StringDef::_nil ();
++ IR_StringDef_ptr val = this->ptr_;
++ this->ptr_ = IR_StringDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_STRINGDEF___OUT_CI_)
+-#define _TAO_IR_STRINGDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::StringDef_out
++// Inline operations for class IR_StringDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::StringDef_out::StringDef_out (IR::StringDef_ptr &p)
++IR_StringDef_out::IR_StringDef_out (IR_StringDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::StringDef::_nil ();
++ this->ptr_ = IR_StringDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::StringDef_out::StringDef_out (IR::StringDef_var &p) // constructor from _var
++IR_StringDef_out::IR_StringDef_out (IR_StringDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::StringDef::_nil ();
++ this->ptr_ = IR_StringDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::StringDef_out::StringDef_out (const IR::StringDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::StringDef_out&,p).ptr_)
++IR_StringDef_out::IR_StringDef_out (const IR_StringDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_StringDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::StringDef_out &
+-IR::StringDef_out::operator= (const IR::StringDef_out &p)
++ACE_INLINE IR_StringDef_out &
++IR_StringDef_out::operator= (const IR_StringDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::StringDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_StringDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::StringDef_out &
+-IR::StringDef_out::operator= (const IR::StringDef_var &p)
++ACE_INLINE IR_StringDef_out &
++IR_StringDef_out::operator= (const IR_StringDef_var &p)
+ {
+- this->ptr_ = IR::StringDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_StringDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::StringDef_out &
+-IR::StringDef_out::operator= (IR::StringDef_ptr p)
++ACE_INLINE IR_StringDef_out &
++IR_StringDef_out::operator= (IR_StringDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::StringDef_out::operator IR::StringDef_ptr &() // cast
++IR_StringDef_out::operator IR_StringDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StringDef_ptr &
+-IR::StringDef_out::ptr (void) // ptr
++ACE_INLINE IR_StringDef_ptr &
++IR_StringDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::StringDef_ptr
+-IR::StringDef_out::operator-> (void)
++ACE_INLINE IR_StringDef_ptr
++IR_StringDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___CI_)
+-#define _TAO_IR_SEQUENCEDEF___CI_
+-
+ ACE_INLINE
+-IR::SequenceDef::SequenceDef (
++IR_SequenceDef::IR_SequenceDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -12280,185 +11442,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___VAR_CI_)
+-#define _TAO_IR_SEQUENCEDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::SequenceDef_var
++// Inline operations for class IR_SequenceDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::SequenceDef_var::SequenceDef_var (void) // default constructor
+- : ptr_ (IR::SequenceDef::_nil ())
++IR_SequenceDef_var::IR_SequenceDef_var (void) // default constructor
++ : ptr_ (IR_SequenceDef::_nil ())
+ {}
+
+-ACE_INLINE IR::SequenceDef_ptr
+-IR::SequenceDef_var::ptr (void) const
++ACE_INLINE IR_SequenceDef_ptr
++IR_SequenceDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::SequenceDef_var::SequenceDef_var (const IR::SequenceDef_var &p) // copy constructor
++IR_SequenceDef_var::IR_SequenceDef_var (const IR_SequenceDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (SequenceDef::_duplicate (p.ptr ()))
++ ptr_ (IR_SequenceDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::SequenceDef_var::~SequenceDef_var (void) // destructor
++IR_SequenceDef_var::~IR_SequenceDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::SequenceDef_var &
+-IR::SequenceDef_var::operator= (IR::SequenceDef_ptr p)
++ACE_INLINE IR_SequenceDef_var &
++IR_SequenceDef_var::operator= (IR_SequenceDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::SequenceDef_var &
+-IR::SequenceDef_var::operator= (const IR::SequenceDef_var &p)
++ACE_INLINE IR_SequenceDef_var &
++IR_SequenceDef_var::operator= (const IR_SequenceDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::SequenceDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_SequenceDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::SequenceDef_var::operator const IR::SequenceDef_ptr &() const // cast
++IR_SequenceDef_var::operator const IR_SequenceDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::SequenceDef_var::operator IR::SequenceDef_ptr &() // cast
++IR_SequenceDef_var::operator IR_SequenceDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::SequenceDef_ptr
+-IR::SequenceDef_var::operator-> (void) const
++ACE_INLINE IR_SequenceDef_ptr
++IR_SequenceDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::SequenceDef_ptr
+-IR::SequenceDef_var::in (void) const
++ACE_INLINE IR_SequenceDef_ptr
++IR_SequenceDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::SequenceDef_ptr &
+-IR::SequenceDef_var::inout (void)
++ACE_INLINE IR_SequenceDef_ptr &
++IR_SequenceDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::SequenceDef_ptr &
+-IR::SequenceDef_var::out (void)
++ACE_INLINE IR_SequenceDef_ptr &
++IR_SequenceDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::SequenceDef::_nil ();
++ this->ptr_ = IR_SequenceDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::SequenceDef_ptr
+-IR::SequenceDef_var::_retn (void)
++ACE_INLINE IR_SequenceDef_ptr
++IR_SequenceDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::SequenceDef_ptr val = this->ptr_;
+- this->ptr_ = IR::SequenceDef::_nil ();
++ IR_SequenceDef_ptr val = this->ptr_;
++ this->ptr_ = IR_SequenceDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_SEQUENCEDEF___OUT_CI_)
+-#define _TAO_IR_SEQUENCEDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::SequenceDef_out
++// Inline operations for class IR_SequenceDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::SequenceDef_out::SequenceDef_out (IR::SequenceDef_ptr &p)
++IR_SequenceDef_out::IR_SequenceDef_out (IR_SequenceDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::SequenceDef::_nil ();
++ this->ptr_ = IR_SequenceDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::SequenceDef_out::SequenceDef_out (IR::SequenceDef_var &p) // constructor from _var
++IR_SequenceDef_out::IR_SequenceDef_out (IR_SequenceDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::SequenceDef::_nil ();
++ this->ptr_ = IR_SequenceDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::SequenceDef_out::SequenceDef_out (const IR::SequenceDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::SequenceDef_out&,p).ptr_)
++IR_SequenceDef_out::IR_SequenceDef_out (const IR_SequenceDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_SequenceDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::SequenceDef_out &
+-IR::SequenceDef_out::operator= (const IR::SequenceDef_out &p)
++ACE_INLINE IR_SequenceDef_out &
++IR_SequenceDef_out::operator= (const IR_SequenceDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::SequenceDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_SequenceDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::SequenceDef_out &
+-IR::SequenceDef_out::operator= (const IR::SequenceDef_var &p)
++ACE_INLINE IR_SequenceDef_out &
++IR_SequenceDef_out::operator= (const IR_SequenceDef_var &p)
+ {
+- this->ptr_ = IR::SequenceDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_SequenceDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::SequenceDef_out &
+-IR::SequenceDef_out::operator= (IR::SequenceDef_ptr p)
++ACE_INLINE IR_SequenceDef_out &
++IR_SequenceDef_out::operator= (IR_SequenceDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::SequenceDef_out::operator IR::SequenceDef_ptr &() // cast
++IR_SequenceDef_out::operator IR_SequenceDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::SequenceDef_ptr &
+-IR::SequenceDef_out::ptr (void) // ptr
++ACE_INLINE IR_SequenceDef_ptr &
++IR_SequenceDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::SequenceDef_ptr
+-IR::SequenceDef_out::operator-> (void)
++ACE_INLINE IR_SequenceDef_ptr
++IR_SequenceDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF___CI_)
+-#define _TAO_IR_ARRAYDEF___CI_
+-
+ ACE_INLINE
+-IR::ArrayDef::ArrayDef (
++IR_ArrayDef::IR_ArrayDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -12468,185 +11609,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF___VAR_CI_)
+-#define _TAO_IR_ARRAYDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ArrayDef_var
++// Inline operations for class IR_ArrayDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ArrayDef_var::ArrayDef_var (void) // default constructor
+- : ptr_ (IR::ArrayDef::_nil ())
++IR_ArrayDef_var::IR_ArrayDef_var (void) // default constructor
++ : ptr_ (IR_ArrayDef::_nil ())
+ {}
+
+-ACE_INLINE IR::ArrayDef_ptr
+-IR::ArrayDef_var::ptr (void) const
++ACE_INLINE IR_ArrayDef_ptr
++IR_ArrayDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ArrayDef_var::ArrayDef_var (const IR::ArrayDef_var &p) // copy constructor
++IR_ArrayDef_var::IR_ArrayDef_var (const IR_ArrayDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ArrayDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ArrayDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ArrayDef_var::~ArrayDef_var (void) // destructor
++IR_ArrayDef_var::~IR_ArrayDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ArrayDef_var &
+-IR::ArrayDef_var::operator= (IR::ArrayDef_ptr p)
++ACE_INLINE IR_ArrayDef_var &
++IR_ArrayDef_var::operator= (IR_ArrayDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ArrayDef_var &
+-IR::ArrayDef_var::operator= (const IR::ArrayDef_var &p)
++ACE_INLINE IR_ArrayDef_var &
++IR_ArrayDef_var::operator= (const IR_ArrayDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ArrayDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ArrayDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ArrayDef_var::operator const IR::ArrayDef_ptr &() const // cast
++IR_ArrayDef_var::operator const IR_ArrayDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ArrayDef_var::operator IR::ArrayDef_ptr &() // cast
++IR_ArrayDef_var::operator IR_ArrayDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ArrayDef_ptr
+-IR::ArrayDef_var::operator-> (void) const
++ACE_INLINE IR_ArrayDef_ptr
++IR_ArrayDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ArrayDef_ptr
+-IR::ArrayDef_var::in (void) const
++ACE_INLINE IR_ArrayDef_ptr
++IR_ArrayDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ArrayDef_ptr &
+-IR::ArrayDef_var::inout (void)
++ACE_INLINE IR_ArrayDef_ptr &
++IR_ArrayDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ArrayDef_ptr &
+-IR::ArrayDef_var::out (void)
++ACE_INLINE IR_ArrayDef_ptr &
++IR_ArrayDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ArrayDef::_nil ();
++ this->ptr_ = IR_ArrayDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ArrayDef_ptr
+-IR::ArrayDef_var::_retn (void)
++ACE_INLINE IR_ArrayDef_ptr
++IR_ArrayDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::ArrayDef_ptr val = this->ptr_;
+- this->ptr_ = IR::ArrayDef::_nil ();
++ IR_ArrayDef_ptr val = this->ptr_;
++ this->ptr_ = IR_ArrayDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ARRAYDEF___OUT_CI_)
+-#define _TAO_IR_ARRAYDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ArrayDef_out
++// Inline operations for class IR_ArrayDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ArrayDef_out::ArrayDef_out (IR::ArrayDef_ptr &p)
++IR_ArrayDef_out::IR_ArrayDef_out (IR_ArrayDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::ArrayDef::_nil ();
++ this->ptr_ = IR_ArrayDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ArrayDef_out::ArrayDef_out (IR::ArrayDef_var &p) // constructor from _var
++IR_ArrayDef_out::IR_ArrayDef_out (IR_ArrayDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::ArrayDef::_nil ();
++ this->ptr_ = IR_ArrayDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ArrayDef_out::ArrayDef_out (const IR::ArrayDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::ArrayDef_out&,p).ptr_)
++IR_ArrayDef_out::IR_ArrayDef_out (const IR_ArrayDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ArrayDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::ArrayDef_out &
+-IR::ArrayDef_out::operator= (const IR::ArrayDef_out &p)
++ACE_INLINE IR_ArrayDef_out &
++IR_ArrayDef_out::operator= (const IR_ArrayDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::ArrayDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ArrayDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ArrayDef_out &
+-IR::ArrayDef_out::operator= (const IR::ArrayDef_var &p)
++ACE_INLINE IR_ArrayDef_out &
++IR_ArrayDef_out::operator= (const IR_ArrayDef_var &p)
+ {
+- this->ptr_ = IR::ArrayDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_ArrayDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ArrayDef_out &
+-IR::ArrayDef_out::operator= (IR::ArrayDef_ptr p)
++ACE_INLINE IR_ArrayDef_out &
++IR_ArrayDef_out::operator= (IR_ArrayDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ArrayDef_out::operator IR::ArrayDef_ptr &() // cast
++IR_ArrayDef_out::operator IR_ArrayDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ArrayDef_ptr &
+-IR::ArrayDef_out::ptr (void) // ptr
++ACE_INLINE IR_ArrayDef_ptr &
++IR_ArrayDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ArrayDef_ptr
+-IR::ArrayDef_out::operator-> (void)
++ACE_INLINE IR_ArrayDef_ptr
++IR_ArrayDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___CI_)
+-#define _TAO_IR_WSTRINGDEF___CI_
+-
+ ACE_INLINE
+-IR::WstringDef::WstringDef (
++IR_WstringDef::IR_WstringDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -12656,185 +11776,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___VAR_CI_)
+-#define _TAO_IR_WSTRINGDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::WstringDef_var
++// Inline operations for class IR_WstringDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::WstringDef_var::WstringDef_var (void) // default constructor
+- : ptr_ (IR::WstringDef::_nil ())
++IR_WstringDef_var::IR_WstringDef_var (void) // default constructor
++ : ptr_ (IR_WstringDef::_nil ())
+ {}
+
+-ACE_INLINE IR::WstringDef_ptr
+-IR::WstringDef_var::ptr (void) const
++ACE_INLINE IR_WstringDef_ptr
++IR_WstringDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::WstringDef_var::WstringDef_var (const IR::WstringDef_var &p) // copy constructor
++IR_WstringDef_var::IR_WstringDef_var (const IR_WstringDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (WstringDef::_duplicate (p.ptr ()))
++ ptr_ (IR_WstringDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::WstringDef_var::~WstringDef_var (void) // destructor
++IR_WstringDef_var::~IR_WstringDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::WstringDef_var &
+-IR::WstringDef_var::operator= (IR::WstringDef_ptr p)
++ACE_INLINE IR_WstringDef_var &
++IR_WstringDef_var::operator= (IR_WstringDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::WstringDef_var &
+-IR::WstringDef_var::operator= (const IR::WstringDef_var &p)
++ACE_INLINE IR_WstringDef_var &
++IR_WstringDef_var::operator= (const IR_WstringDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::WstringDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_WstringDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::WstringDef_var::operator const IR::WstringDef_ptr &() const // cast
++IR_WstringDef_var::operator const IR_WstringDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::WstringDef_var::operator IR::WstringDef_ptr &() // cast
++IR_WstringDef_var::operator IR_WstringDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::WstringDef_ptr
+-IR::WstringDef_var::operator-> (void) const
++ACE_INLINE IR_WstringDef_ptr
++IR_WstringDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::WstringDef_ptr
+-IR::WstringDef_var::in (void) const
++ACE_INLINE IR_WstringDef_ptr
++IR_WstringDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::WstringDef_ptr &
+-IR::WstringDef_var::inout (void)
++ACE_INLINE IR_WstringDef_ptr &
++IR_WstringDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::WstringDef_ptr &
+-IR::WstringDef_var::out (void)
++ACE_INLINE IR_WstringDef_ptr &
++IR_WstringDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::WstringDef::_nil ();
++ this->ptr_ = IR_WstringDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::WstringDef_ptr
+-IR::WstringDef_var::_retn (void)
++ACE_INLINE IR_WstringDef_ptr
++IR_WstringDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::WstringDef_ptr val = this->ptr_;
+- this->ptr_ = IR::WstringDef::_nil ();
++ IR_WstringDef_ptr val = this->ptr_;
++ this->ptr_ = IR_WstringDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_WSTRINGDEF___OUT_CI_)
+-#define _TAO_IR_WSTRINGDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::WstringDef_out
++// Inline operations for class IR_WstringDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::WstringDef_out::WstringDef_out (IR::WstringDef_ptr &p)
++IR_WstringDef_out::IR_WstringDef_out (IR_WstringDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::WstringDef::_nil ();
++ this->ptr_ = IR_WstringDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::WstringDef_out::WstringDef_out (IR::WstringDef_var &p) // constructor from _var
++IR_WstringDef_out::IR_WstringDef_out (IR_WstringDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::WstringDef::_nil ();
++ this->ptr_ = IR_WstringDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::WstringDef_out::WstringDef_out (const IR::WstringDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::WstringDef_out&,p).ptr_)
++IR_WstringDef_out::IR_WstringDef_out (const IR_WstringDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_WstringDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::WstringDef_out &
+-IR::WstringDef_out::operator= (const IR::WstringDef_out &p)
++ACE_INLINE IR_WstringDef_out &
++IR_WstringDef_out::operator= (const IR_WstringDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::WstringDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_WstringDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::WstringDef_out &
+-IR::WstringDef_out::operator= (const IR::WstringDef_var &p)
++ACE_INLINE IR_WstringDef_out &
++IR_WstringDef_out::operator= (const IR_WstringDef_var &p)
+ {
+- this->ptr_ = IR::WstringDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_WstringDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::WstringDef_out &
+-IR::WstringDef_out::operator= (IR::WstringDef_ptr p)
++ACE_INLINE IR_WstringDef_out &
++IR_WstringDef_out::operator= (IR_WstringDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::WstringDef_out::operator IR::WstringDef_ptr &() // cast
++IR_WstringDef_out::operator IR_WstringDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::WstringDef_ptr &
+-IR::WstringDef_out::ptr (void) // ptr
++ACE_INLINE IR_WstringDef_ptr &
++IR_WstringDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::WstringDef_ptr
+-IR::WstringDef_out::operator-> (void)
++ACE_INLINE IR_WstringDef_ptr
++IR_WstringDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF___CI_)
+-#define _TAO_IR_FIXEDDEF___CI_
+-
+ ACE_INLINE
+-IR::FixedDef::FixedDef (
++IR_FixedDef::IR_FixedDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -12844,185 +11943,164 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF___VAR_CI_)
+-#define _TAO_IR_FIXEDDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::FixedDef_var
++// Inline operations for class IR_FixedDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FixedDef_var::FixedDef_var (void) // default constructor
+- : ptr_ (IR::FixedDef::_nil ())
++IR_FixedDef_var::IR_FixedDef_var (void) // default constructor
++ : ptr_ (IR_FixedDef::_nil ())
+ {}
+
+-ACE_INLINE IR::FixedDef_ptr
+-IR::FixedDef_var::ptr (void) const
++ACE_INLINE IR_FixedDef_ptr
++IR_FixedDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FixedDef_var::FixedDef_var (const IR::FixedDef_var &p) // copy constructor
++IR_FixedDef_var::IR_FixedDef_var (const IR_FixedDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (FixedDef::_duplicate (p.ptr ()))
++ ptr_ (IR_FixedDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::FixedDef_var::~FixedDef_var (void) // destructor
++IR_FixedDef_var::~IR_FixedDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::FixedDef_var &
+-IR::FixedDef_var::operator= (IR::FixedDef_ptr p)
++ACE_INLINE IR_FixedDef_var &
++IR_FixedDef_var::operator= (IR_FixedDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::FixedDef_var &
+-IR::FixedDef_var::operator= (const IR::FixedDef_var &p)
++ACE_INLINE IR_FixedDef_var &
++IR_FixedDef_var::operator= (const IR_FixedDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FixedDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_FixedDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::FixedDef_var::operator const IR::FixedDef_ptr &() const // cast
++IR_FixedDef_var::operator const IR_FixedDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::FixedDef_var::operator IR::FixedDef_ptr &() // cast
++IR_FixedDef_var::operator IR_FixedDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FixedDef_ptr
+-IR::FixedDef_var::operator-> (void) const
++ACE_INLINE IR_FixedDef_ptr
++IR_FixedDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FixedDef_ptr
+-IR::FixedDef_var::in (void) const
++ACE_INLINE IR_FixedDef_ptr
++IR_FixedDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FixedDef_ptr &
+-IR::FixedDef_var::inout (void)
++ACE_INLINE IR_FixedDef_ptr &
++IR_FixedDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FixedDef_ptr &
+-IR::FixedDef_var::out (void)
++ACE_INLINE IR_FixedDef_ptr &
++IR_FixedDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FixedDef::_nil ();
++ this->ptr_ = IR_FixedDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FixedDef_ptr
+-IR::FixedDef_var::_retn (void)
++ACE_INLINE IR_FixedDef_ptr
++IR_FixedDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- IR::FixedDef_ptr val = this->ptr_;
+- this->ptr_ = IR::FixedDef::_nil ();
++ IR_FixedDef_ptr val = this->ptr_;
++ this->ptr_ = IR_FixedDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_FIXEDDEF___OUT_CI_)
+-#define _TAO_IR_FIXEDDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::FixedDef_out
++// Inline operations for class IR_FixedDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::FixedDef_out::FixedDef_out (IR::FixedDef_ptr &p)
++IR_FixedDef_out::IR_FixedDef_out (IR_FixedDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = IR::FixedDef::_nil ();
++ this->ptr_ = IR_FixedDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::FixedDef_out::FixedDef_out (IR::FixedDef_var &p) // constructor from _var
++IR_FixedDef_out::IR_FixedDef_out (IR_FixedDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = IR::FixedDef::_nil ();
++ this->ptr_ = IR_FixedDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::FixedDef_out::FixedDef_out (const IR::FixedDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (IR::FixedDef_out&,p).ptr_)
++IR_FixedDef_out::IR_FixedDef_out (const IR_FixedDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_FixedDef_out&,p).ptr_)
+ {}
+
+-ACE_INLINE IR::FixedDef_out &
+-IR::FixedDef_out::operator= (const IR::FixedDef_out &p)
++ACE_INLINE IR_FixedDef_out &
++IR_FixedDef_out::operator= (const IR_FixedDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (IR::FixedDef_out&,p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_FixedDef_out&,p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::FixedDef_out &
+-IR::FixedDef_out::operator= (const IR::FixedDef_var &p)
++ACE_INLINE IR_FixedDef_out &
++IR_FixedDef_out::operator= (const IR_FixedDef_var &p)
+ {
+- this->ptr_ = IR::FixedDef::_duplicate (p.ptr ());
++ this->ptr_ = IR_FixedDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::FixedDef_out &
+-IR::FixedDef_out::operator= (IR::FixedDef_ptr p)
++ACE_INLINE IR_FixedDef_out &
++IR_FixedDef_out::operator= (IR_FixedDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::FixedDef_out::operator IR::FixedDef_ptr &() // cast
++IR_FixedDef_out::operator IR_FixedDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FixedDef_ptr &
+-IR::FixedDef_out::ptr (void) // ptr
++ACE_INLINE IR_FixedDef_ptr &
++IR_FixedDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::FixedDef_ptr
+-IR::FixedDef_out::operator-> (void)
++ACE_INLINE IR_FixedDef_ptr
++IR_FixedDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTREPOSITORY___CI_)
+-#define _TAO_IR_COMPONENTREPOSITORY___CI_
+-
+ ACE_INLINE
+-IR::ComponentRepository::ComponentRepository (
++IR_ComponentRepository::IR_ComponentRepository (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -13032,311 +12110,295 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTREPOSITORY___VAR_CI_)
+-#define _TAO_IR_COMPONENTREPOSITORY___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ComponentRepository_var
++// Inline operations for class IR_ComponentRepository_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ComponentRepository_var::ComponentRepository_var (void) // default constructor
+- : ptr_ (ComponentRepository::_nil ())
++IR_ComponentRepository_var::IR_ComponentRepository_var (void) // default constructor
++ : ptr_ (IR_ComponentRepository::_nil ())
+ {}
+
+-ACE_INLINE ::IR::ComponentRepository_ptr
+-IR::ComponentRepository_var::ptr (void) const
++ACE_INLINE ::IR_ComponentRepository_ptr
++IR_ComponentRepository_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentRepository_var::ComponentRepository_var (const ::IR::ComponentRepository_var &p) // copy constructor
++IR_ComponentRepository_var::IR_ComponentRepository_var (const ::IR_ComponentRepository_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ComponentRepository::_duplicate (p.ptr ()))
++ ptr_ (IR_ComponentRepository::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ComponentRepository_var::~ComponentRepository_var (void) // destructor
++IR_ComponentRepository_var::~IR_ComponentRepository_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ComponentRepository_var &
+-IR::ComponentRepository_var::operator= (ComponentRepository_ptr p)
++ACE_INLINE IR_ComponentRepository_var &
++IR_ComponentRepository_var::operator= (IR_ComponentRepository_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ComponentRepository_var &
+-IR::ComponentRepository_var::operator= (const ::IR::ComponentRepository_var &p)
++ACE_INLINE IR_ComponentRepository_var &
++IR_ComponentRepository_var::operator= (const ::IR_ComponentRepository_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_ComponentRepository::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ComponentRepository_var::operator const ::IR::ComponentRepository_ptr &() const // cast
++IR_ComponentRepository_var::operator const ::IR_ComponentRepository_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentRepository_var::operator ::IR::ComponentRepository_ptr &() // cast
++IR_ComponentRepository_var::operator ::IR_ComponentRepository_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentRepository_ptr
+-IR::ComponentRepository_var::operator-> (void) const
++ACE_INLINE ::IR_ComponentRepository_ptr
++IR_ComponentRepository_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentRepository_ptr
+-IR::ComponentRepository_var::in (void) const
++ACE_INLINE ::IR_ComponentRepository_ptr
++IR_ComponentRepository_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentRepository_ptr &
+-IR::ComponentRepository_var::inout (void)
++ACE_INLINE ::IR_ComponentRepository_ptr &
++IR_ComponentRepository_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentRepository_ptr &
+-IR::ComponentRepository_var::out (void)
++ACE_INLINE ::IR_ComponentRepository_ptr &
++IR_ComponentRepository_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::ComponentRepository::_nil ();
++ this->ptr_ = ::IR_ComponentRepository::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentRepository_ptr
+-IR::ComponentRepository_var::_retn (void)
++ACE_INLINE ::IR_ComponentRepository_ptr
++IR_ComponentRepository_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- ::IR::ComponentRepository_ptr val = this->ptr_;
+- this->ptr_ = ::IR::ComponentRepository::_nil ();
++ ::IR_ComponentRepository_ptr val = this->ptr_;
++ this->ptr_ = ::IR_ComponentRepository::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_COMPONENTREPOSITORY___OUT_CI_)
+-#define _TAO_IR_COMPONENTREPOSITORY___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ComponentRepository_out
++// Inline operations for class IR_ComponentRepository_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_ptr &p)
++IR_ComponentRepository_out::IR_ComponentRepository_out (IR_ComponentRepository_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = ::IR::ComponentRepository::_nil ();
++ this->ptr_ = ::IR_ComponentRepository::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ComponentRepository_out::ComponentRepository_out (ComponentRepository_var &p) // constructor from _var
++IR_ComponentRepository_out::IR_ComponentRepository_out (IR_ComponentRepository_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::ComponentRepository::_nil ();
++ this->ptr_ = ::IR_ComponentRepository::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ComponentRepository_out::ComponentRepository_out (const ::IR::ComponentRepository_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ComponentRepository_out &, p).ptr_)
++IR_ComponentRepository_out::IR_ComponentRepository_out (const ::IR_ComponentRepository_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ComponentRepository_out &, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ComponentRepository_out &
+-IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_out &p)
++ACE_INLINE ::IR_ComponentRepository_out &
++IR_ComponentRepository_out::operator= (const ::IR_ComponentRepository_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ComponentRepository_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ComponentRepository_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ComponentRepository_out &
+-IR::ComponentRepository_out::operator= (const ::IR::ComponentRepository_var &p)
++ACE_INLINE IR_ComponentRepository_out &
++IR_ComponentRepository_out::operator= (const ::IR_ComponentRepository_var &p)
+ {
+- this->ptr_ = ::IR::ComponentRepository::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_ComponentRepository::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ComponentRepository_out &
+-IR::ComponentRepository_out::operator= (ComponentRepository_ptr p)
++ACE_INLINE IR_ComponentRepository_out &
++IR_ComponentRepository_out::operator= (IR_ComponentRepository_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ComponentRepository_out::operator ::IR::ComponentRepository_ptr &() // cast
++IR_ComponentRepository_out::operator ::IR_ComponentRepository_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentRepository_ptr &
+-IR::ComponentRepository_out::ptr (void) // ptr
++ACE_INLINE ::IR_ComponentRepository_ptr &
++IR_ComponentRepository_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentRepository_ptr
+-IR::ComponentRepository_out::operator-> (void)
++ACE_INLINE ::IR_ComponentRepository_ptr
++IR_ComponentRepository_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::ModuleDescription_var
++// Inline operations for class IR_ModuleDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ModuleDescription_var::ModuleDescription_var (void) // default constructor
++IR_ModuleDescription_var::IR_ModuleDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ModuleDescription_var::ModuleDescription_var (ModuleDescription *p)
++IR_ModuleDescription_var::IR_ModuleDescription_var (IR_ModuleDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ModuleDescription_var::ModuleDescription_var (const ::IR::ModuleDescription_var &p) // copy constructor
++IR_ModuleDescription_var::IR_ModuleDescription_var (const ::IR_ModuleDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ModuleDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ModuleDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ModuleDescription_var::~ModuleDescription_var (void) // destructor
++IR_ModuleDescription_var::~IR_ModuleDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ModuleDescription_var &
+-IR::ModuleDescription_var::operator= (ModuleDescription *p)
++ACE_INLINE IR_ModuleDescription_var &
++IR_ModuleDescription_var::operator= (IR_ModuleDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ModuleDescription_var &
+-IR::ModuleDescription_var::operator= (const ::IR::ModuleDescription_var &p)
++ACE_INLINE ::IR_ModuleDescription_var &
++IR_ModuleDescription_var::operator= (const ::IR_ModuleDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ModuleDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ModuleDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ModuleDescription *
+-IR::ModuleDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_ModuleDescription *
++IR_ModuleDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ModuleDescription *
+-IR::ModuleDescription_var::operator-> (void)
++ACE_INLINE ::IR_ModuleDescription *
++IR_ModuleDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ModuleDescription_var::operator const ::IR::ModuleDescription &() const // cast
++IR_ModuleDescription_var::operator const ::IR_ModuleDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ModuleDescription_var::operator ::IR::ModuleDescription &() // cast
++IR_ModuleDescription_var::operator ::IR_ModuleDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ModuleDescription_var::operator ::IR::ModuleDescription &() const // cast
++IR_ModuleDescription_var::operator ::IR_ModuleDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ModuleDescription_var::operator ::IR::ModuleDescription *&() // cast
++IR_ModuleDescription_var::operator ::IR_ModuleDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::ModuleDescription &
+-IR::ModuleDescription_var::in (void) const
++ACE_INLINE const ::IR_ModuleDescription &
++IR_ModuleDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ModuleDescription &
+-IR::ModuleDescription_var::inout (void)
++ACE_INLINE ::IR_ModuleDescription &
++IR_ModuleDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ModuleDescription *&
+-IR::ModuleDescription_var::out (void)
++ACE_INLINE ::IR_ModuleDescription *&
++IR_ModuleDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ModuleDescription *
+-IR::ModuleDescription_var::_retn (void)
++ACE_INLINE ::IR_ModuleDescription *
++IR_ModuleDescription_var::_retn (void)
+ {
+- ::IR::ModuleDescription *tmp = this->ptr_;
++ ::IR_ModuleDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ModuleDescription *
+-IR::ModuleDescription_var::ptr (void) const
++ACE_INLINE ::IR_ModuleDescription *
++IR_ModuleDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ModuleDescription_out
++// Inline operations for class IR_ModuleDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ModuleDescription_out::ModuleDescription_out (::IR::ModuleDescription *&p)
++IR_ModuleDescription_out::IR_ModuleDescription_out (::IR_ModuleDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ModuleDescription_out::ModuleDescription_out (ModuleDescription_var &p) // constructor from _var
++IR_ModuleDescription_out::IR_ModuleDescription_out (IR_ModuleDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -13344,175 +12406,175 @@
+ }
+
+ ACE_INLINE
+-IR::ModuleDescription_out::ModuleDescription_out (const ::IR::ModuleDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ModuleDescription_out&, p).ptr_)
++IR_ModuleDescription_out::IR_ModuleDescription_out (const ::IR_ModuleDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ModuleDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::ModuleDescription_out &
+-IR::ModuleDescription_out::operator= (const ::IR::ModuleDescription_out &p)
++ACE_INLINE IR_ModuleDescription_out &
++IR_ModuleDescription_out::operator= (const ::IR_ModuleDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ModuleDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ModuleDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ModuleDescription_out &
+-IR::ModuleDescription_out::operator= (ModuleDescription *p)
++ACE_INLINE IR_ModuleDescription_out &
++IR_ModuleDescription_out::operator= (IR_ModuleDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ModuleDescription_out::operator ::IR::ModuleDescription *&() // cast
++IR_ModuleDescription_out::operator ::IR_ModuleDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ModuleDescription *&
+-IR::ModuleDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_ModuleDescription *&
++IR_ModuleDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ModuleDescription *
+-IR::ModuleDescription_out::operator-> (void)
++ACE_INLINE ::IR_ModuleDescription *
++IR_ModuleDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ConstantDescription_var
++// Inline operations for class IR_ConstantDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ConstantDescription_var::ConstantDescription_var (void) // default constructor
++IR_ConstantDescription_var::IR_ConstantDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ConstantDescription_var::ConstantDescription_var (ConstantDescription *p)
++IR_ConstantDescription_var::IR_ConstantDescription_var (IR_ConstantDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ConstantDescription_var::ConstantDescription_var (const ::IR::ConstantDescription_var &p) // copy constructor
++IR_ConstantDescription_var::IR_ConstantDescription_var (const ::IR_ConstantDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ConstantDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ConstantDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ConstantDescription_var::~ConstantDescription_var (void) // destructor
++IR_ConstantDescription_var::~IR_ConstantDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ConstantDescription_var &
+-IR::ConstantDescription_var::operator= (ConstantDescription *p)
++ACE_INLINE IR_ConstantDescription_var &
++IR_ConstantDescription_var::operator= (IR_ConstantDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ConstantDescription_var &
+-IR::ConstantDescription_var::operator= (const ::IR::ConstantDescription_var &p)
++ACE_INLINE ::IR_ConstantDescription_var &
++IR_ConstantDescription_var::operator= (const ::IR_ConstantDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ConstantDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ConstantDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ConstantDescription *
+-IR::ConstantDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_ConstantDescription *
++IR_ConstantDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConstantDescription *
+-IR::ConstantDescription_var::operator-> (void)
++ACE_INLINE ::IR_ConstantDescription *
++IR_ConstantDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConstantDescription_var::operator const ::IR::ConstantDescription &() const // cast
++IR_ConstantDescription_var::operator const ::IR_ConstantDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConstantDescription_var::operator ::IR::ConstantDescription &() // cast
++IR_ConstantDescription_var::operator ::IR_ConstantDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ConstantDescription_var::operator ::IR::ConstantDescription &() const // cast
++IR_ConstantDescription_var::operator ::IR_ConstantDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ConstantDescription_var::operator ::IR::ConstantDescription *&() // cast
++IR_ConstantDescription_var::operator ::IR_ConstantDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::ConstantDescription &
+-IR::ConstantDescription_var::in (void) const
++ACE_INLINE const ::IR_ConstantDescription &
++IR_ConstantDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConstantDescription &
+-IR::ConstantDescription_var::inout (void)
++ACE_INLINE ::IR_ConstantDescription &
++IR_ConstantDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ConstantDescription *&
+-IR::ConstantDescription_var::out (void)
++ACE_INLINE ::IR_ConstantDescription *&
++IR_ConstantDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConstantDescription *
+-IR::ConstantDescription_var::_retn (void)
++ACE_INLINE ::IR_ConstantDescription *
++IR_ConstantDescription_var::_retn (void)
+ {
+- ::IR::ConstantDescription *tmp = this->ptr_;
++ ::IR_ConstantDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ConstantDescription *
+-IR::ConstantDescription_var::ptr (void) const
++ACE_INLINE ::IR_ConstantDescription *
++IR_ConstantDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ConstantDescription_out
++// Inline operations for class IR_ConstantDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ConstantDescription_out::ConstantDescription_out (::IR::ConstantDescription *&p)
++IR_ConstantDescription_out::IR_ConstantDescription_out (::IR_ConstantDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ConstantDescription_out::ConstantDescription_out (ConstantDescription_var &p) // constructor from _var
++IR_ConstantDescription_out::IR_ConstantDescription_out (IR_ConstantDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -13520,48 +12582,44 @@
+ }
+
+ ACE_INLINE
+-IR::ConstantDescription_out::ConstantDescription_out (const ::IR::ConstantDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ConstantDescription_out&, p).ptr_)
++IR_ConstantDescription_out::IR_ConstantDescription_out (const ::IR_ConstantDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ConstantDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::ConstantDescription_out &
+-IR::ConstantDescription_out::operator= (const ::IR::ConstantDescription_out &p)
++ACE_INLINE IR_ConstantDescription_out &
++IR_ConstantDescription_out::operator= (const ::IR_ConstantDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ConstantDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ConstantDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ConstantDescription_out &
+-IR::ConstantDescription_out::operator= (ConstantDescription *p)
++ACE_INLINE IR_ConstantDescription_out &
++IR_ConstantDescription_out::operator= (IR_ConstantDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ConstantDescription_out::operator ::IR::ConstantDescription *&() // cast
++IR_ConstantDescription_out::operator ::IR_ConstantDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConstantDescription *&
+-IR::ConstantDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_ConstantDescription *&
++IR_ConstantDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ConstantDescription *
+-IR::ConstantDescription_out::operator-> (void)
++ACE_INLINE ::IR_ConstantDescription *
++IR_ConstantDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#if !defined (_TAO_IR_TYPEDEFDEF___CI_)
+-#define _TAO_IR_TYPEDEFDEF___CI_
+-
+ ACE_INLINE
+-IR::TypedefDef::TypedefDef (
++IR_TypedefDef::IR_TypedefDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -13571,311 +12629,295 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_TYPEDEFDEF___VAR_CI_)
+-#define _TAO_IR_TYPEDEFDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::TypedefDef_var
++// Inline operations for class IR_TypedefDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::TypedefDef_var::TypedefDef_var (void) // default constructor
+- : ptr_ (TypedefDef::_nil ())
++IR_TypedefDef_var::IR_TypedefDef_var (void) // default constructor
++ : ptr_ (IR_TypedefDef::_nil ())
+ {}
+
+-ACE_INLINE ::IR::TypedefDef_ptr
+-IR::TypedefDef_var::ptr (void) const
++ACE_INLINE ::IR_TypedefDef_ptr
++IR_TypedefDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::TypedefDef_var::TypedefDef_var (const ::IR::TypedefDef_var &p) // copy constructor
++IR_TypedefDef_var::IR_TypedefDef_var (const ::IR_TypedefDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (TypedefDef::_duplicate (p.ptr ()))
++ ptr_ (IR_TypedefDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::TypedefDef_var::~TypedefDef_var (void) // destructor
++IR_TypedefDef_var::~IR_TypedefDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::TypedefDef_var &
+-IR::TypedefDef_var::operator= (TypedefDef_ptr p)
++ACE_INLINE IR_TypedefDef_var &
++IR_TypedefDef_var::operator= (IR_TypedefDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::TypedefDef_var &
+-IR::TypedefDef_var::operator= (const ::IR::TypedefDef_var &p)
++ACE_INLINE IR_TypedefDef_var &
++IR_TypedefDef_var::operator= (const ::IR_TypedefDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::TypedefDef::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_TypedefDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::TypedefDef_var::operator const ::IR::TypedefDef_ptr &() const // cast
++IR_TypedefDef_var::operator const ::IR_TypedefDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::TypedefDef_var::operator ::IR::TypedefDef_ptr &() // cast
++IR_TypedefDef_var::operator ::IR_TypedefDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypedefDef_ptr
+-IR::TypedefDef_var::operator-> (void) const
++ACE_INLINE ::IR_TypedefDef_ptr
++IR_TypedefDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypedefDef_ptr
+-IR::TypedefDef_var::in (void) const
++ACE_INLINE ::IR_TypedefDef_ptr
++IR_TypedefDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypedefDef_ptr &
+-IR::TypedefDef_var::inout (void)
++ACE_INLINE ::IR_TypedefDef_ptr &
++IR_TypedefDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypedefDef_ptr &
+-IR::TypedefDef_var::out (void)
++ACE_INLINE ::IR_TypedefDef_ptr &
++IR_TypedefDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::TypedefDef::_nil ();
++ this->ptr_ = ::IR_TypedefDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypedefDef_ptr
+-IR::TypedefDef_var::_retn (void)
++ACE_INLINE ::IR_TypedefDef_ptr
++IR_TypedefDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- ::IR::TypedefDef_ptr val = this->ptr_;
+- this->ptr_ = ::IR::TypedefDef::_nil ();
++ ::IR_TypedefDef_ptr val = this->ptr_;
++ this->ptr_ = ::IR_TypedefDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_TYPEDEFDEF___OUT_CI_)
+-#define _TAO_IR_TYPEDEFDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::TypedefDef_out
++// Inline operations for class IR_TypedefDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::TypedefDef_out::TypedefDef_out (TypedefDef_ptr &p)
++IR_TypedefDef_out::IR_TypedefDef_out (IR_TypedefDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = ::IR::TypedefDef::_nil ();
++ this->ptr_ = ::IR_TypedefDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::TypedefDef_out::TypedefDef_out (TypedefDef_var &p) // constructor from _var
++IR_TypedefDef_out::IR_TypedefDef_out (IR_TypedefDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::TypedefDef::_nil ();
++ this->ptr_ = ::IR_TypedefDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::TypedefDef_out::TypedefDef_out (const ::IR::TypedefDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (TypedefDef_out &, p).ptr_)
++IR_TypedefDef_out::IR_TypedefDef_out (const ::IR_TypedefDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_TypedefDef_out &, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::TypedefDef_out &
+-IR::TypedefDef_out::operator= (const ::IR::TypedefDef_out &p)
++ACE_INLINE ::IR_TypedefDef_out &
++IR_TypedefDef_out::operator= (const ::IR_TypedefDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (TypedefDef_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_TypedefDef_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::TypedefDef_out &
+-IR::TypedefDef_out::operator= (const ::IR::TypedefDef_var &p)
++ACE_INLINE IR_TypedefDef_out &
++IR_TypedefDef_out::operator= (const ::IR_TypedefDef_var &p)
+ {
+- this->ptr_ = ::IR::TypedefDef::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_TypedefDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::TypedefDef_out &
+-IR::TypedefDef_out::operator= (TypedefDef_ptr p)
++ACE_INLINE IR_TypedefDef_out &
++IR_TypedefDef_out::operator= (IR_TypedefDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::TypedefDef_out::operator ::IR::TypedefDef_ptr &() // cast
++IR_TypedefDef_out::operator ::IR_TypedefDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypedefDef_ptr &
+-IR::TypedefDef_out::ptr (void) // ptr
++ACE_INLINE ::IR_TypedefDef_ptr &
++IR_TypedefDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypedefDef_ptr
+-IR::TypedefDef_out::operator-> (void)
++ACE_INLINE ::IR_TypedefDef_ptr
++IR_TypedefDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::TypeDescription_var
++// Inline operations for class IR_TypeDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::TypeDescription_var::TypeDescription_var (void) // default constructor
++IR_TypeDescription_var::IR_TypeDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::TypeDescription_var::TypeDescription_var (TypeDescription *p)
++IR_TypeDescription_var::IR_TypeDescription_var (IR_TypeDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::TypeDescription_var::TypeDescription_var (const ::IR::TypeDescription_var &p) // copy constructor
++IR_TypeDescription_var::IR_TypeDescription_var (const ::IR_TypeDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::TypeDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_TypeDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::TypeDescription_var::~TypeDescription_var (void) // destructor
++IR_TypeDescription_var::~IR_TypeDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::TypeDescription_var &
+-IR::TypeDescription_var::operator= (TypeDescription *p)
++ACE_INLINE IR_TypeDescription_var &
++IR_TypeDescription_var::operator= (IR_TypeDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::TypeDescription_var &
+-IR::TypeDescription_var::operator= (const ::IR::TypeDescription_var &p)
++ACE_INLINE ::IR_TypeDescription_var &
++IR_TypeDescription_var::operator= (const ::IR_TypeDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::TypeDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_TypeDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::TypeDescription *
+-IR::TypeDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_TypeDescription *
++IR_TypeDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypeDescription *
+-IR::TypeDescription_var::operator-> (void)
++ACE_INLINE ::IR_TypeDescription *
++IR_TypeDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::TypeDescription_var::operator const ::IR::TypeDescription &() const // cast
++IR_TypeDescription_var::operator const ::IR_TypeDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::TypeDescription_var::operator ::IR::TypeDescription &() // cast
++IR_TypeDescription_var::operator ::IR_TypeDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::TypeDescription_var::operator ::IR::TypeDescription &() const // cast
++IR_TypeDescription_var::operator ::IR_TypeDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::TypeDescription_var::operator ::IR::TypeDescription *&() // cast
++IR_TypeDescription_var::operator ::IR_TypeDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::TypeDescription &
+-IR::TypeDescription_var::in (void) const
++ACE_INLINE const ::IR_TypeDescription &
++IR_TypeDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypeDescription &
+-IR::TypeDescription_var::inout (void)
++ACE_INLINE ::IR_TypeDescription &
++IR_TypeDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::TypeDescription *&
+-IR::TypeDescription_var::out (void)
++ACE_INLINE ::IR_TypeDescription *&
++IR_TypeDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypeDescription *
+-IR::TypeDescription_var::_retn (void)
++ACE_INLINE ::IR_TypeDescription *
++IR_TypeDescription_var::_retn (void)
+ {
+- ::IR::TypeDescription *tmp = this->ptr_;
++ ::IR_TypeDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::TypeDescription *
+-IR::TypeDescription_var::ptr (void) const
++ACE_INLINE ::IR_TypeDescription *
++IR_TypeDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::TypeDescription_out
++// Inline operations for class IR_TypeDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::TypeDescription_out::TypeDescription_out (::IR::TypeDescription *&p)
++IR_TypeDescription_out::IR_TypeDescription_out (::IR_TypeDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::TypeDescription_out::TypeDescription_out (TypeDescription_var &p) // constructor from _var
++IR_TypeDescription_out::IR_TypeDescription_out (IR_TypeDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -13883,175 +12925,175 @@
+ }
+
+ ACE_INLINE
+-IR::TypeDescription_out::TypeDescription_out (const ::IR::TypeDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (TypeDescription_out&, p).ptr_)
++IR_TypeDescription_out::IR_TypeDescription_out (const ::IR_TypeDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_TypeDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::TypeDescription_out &
+-IR::TypeDescription_out::operator= (const ::IR::TypeDescription_out &p)
++ACE_INLINE IR_TypeDescription_out &
++IR_TypeDescription_out::operator= (const ::IR_TypeDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (TypeDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_TypeDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::TypeDescription_out &
+-IR::TypeDescription_out::operator= (TypeDescription *p)
++ACE_INLINE IR_TypeDescription_out &
++IR_TypeDescription_out::operator= (IR_TypeDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::TypeDescription_out::operator ::IR::TypeDescription *&() // cast
++IR_TypeDescription_out::operator ::IR_TypeDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypeDescription *&
+-IR::TypeDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_TypeDescription *&
++IR_TypeDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::TypeDescription *
+-IR::TypeDescription_out::operator-> (void)
++ACE_INLINE ::IR_TypeDescription *
++IR_TypeDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ExceptionDescription_var
++// Inline operations for class IR_ExceptionDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ExceptionDescription_var::ExceptionDescription_var (void) // default constructor
++IR_ExceptionDescription_var::IR_ExceptionDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ExceptionDescription_var::ExceptionDescription_var (ExceptionDescription *p)
++IR_ExceptionDescription_var::IR_ExceptionDescription_var (IR_ExceptionDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ExceptionDescription_var::ExceptionDescription_var (const ::IR::ExceptionDescription_var &p) // copy constructor
++IR_ExceptionDescription_var::IR_ExceptionDescription_var (const ::IR_ExceptionDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ExceptionDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ExceptionDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDescription_var::~ExceptionDescription_var (void) // destructor
++IR_ExceptionDescription_var::~IR_ExceptionDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDescription_var &
+-IR::ExceptionDescription_var::operator= (ExceptionDescription *p)
++ACE_INLINE IR_ExceptionDescription_var &
++IR_ExceptionDescription_var::operator= (IR_ExceptionDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ExceptionDescription_var &
+-IR::ExceptionDescription_var::operator= (const ::IR::ExceptionDescription_var &p)
++ACE_INLINE ::IR_ExceptionDescription_var &
++IR_ExceptionDescription_var::operator= (const ::IR_ExceptionDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ExceptionDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ExceptionDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ExceptionDescription *
+-IR::ExceptionDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_ExceptionDescription *
++IR_ExceptionDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDescription *
+-IR::ExceptionDescription_var::operator-> (void)
++ACE_INLINE ::IR_ExceptionDescription *
++IR_ExceptionDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDescription_var::operator const ::IR::ExceptionDescription &() const // cast
++IR_ExceptionDescription_var::operator const ::IR_ExceptionDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDescription_var::operator ::IR::ExceptionDescription &() // cast
++IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDescription_var::operator ::IR::ExceptionDescription &() const // cast
++IR_ExceptionDescription_var::operator ::IR_ExceptionDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ExceptionDescription_var::operator ::IR::ExceptionDescription *&() // cast
++IR_ExceptionDescription_var::operator ::IR_ExceptionDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::ExceptionDescription &
+-IR::ExceptionDescription_var::in (void) const
++ACE_INLINE const ::IR_ExceptionDescription &
++IR_ExceptionDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDescription &
+-IR::ExceptionDescription_var::inout (void)
++ACE_INLINE ::IR_ExceptionDescription &
++IR_ExceptionDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ExceptionDescription *&
+-IR::ExceptionDescription_var::out (void)
++ACE_INLINE ::IR_ExceptionDescription *&
++IR_ExceptionDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDescription *
+-IR::ExceptionDescription_var::_retn (void)
++ACE_INLINE ::IR_ExceptionDescription *
++IR_ExceptionDescription_var::_retn (void)
+ {
+- ::IR::ExceptionDescription *tmp = this->ptr_;
++ ::IR_ExceptionDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ExceptionDescription *
+-IR::ExceptionDescription_var::ptr (void) const
++ACE_INLINE ::IR_ExceptionDescription *
++IR_ExceptionDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ExceptionDescription_out
++// Inline operations for class IR_ExceptionDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ExceptionDescription_out::ExceptionDescription_out (::IR::ExceptionDescription *&p)
++IR_ExceptionDescription_out::IR_ExceptionDescription_out (::IR_ExceptionDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDescription_out::ExceptionDescription_out (ExceptionDescription_var &p) // constructor from _var
++IR_ExceptionDescription_out::IR_ExceptionDescription_out (IR_ExceptionDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -14059,63 +13101,59 @@
+ }
+
+ ACE_INLINE
+-IR::ExceptionDescription_out::ExceptionDescription_out (const ::IR::ExceptionDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ExceptionDescription_out&, p).ptr_)
++IR_ExceptionDescription_out::IR_ExceptionDescription_out (const ::IR_ExceptionDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ExceptionDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::ExceptionDescription_out &
+-IR::ExceptionDescription_out::operator= (const ::IR::ExceptionDescription_out &p)
++ACE_INLINE IR_ExceptionDescription_out &
++IR_ExceptionDescription_out::operator= (const ::IR_ExceptionDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ExceptionDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ExceptionDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ExceptionDescription_out &
+-IR::ExceptionDescription_out::operator= (ExceptionDescription *p)
++ACE_INLINE IR_ExceptionDescription_out &
++IR_ExceptionDescription_out::operator= (IR_ExceptionDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDescription_out::operator ::IR::ExceptionDescription *&() // cast
++IR_ExceptionDescription_out::operator ::IR_ExceptionDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDescription *&
+-IR::ExceptionDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_ExceptionDescription *&
++IR_ExceptionDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDescription *
+-IR::ExceptionDescription_out::operator-> (void)
++ACE_INLINE ::IR_ExceptionDescription *
++IR_ExceptionDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_OBJECT_SEQUENCE_IR_EXCEPTIONDEFSEQ_CI_
+-
+- ACE_INLINE IR::ExceptionDef **
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
++ ACE_INLINE IR_ExceptionDef **
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (CORBA::ULong nelems)
+ {
+- IR::ExceptionDef **buf = 0;
++ IR_ExceptionDef **buf = 0;
+
+- ACE_NEW_RETURN (buf, IR::ExceptionDef*[nelems], 0);
++ ACE_NEW_RETURN (buf, IR_ExceptionDef*[nelems], 0);
+
+ for (CORBA::ULong i = 0; i < nelems; i++)
+- buf[i] = IR::ExceptionDef::_nil ();
++ buf[i] = IR_ExceptionDef::_nil ();
+
+ return buf;
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (IR::ExceptionDef **buffer)
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::freebuf (IR_ExceptionDef **buffer)
+ {
+ if (buffer == 0)
+ return;
+@@ -14123,36 +13161,36 @@
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (void)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum)
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum)
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ExceptionDef* *value,
++ IR_ExceptionDef* *value,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, value, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq(const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (this->maximum_);
+- IR::ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ExceptionDef **tmp1 = _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::allocbuf (this->maximum_);
++ IR_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ExceptionDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ExceptionDef::_duplicate (tmp2[i]);
+
+ this->buffer_ = tmp1;
+ }
+@@ -14162,20 +13200,20 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator= (const _TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq &rhs)
+ {
+ if (this == &rhs)
+ return *this;
+
+ if (this->release_)
+ {
+- IR::ExceptionDef **tmp = ACE_reinterpret_cast (IR::ExceptionDef **, this->buffer_);
++ IR_ExceptionDef **tmp = ACE_reinterpret_cast (IR_ExceptionDef **, this->buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ {
+ CORBA::release (tmp[i]);
+- tmp[i] = IR::ExceptionDef::_nil ();
++ tmp[i] = IR_ExceptionDef::_nil ();
+ }
+ if (this->maximum_ < rhs.maximum_)
+ {
+@@ -14188,28 +13226,28 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ExceptionDef **tmp1 = ACE_reinterpret_cast (IR::ExceptionDef **, this->buffer_);
+- IR::ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR::ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
++ IR_ExceptionDef **tmp1 = ACE_reinterpret_cast (IR_ExceptionDef **, this->buffer_);
++ IR_ExceptionDef ** const tmp2 = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < rhs.length_; ++i)
+- tmp1[i] = IR::ExceptionDef::_duplicate (tmp2[i]);
++ tmp1[i] = IR_ExceptionDef::_duplicate (tmp2[i]);
+
+ return *this;
+ }
+
+- ACE_INLINE TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var>
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator[] (CORBA::ULong index) const
++ ACE_INLINE TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var>
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::operator[] (CORBA::ULong index) const
+ // read-write accessor
+ {
+ ACE_ASSERT (index < this->maximum_);
+- IR::ExceptionDef ** const tmp = ACE_reinterpret_cast (IR::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
+- return TAO_Object_Manager<IR::ExceptionDef,IR::ExceptionDef_var> (tmp + index, this->release_);
++ IR_ExceptionDef ** const tmp = ACE_reinterpret_cast (IR_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
++ return TAO_Object_Manager<IR_ExceptionDef,IR_ExceptionDef_var> (tmp + index, this->release_);
+ }
+
+- ACE_INLINE IR::ExceptionDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ExceptionDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ExceptionDef **result = 0;
++ IR_ExceptionDef **result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -14221,7 +13259,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ExceptionDef**, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ExceptionDef**, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -14230,7 +13268,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ExceptionDef**,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ExceptionDef**,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -14240,160 +13278,153 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ExceptionDef* *
+- IR::_TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (void) const
++ ACE_INLINE const IR_ExceptionDef* *
++ IR__TAO_Unbounded_Object_Sequence_IR_ExceptionDefSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ExceptionDef ** ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ExceptionDef ** ACE_CAST_CONST, this->buffer_);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EXCEPTIONDEFSEQ_CI_)
+-#define _TAO_IR_EXCEPTIONDEFSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ExceptionDefSeq_var
++// Inline operations for class IR_ExceptionDefSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_var::ExceptionDefSeq_var (void) // default constructor
++IR_ExceptionDefSeq_var::IR_ExceptionDefSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_var::ExceptionDefSeq_var (ExceptionDefSeq *p)
++IR_ExceptionDefSeq_var::IR_ExceptionDefSeq_var (IR_ExceptionDefSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_var::ExceptionDefSeq_var (const ::IR::ExceptionDefSeq_var &p) // copy constructor
++IR_ExceptionDefSeq_var::IR_ExceptionDefSeq_var (const ::IR_ExceptionDefSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ExceptionDefSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ExceptionDefSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_var::~ExceptionDefSeq_var (void) // destructor
++IR_ExceptionDefSeq_var::~IR_ExceptionDefSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDefSeq_var &
+-IR::ExceptionDefSeq_var::operator= (ExceptionDefSeq *p)
++ACE_INLINE IR_ExceptionDefSeq_var &
++IR_ExceptionDefSeq_var::operator= (IR_ExceptionDefSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ExceptionDefSeq_var &
+-IR::ExceptionDefSeq_var::operator= (const ::IR::ExceptionDefSeq_var &p) // deep copy
++ACE_INLINE IR_ExceptionDefSeq_var &
++IR_ExceptionDefSeq_var::operator= (const ::IR_ExceptionDefSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ExceptionDefSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ExceptionDefSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ExceptionDefSeq *
+-IR::ExceptionDefSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ExceptionDefSeq *
++IR_ExceptionDefSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDefSeq *
+-IR::ExceptionDefSeq_var::operator-> (void)
++ACE_INLINE ::IR_ExceptionDefSeq *
++IR_ExceptionDefSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_var::operator const ::IR::ExceptionDefSeq &() const // cast
++IR_ExceptionDefSeq_var::operator const ::IR_ExceptionDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_var::operator ::IR::ExceptionDefSeq &() // cast
++IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_var::operator ::IR::ExceptionDefSeq &() const // cast
++IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ExceptionDefSeq_var::operator ::IR::ExceptionDefSeq *&() // cast
++IR_ExceptionDefSeq_var::operator ::IR_ExceptionDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ExceptionDef, IR::ExceptionDef_var>
+-IR::ExceptionDefSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var>
++IR_ExceptionDefSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::ExceptionDefSeq &
+-IR::ExceptionDefSeq_var::in (void) const
++ACE_INLINE const ::IR_ExceptionDefSeq &
++IR_ExceptionDefSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDefSeq &
+-IR::ExceptionDefSeq_var::inout (void)
++ACE_INLINE ::IR_ExceptionDefSeq &
++IR_ExceptionDefSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ExceptionDefSeq *&
+-IR::ExceptionDefSeq_var::out (void)
++ACE_INLINE ::IR_ExceptionDefSeq *&
++IR_ExceptionDefSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDefSeq *
+-IR::ExceptionDefSeq_var::_retn (void)
++ACE_INLINE ::IR_ExceptionDefSeq *
++IR_ExceptionDefSeq_var::_retn (void)
+ {
+- ::IR::ExceptionDefSeq *tmp = this->ptr_;
++ ::IR_ExceptionDefSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ExceptionDefSeq *
+-IR::ExceptionDefSeq_var::ptr (void) const
++ACE_INLINE ::IR_ExceptionDefSeq *
++IR_ExceptionDefSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ExceptionDefSeq_out
++// Inline operations for class IR_ExceptionDefSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_out::ExceptionDefSeq_out (ExceptionDefSeq *&p)
++IR_ExceptionDefSeq_out::IR_ExceptionDefSeq_out (IR_ExceptionDefSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_out::ExceptionDefSeq_out (ExceptionDefSeq_var &p) // constructor from _var
++IR_ExceptionDefSeq_out::IR_ExceptionDefSeq_out (IR_ExceptionDefSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -14401,102 +13432,95 @@
+ }
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_out::ExceptionDefSeq_out (const ::IR::ExceptionDefSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ExceptionDefSeq_out&, p).ptr_)
++IR_ExceptionDefSeq_out::IR_ExceptionDefSeq_out (const ::IR_ExceptionDefSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ExceptionDefSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ExceptionDefSeq_out &
+-IR::ExceptionDefSeq_out::operator= (const ::IR::ExceptionDefSeq_out &p)
++ACE_INLINE ::IR_ExceptionDefSeq_out &
++IR_ExceptionDefSeq_out::operator= (const ::IR_ExceptionDefSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ExceptionDefSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ExceptionDefSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ExceptionDefSeq_out &
+-IR::ExceptionDefSeq_out::operator= (ExceptionDefSeq *p)
++ACE_INLINE ::IR_ExceptionDefSeq_out &
++IR_ExceptionDefSeq_out::operator= (IR_ExceptionDefSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ExceptionDefSeq_out::operator ::IR::ExceptionDefSeq *&() // cast
++IR_ExceptionDefSeq_out::operator ::IR_ExceptionDefSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDefSeq *&
+-IR::ExceptionDefSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ExceptionDefSeq *&
++IR_ExceptionDefSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExceptionDefSeq *
+-IR::ExceptionDefSeq_out::operator-> (void)
++ACE_INLINE ::IR_ExceptionDefSeq *
++IR_ExceptionDefSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE TAO_Object_Manager<IR::ExceptionDef, IR::ExceptionDef_var>
+-IR::ExceptionDefSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE TAO_Object_Manager<IR_ExceptionDef, IR_ExceptionDef_var>
++IR_ExceptionDefSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_EXCDESCRIPTIONSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::ExceptionDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_ExceptionDescription *
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::ExceptionDescription *retval = 0;
+- ACE_NEW_RETURN (retval, IR::ExceptionDescription[size], 0);
++ IR_ExceptionDescription *retval = 0;
++ ACE_NEW_RETURN (retval, IR_ExceptionDescription[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (IR::ExceptionDescription *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (IR_ExceptionDescription *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ExceptionDescription *data,
++ IR_ExceptionDescription *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (this->maximum_);
+- IR::ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_ExceptionDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (this->maximum_);
++ IR_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -14509,8 +13533,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -14521,7 +13545,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::ExceptionDescription *tmp = ACE_reinterpret_cast (IR::ExceptionDescription *, this->buffer_);
++ IR_ExceptionDescription *tmp = ACE_reinterpret_cast (IR_ExceptionDescription *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::allocbuf (rhs.maximum_);
+ }
+@@ -14531,8 +13555,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ExceptionDescription *tmp1 = ACE_reinterpret_cast (IR::ExceptionDescription *, this->buffer_);
+- IR::ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR::ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_ExceptionDescription *tmp1 = ACE_reinterpret_cast (IR_ExceptionDescription *, this->buffer_);
++ IR_ExceptionDescription * const tmp2 = ACE_reinterpret_cast (IR_ExceptionDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -14541,30 +13565,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::ExceptionDescription &
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_ExceptionDescription &
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::ExceptionDescription* tmp = ACE_reinterpret_cast(IR::ExceptionDescription*,this->buffer_);
++ IR_ExceptionDescription* tmp = ACE_reinterpret_cast(IR_ExceptionDescription*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::ExceptionDescription &
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_ExceptionDescription &
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::ExceptionDescription * const tmp = ACE_reinterpret_cast (IR::ExceptionDescription* ACE_CAST_CONST, this->buffer_);
++ IR_ExceptionDescription * const tmp = ACE_reinterpret_cast (IR_ExceptionDescription* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::ExceptionDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ExceptionDescription *
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ExceptionDescription *result = 0;
++ IR_ExceptionDescription *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -14576,7 +13600,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ExceptionDescription*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ExceptionDescription*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -14585,7 +13609,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ExceptionDescription*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ExceptionDescription*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -14595,182 +13619,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ExceptionDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (void) const
++ ACE_INLINE const IR_ExceptionDescription *
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ExceptionDescription * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ExceptionDescription * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::ExceptionDescription *data,
++ IR_ExceptionDescription *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::ExceptionDescription *tmp = ACE_reinterpret_cast(IR::ExceptionDescription*,this->buffer_);
++ IR_ExceptionDescription *tmp = ACE_reinterpret_cast(IR_ExceptionDescription*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_ExcDescriptionSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_EXCDESCRIPTIONSEQ_CI_)
+-#define _TAO_IR_EXCDESCRIPTIONSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ExcDescriptionSeq_var
++// Inline operations for class IR_ExcDescriptionSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_var::ExcDescriptionSeq_var (void) // default constructor
++IR_ExcDescriptionSeq_var::IR_ExcDescriptionSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_var::ExcDescriptionSeq_var (ExcDescriptionSeq *p)
++IR_ExcDescriptionSeq_var::IR_ExcDescriptionSeq_var (IR_ExcDescriptionSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_var::ExcDescriptionSeq_var (const ::IR::ExcDescriptionSeq_var &p) // copy constructor
++IR_ExcDescriptionSeq_var::IR_ExcDescriptionSeq_var (const ::IR_ExcDescriptionSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ExcDescriptionSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ExcDescriptionSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_var::~ExcDescriptionSeq_var (void) // destructor
++IR_ExcDescriptionSeq_var::~IR_ExcDescriptionSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ExcDescriptionSeq_var &
+-IR::ExcDescriptionSeq_var::operator= (ExcDescriptionSeq *p)
++ACE_INLINE IR_ExcDescriptionSeq_var &
++IR_ExcDescriptionSeq_var::operator= (IR_ExcDescriptionSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ExcDescriptionSeq_var &
+-IR::ExcDescriptionSeq_var::operator= (const ::IR::ExcDescriptionSeq_var &p) // deep copy
++ACE_INLINE IR_ExcDescriptionSeq_var &
++IR_ExcDescriptionSeq_var::operator= (const ::IR_ExcDescriptionSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ExcDescriptionSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ExcDescriptionSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ExcDescriptionSeq *
+-IR::ExcDescriptionSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ExcDescriptionSeq *
++IR_ExcDescriptionSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExcDescriptionSeq *
+-IR::ExcDescriptionSeq_var::operator-> (void)
++ACE_INLINE ::IR_ExcDescriptionSeq *
++IR_ExcDescriptionSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_var::operator const ::IR::ExcDescriptionSeq &() const // cast
++IR_ExcDescriptionSeq_var::operator const ::IR_ExcDescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_var::operator ::IR::ExcDescriptionSeq &() // cast
++IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_var::operator ::IR::ExcDescriptionSeq &() const // cast
++IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ExcDescriptionSeq_var::operator ::IR::ExcDescriptionSeq *&() // cast
++IR_ExcDescriptionSeq_var::operator ::IR_ExcDescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDescription &
+-IR::ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_ExceptionDescription &
++IR_ExcDescriptionSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::ExceptionDescription &
+-IR::ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_ExceptionDescription &
++IR_ExcDescriptionSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::ExceptionDescription &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_ExceptionDescription &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::ExcDescriptionSeq &
+-IR::ExcDescriptionSeq_var::in (void) const
++ACE_INLINE const ::IR_ExcDescriptionSeq &
++IR_ExcDescriptionSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExcDescriptionSeq &
+-IR::ExcDescriptionSeq_var::inout (void)
++ACE_INLINE ::IR_ExcDescriptionSeq &
++IR_ExcDescriptionSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ExcDescriptionSeq *&
+-IR::ExcDescriptionSeq_var::out (void)
++ACE_INLINE ::IR_ExcDescriptionSeq *&
++IR_ExcDescriptionSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExcDescriptionSeq *
+-IR::ExcDescriptionSeq_var::_retn (void)
++ACE_INLINE ::IR_ExcDescriptionSeq *
++IR_ExcDescriptionSeq_var::_retn (void)
+ {
+- ::IR::ExcDescriptionSeq *tmp = this->ptr_;
++ ::IR_ExcDescriptionSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ExcDescriptionSeq *
+-IR::ExcDescriptionSeq_var::ptr (void) const
++ACE_INLINE ::IR_ExcDescriptionSeq *
++IR_ExcDescriptionSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ExcDescriptionSeq_out
++// Inline operations for class IR_ExcDescriptionSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq *&p)
++IR_ExcDescriptionSeq_out::IR_ExcDescriptionSeq_out (IR_ExcDescriptionSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_out::ExcDescriptionSeq_out (ExcDescriptionSeq_var &p) // constructor from _var
++IR_ExcDescriptionSeq_out::IR_ExcDescriptionSeq_out (IR_ExcDescriptionSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -14778,57 +13796,50 @@
+ }
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_out::ExcDescriptionSeq_out (const ::IR::ExcDescriptionSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_)
++IR_ExcDescriptionSeq_out::IR_ExcDescriptionSeq_out (const ::IR_ExcDescriptionSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ExcDescriptionSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ExcDescriptionSeq_out &
+-IR::ExcDescriptionSeq_out::operator= (const ::IR::ExcDescriptionSeq_out &p)
++ACE_INLINE ::IR_ExcDescriptionSeq_out &
++IR_ExcDescriptionSeq_out::operator= (const ::IR_ExcDescriptionSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ExcDescriptionSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ExcDescriptionSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ExcDescriptionSeq_out &
+-IR::ExcDescriptionSeq_out::operator= (ExcDescriptionSeq *p)
++ACE_INLINE ::IR_ExcDescriptionSeq_out &
++IR_ExcDescriptionSeq_out::operator= (IR_ExcDescriptionSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ExcDescriptionSeq_out::operator ::IR::ExcDescriptionSeq *&() // cast
++IR_ExcDescriptionSeq_out::operator ::IR_ExcDescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExcDescriptionSeq *&
+-IR::ExcDescriptionSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ExcDescriptionSeq *&
++IR_ExcDescriptionSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ExcDescriptionSeq *
+-IR::ExcDescriptionSeq_out::operator-> (void)
++ACE_INLINE ::IR_ExcDescriptionSeq *
++IR_ExcDescriptionSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ExceptionDescription &
+-IR::ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_ExceptionDescription &
++IR_ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ATTRIBUTEDEF___CI_)
+-#define _TAO_IR_ATTRIBUTEDEF___CI_
+-
+ ACE_INLINE
+-IR::AttributeDef::AttributeDef (
++IR_AttributeDef::IR_AttributeDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -14838,311 +13849,295 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ATTRIBUTEDEF___VAR_CI_)
+-#define _TAO_IR_ATTRIBUTEDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::AttributeDef_var
++// Inline operations for class IR_AttributeDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::AttributeDef_var::AttributeDef_var (void) // default constructor
+- : ptr_ (AttributeDef::_nil ())
++IR_AttributeDef_var::IR_AttributeDef_var (void) // default constructor
++ : ptr_ (IR_AttributeDef::_nil ())
+ {}
+
+-ACE_INLINE ::IR::AttributeDef_ptr
+-IR::AttributeDef_var::ptr (void) const
++ACE_INLINE ::IR_AttributeDef_ptr
++IR_AttributeDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AttributeDef_var::AttributeDef_var (const ::IR::AttributeDef_var &p) // copy constructor
++IR_AttributeDef_var::IR_AttributeDef_var (const ::IR_AttributeDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (AttributeDef::_duplicate (p.ptr ()))
++ ptr_ (IR_AttributeDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::AttributeDef_var::~AttributeDef_var (void) // destructor
++IR_AttributeDef_var::~IR_AttributeDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::AttributeDef_var &
+-IR::AttributeDef_var::operator= (AttributeDef_ptr p)
++ACE_INLINE IR_AttributeDef_var &
++IR_AttributeDef_var::operator= (IR_AttributeDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::AttributeDef_var &
+-IR::AttributeDef_var::operator= (const ::IR::AttributeDef_var &p)
++ACE_INLINE IR_AttributeDef_var &
++IR_AttributeDef_var::operator= (const ::IR_AttributeDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::AttributeDef::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_AttributeDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::AttributeDef_var::operator const ::IR::AttributeDef_ptr &() const // cast
++IR_AttributeDef_var::operator const ::IR_AttributeDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AttributeDef_var::operator ::IR::AttributeDef_ptr &() // cast
++IR_AttributeDef_var::operator ::IR_AttributeDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDef_ptr
+-IR::AttributeDef_var::operator-> (void) const
++ACE_INLINE ::IR_AttributeDef_ptr
++IR_AttributeDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDef_ptr
+-IR::AttributeDef_var::in (void) const
++ACE_INLINE ::IR_AttributeDef_ptr
++IR_AttributeDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDef_ptr &
+-IR::AttributeDef_var::inout (void)
++ACE_INLINE ::IR_AttributeDef_ptr &
++IR_AttributeDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDef_ptr &
+-IR::AttributeDef_var::out (void)
++ACE_INLINE ::IR_AttributeDef_ptr &
++IR_AttributeDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::AttributeDef::_nil ();
++ this->ptr_ = ::IR_AttributeDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDef_ptr
+-IR::AttributeDef_var::_retn (void)
++ACE_INLINE ::IR_AttributeDef_ptr
++IR_AttributeDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- ::IR::AttributeDef_ptr val = this->ptr_;
+- this->ptr_ = ::IR::AttributeDef::_nil ();
++ ::IR_AttributeDef_ptr val = this->ptr_;
++ this->ptr_ = ::IR_AttributeDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_ATTRIBUTEDEF___OUT_CI_)
+-#define _TAO_IR_ATTRIBUTEDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::AttributeDef_out
++// Inline operations for class IR_AttributeDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::AttributeDef_out::AttributeDef_out (AttributeDef_ptr &p)
++IR_AttributeDef_out::IR_AttributeDef_out (IR_AttributeDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = ::IR::AttributeDef::_nil ();
++ this->ptr_ = ::IR_AttributeDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::AttributeDef_out::AttributeDef_out (AttributeDef_var &p) // constructor from _var
++IR_AttributeDef_out::IR_AttributeDef_out (IR_AttributeDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::AttributeDef::_nil ();
++ this->ptr_ = ::IR_AttributeDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::AttributeDef_out::AttributeDef_out (const ::IR::AttributeDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (AttributeDef_out &, p).ptr_)
++IR_AttributeDef_out::IR_AttributeDef_out (const ::IR_AttributeDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_AttributeDef_out &, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::AttributeDef_out &
+-IR::AttributeDef_out::operator= (const ::IR::AttributeDef_out &p)
++ACE_INLINE ::IR_AttributeDef_out &
++IR_AttributeDef_out::operator= (const ::IR_AttributeDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (AttributeDef_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_AttributeDef_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::AttributeDef_out &
+-IR::AttributeDef_out::operator= (const ::IR::AttributeDef_var &p)
++ACE_INLINE IR_AttributeDef_out &
++IR_AttributeDef_out::operator= (const ::IR_AttributeDef_var &p)
+ {
+- this->ptr_ = ::IR::AttributeDef::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_AttributeDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::AttributeDef_out &
+-IR::AttributeDef_out::operator= (AttributeDef_ptr p)
++ACE_INLINE IR_AttributeDef_out &
++IR_AttributeDef_out::operator= (IR_AttributeDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::AttributeDef_out::operator ::IR::AttributeDef_ptr &() // cast
++IR_AttributeDef_out::operator ::IR_AttributeDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDef_ptr &
+-IR::AttributeDef_out::ptr (void) // ptr
++ACE_INLINE ::IR_AttributeDef_ptr &
++IR_AttributeDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDef_ptr
+-IR::AttributeDef_out::operator-> (void)
++ACE_INLINE ::IR_AttributeDef_ptr
++IR_AttributeDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::AttributeDescription_var
++// Inline operations for class IR_AttributeDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::AttributeDescription_var::AttributeDescription_var (void) // default constructor
++IR_AttributeDescription_var::IR_AttributeDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::AttributeDescription_var::AttributeDescription_var (AttributeDescription *p)
++IR_AttributeDescription_var::IR_AttributeDescription_var (IR_AttributeDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::AttributeDescription_var::AttributeDescription_var (const ::IR::AttributeDescription_var &p) // copy constructor
++IR_AttributeDescription_var::IR_AttributeDescription_var (const ::IR_AttributeDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::AttributeDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_AttributeDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::AttributeDescription_var::~AttributeDescription_var (void) // destructor
++IR_AttributeDescription_var::~IR_AttributeDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::AttributeDescription_var &
+-IR::AttributeDescription_var::operator= (AttributeDescription *p)
++ACE_INLINE IR_AttributeDescription_var &
++IR_AttributeDescription_var::operator= (IR_AttributeDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::AttributeDescription_var &
+-IR::AttributeDescription_var::operator= (const ::IR::AttributeDescription_var &p)
++ACE_INLINE ::IR_AttributeDescription_var &
++IR_AttributeDescription_var::operator= (const ::IR_AttributeDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::AttributeDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_AttributeDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::AttributeDescription *
+-IR::AttributeDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_AttributeDescription *
++IR_AttributeDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDescription *
+-IR::AttributeDescription_var::operator-> (void)
++ACE_INLINE ::IR_AttributeDescription *
++IR_AttributeDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AttributeDescription_var::operator const ::IR::AttributeDescription &() const // cast
++IR_AttributeDescription_var::operator const ::IR_AttributeDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AttributeDescription_var::operator ::IR::AttributeDescription &() // cast
++IR_AttributeDescription_var::operator ::IR_AttributeDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AttributeDescription_var::operator ::IR::AttributeDescription &() const // cast
++IR_AttributeDescription_var::operator ::IR_AttributeDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::AttributeDescription_var::operator ::IR::AttributeDescription *&() // cast
++IR_AttributeDescription_var::operator ::IR_AttributeDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::AttributeDescription &
+-IR::AttributeDescription_var::in (void) const
++ACE_INLINE const ::IR_AttributeDescription &
++IR_AttributeDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDescription &
+-IR::AttributeDescription_var::inout (void)
++ACE_INLINE ::IR_AttributeDescription &
++IR_AttributeDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::AttributeDescription *&
+-IR::AttributeDescription_var::out (void)
++ACE_INLINE ::IR_AttributeDescription *&
++IR_AttributeDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDescription *
+-IR::AttributeDescription_var::_retn (void)
++ACE_INLINE ::IR_AttributeDescription *
++IR_AttributeDescription_var::_retn (void)
+ {
+- ::IR::AttributeDescription *tmp = this->ptr_;
++ ::IR_AttributeDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::AttributeDescription *
+-IR::AttributeDescription_var::ptr (void) const
++ACE_INLINE ::IR_AttributeDescription *
++IR_AttributeDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::AttributeDescription_out
++// Inline operations for class IR_AttributeDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::AttributeDescription_out::AttributeDescription_out (::IR::AttributeDescription *&p)
++IR_AttributeDescription_out::IR_AttributeDescription_out (::IR_AttributeDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::AttributeDescription_out::AttributeDescription_out (AttributeDescription_var &p) // constructor from _var
++IR_AttributeDescription_out::IR_AttributeDescription_out (IR_AttributeDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -15150,175 +14145,175 @@
+ }
+
+ ACE_INLINE
+-IR::AttributeDescription_out::AttributeDescription_out (const ::IR::AttributeDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (AttributeDescription_out&, p).ptr_)
++IR_AttributeDescription_out::IR_AttributeDescription_out (const ::IR_AttributeDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_AttributeDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::AttributeDescription_out &
+-IR::AttributeDescription_out::operator= (const ::IR::AttributeDescription_out &p)
++ACE_INLINE IR_AttributeDescription_out &
++IR_AttributeDescription_out::operator= (const ::IR_AttributeDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (AttributeDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_AttributeDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::AttributeDescription_out &
+-IR::AttributeDescription_out::operator= (AttributeDescription *p)
++ACE_INLINE IR_AttributeDescription_out &
++IR_AttributeDescription_out::operator= (IR_AttributeDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::AttributeDescription_out::operator ::IR::AttributeDescription *&() // cast
++IR_AttributeDescription_out::operator ::IR_AttributeDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDescription *&
+-IR::AttributeDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_AttributeDescription *&
++IR_AttributeDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttributeDescription *
+-IR::AttributeDescription_out::operator-> (void)
++ACE_INLINE ::IR_AttributeDescription *
++IR_AttributeDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ParameterDescription_var
++// Inline operations for class IR_ParameterDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ParameterDescription_var::ParameterDescription_var (void) // default constructor
++IR_ParameterDescription_var::IR_ParameterDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ParameterDescription_var::ParameterDescription_var (ParameterDescription *p)
++IR_ParameterDescription_var::IR_ParameterDescription_var (IR_ParameterDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ParameterDescription_var::ParameterDescription_var (const ::IR::ParameterDescription_var &p) // copy constructor
++IR_ParameterDescription_var::IR_ParameterDescription_var (const ::IR_ParameterDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ParameterDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ParameterDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ParameterDescription_var::~ParameterDescription_var (void) // destructor
++IR_ParameterDescription_var::~IR_ParameterDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ParameterDescription_var &
+-IR::ParameterDescription_var::operator= (ParameterDescription *p)
++ACE_INLINE IR_ParameterDescription_var &
++IR_ParameterDescription_var::operator= (IR_ParameterDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ParameterDescription_var &
+-IR::ParameterDescription_var::operator= (const ::IR::ParameterDescription_var &p)
++ACE_INLINE ::IR_ParameterDescription_var &
++IR_ParameterDescription_var::operator= (const ::IR_ParameterDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ParameterDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ParameterDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ParameterDescription *
+-IR::ParameterDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_ParameterDescription *
++IR_ParameterDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParameterDescription *
+-IR::ParameterDescription_var::operator-> (void)
++ACE_INLINE ::IR_ParameterDescription *
++IR_ParameterDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ParameterDescription_var::operator const ::IR::ParameterDescription &() const // cast
++IR_ParameterDescription_var::operator const ::IR_ParameterDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ParameterDescription_var::operator ::IR::ParameterDescription &() // cast
++IR_ParameterDescription_var::operator ::IR_ParameterDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ParameterDescription_var::operator ::IR::ParameterDescription &() const // cast
++IR_ParameterDescription_var::operator ::IR_ParameterDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ParameterDescription_var::operator ::IR::ParameterDescription *&() // cast
++IR_ParameterDescription_var::operator ::IR_ParameterDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::ParameterDescription &
+-IR::ParameterDescription_var::in (void) const
++ACE_INLINE const ::IR_ParameterDescription &
++IR_ParameterDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParameterDescription &
+-IR::ParameterDescription_var::inout (void)
++ACE_INLINE ::IR_ParameterDescription &
++IR_ParameterDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ParameterDescription *&
+-IR::ParameterDescription_var::out (void)
++ACE_INLINE ::IR_ParameterDescription *&
++IR_ParameterDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParameterDescription *
+-IR::ParameterDescription_var::_retn (void)
++ACE_INLINE ::IR_ParameterDescription *
++IR_ParameterDescription_var::_retn (void)
+ {
+- ::IR::ParameterDescription *tmp = this->ptr_;
++ ::IR_ParameterDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ParameterDescription *
+-IR::ParameterDescription_var::ptr (void) const
++ACE_INLINE ::IR_ParameterDescription *
++IR_ParameterDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ParameterDescription_out
++// Inline operations for class IR_ParameterDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ParameterDescription_out::ParameterDescription_out (::IR::ParameterDescription *&p)
++IR_ParameterDescription_out::IR_ParameterDescription_out (::IR_ParameterDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ParameterDescription_out::ParameterDescription_out (ParameterDescription_var &p) // constructor from _var
++IR_ParameterDescription_out::IR_ParameterDescription_out (IR_ParameterDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -15326,93 +14321,89 @@
+ }
+
+ ACE_INLINE
+-IR::ParameterDescription_out::ParameterDescription_out (const ::IR::ParameterDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ParameterDescription_out&, p).ptr_)
++IR_ParameterDescription_out::IR_ParameterDescription_out (const ::IR_ParameterDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ParameterDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::ParameterDescription_out &
+-IR::ParameterDescription_out::operator= (const ::IR::ParameterDescription_out &p)
++ACE_INLINE IR_ParameterDescription_out &
++IR_ParameterDescription_out::operator= (const ::IR_ParameterDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ParameterDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ParameterDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ParameterDescription_out &
+-IR::ParameterDescription_out::operator= (ParameterDescription *p)
++ACE_INLINE IR_ParameterDescription_out &
++IR_ParameterDescription_out::operator= (IR_ParameterDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ParameterDescription_out::operator ::IR::ParameterDescription *&() // cast
++IR_ParameterDescription_out::operator ::IR_ParameterDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParameterDescription *&
+-IR::ParameterDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_ParameterDescription *&
++IR_ParameterDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParameterDescription *
+-IR::ParameterDescription_out::operator-> (void)
++ACE_INLINE ::IR_ParameterDescription *
++IR_ParameterDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_PARDESCRIPTIONSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::ParameterDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_ParameterDescription *
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::ParameterDescription *retval = 0;
+- ACE_NEW_RETURN (retval, IR::ParameterDescription[size], 0);
++ IR_ParameterDescription *retval = 0;
++ ACE_NEW_RETURN (retval, IR_ParameterDescription[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (IR::ParameterDescription *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (IR_ParameterDescription *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ParameterDescription *data,
++ IR_ParameterDescription *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (this->maximum_);
+- IR::ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_ParameterDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (this->maximum_);
++ IR_ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -15425,8 +14416,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq &
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq &
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_ParDescriptionSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -15437,7 +14428,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::ParameterDescription *tmp = ACE_reinterpret_cast (IR::ParameterDescription *, this->buffer_);
++ IR_ParameterDescription *tmp = ACE_reinterpret_cast (IR_ParameterDescription *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::allocbuf (rhs.maximum_);
+ }
+@@ -15447,8 +14438,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ParameterDescription *tmp1 = ACE_reinterpret_cast (IR::ParameterDescription *, this->buffer_);
+- IR::ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR::ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_ParameterDescription *tmp1 = ACE_reinterpret_cast (IR_ParameterDescription *, this->buffer_);
++ IR_ParameterDescription * const tmp2 = ACE_reinterpret_cast (IR_ParameterDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -15457,30 +14448,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::ParameterDescription &
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_ParameterDescription &
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::ParameterDescription* tmp = ACE_reinterpret_cast(IR::ParameterDescription*,this->buffer_);
++ IR_ParameterDescription* tmp = ACE_reinterpret_cast(IR_ParameterDescription*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::ParameterDescription &
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_ParameterDescription &
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::ParameterDescription * const tmp = ACE_reinterpret_cast (IR::ParameterDescription* ACE_CAST_CONST, this->buffer_);
++ IR_ParameterDescription * const tmp = ACE_reinterpret_cast (IR_ParameterDescription* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::ParameterDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ParameterDescription *
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ParameterDescription *result = 0;
++ IR_ParameterDescription *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -15492,7 +14483,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ParameterDescription*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ParameterDescription*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -15501,7 +14492,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ParameterDescription*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ParameterDescription*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -15511,182 +14502,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ParameterDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (void) const
++ ACE_INLINE const IR_ParameterDescription *
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ParameterDescription * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ParameterDescription * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_ParDescriptionSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_ParDescriptionSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::ParameterDescription *data,
++ IR_ParameterDescription *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::ParameterDescription *tmp = ACE_reinterpret_cast(IR::ParameterDescription*,this->buffer_);
++ IR_ParameterDescription *tmp = ACE_reinterpret_cast(IR_ParameterDescription*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_ParDescriptionSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PARDESCRIPTIONSEQ_CI_)
+-#define _TAO_IR_PARDESCRIPTIONSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ParDescriptionSeq_var
++// Inline operations for class IR_ParDescriptionSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_var::ParDescriptionSeq_var (void) // default constructor
++IR_ParDescriptionSeq_var::IR_ParDescriptionSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_var::ParDescriptionSeq_var (ParDescriptionSeq *p)
++IR_ParDescriptionSeq_var::IR_ParDescriptionSeq_var (IR_ParDescriptionSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_var::ParDescriptionSeq_var (const ::IR::ParDescriptionSeq_var &p) // copy constructor
++IR_ParDescriptionSeq_var::IR_ParDescriptionSeq_var (const ::IR_ParDescriptionSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ParDescriptionSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ParDescriptionSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_var::~ParDescriptionSeq_var (void) // destructor
++IR_ParDescriptionSeq_var::~IR_ParDescriptionSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ParDescriptionSeq_var &
+-IR::ParDescriptionSeq_var::operator= (ParDescriptionSeq *p)
++ACE_INLINE IR_ParDescriptionSeq_var &
++IR_ParDescriptionSeq_var::operator= (IR_ParDescriptionSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ParDescriptionSeq_var &
+-IR::ParDescriptionSeq_var::operator= (const ::IR::ParDescriptionSeq_var &p) // deep copy
++ACE_INLINE IR_ParDescriptionSeq_var &
++IR_ParDescriptionSeq_var::operator= (const ::IR_ParDescriptionSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ParDescriptionSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ParDescriptionSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ParDescriptionSeq *
+-IR::ParDescriptionSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ParDescriptionSeq *
++IR_ParDescriptionSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParDescriptionSeq *
+-IR::ParDescriptionSeq_var::operator-> (void)
++ACE_INLINE ::IR_ParDescriptionSeq *
++IR_ParDescriptionSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_var::operator const ::IR::ParDescriptionSeq &() const // cast
++IR_ParDescriptionSeq_var::operator const ::IR_ParDescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_var::operator ::IR::ParDescriptionSeq &() // cast
++IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_var::operator ::IR::ParDescriptionSeq &() const // cast
++IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ParDescriptionSeq_var::operator ::IR::ParDescriptionSeq *&() // cast
++IR_ParDescriptionSeq_var::operator ::IR_ParDescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ParameterDescription &
+-IR::ParDescriptionSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_ParameterDescription &
++IR_ParDescriptionSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::ParameterDescription &
+-IR::ParDescriptionSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_ParameterDescription &
++IR_ParDescriptionSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::ParameterDescription &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_ParameterDescription &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::ParDescriptionSeq &
+-IR::ParDescriptionSeq_var::in (void) const
++ACE_INLINE const ::IR_ParDescriptionSeq &
++IR_ParDescriptionSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParDescriptionSeq &
+-IR::ParDescriptionSeq_var::inout (void)
++ACE_INLINE ::IR_ParDescriptionSeq &
++IR_ParDescriptionSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ParDescriptionSeq *&
+-IR::ParDescriptionSeq_var::out (void)
++ACE_INLINE ::IR_ParDescriptionSeq *&
++IR_ParDescriptionSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParDescriptionSeq *
+-IR::ParDescriptionSeq_var::_retn (void)
++ACE_INLINE ::IR_ParDescriptionSeq *
++IR_ParDescriptionSeq_var::_retn (void)
+ {
+- ::IR::ParDescriptionSeq *tmp = this->ptr_;
++ ::IR_ParDescriptionSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ParDescriptionSeq *
+-IR::ParDescriptionSeq_var::ptr (void) const
++ACE_INLINE ::IR_ParDescriptionSeq *
++IR_ParDescriptionSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ParDescriptionSeq_out
++// Inline operations for class IR_ParDescriptionSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_out::ParDescriptionSeq_out (ParDescriptionSeq *&p)
++IR_ParDescriptionSeq_out::IR_ParDescriptionSeq_out (IR_ParDescriptionSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_out::ParDescriptionSeq_out (ParDescriptionSeq_var &p) // constructor from _var
++IR_ParDescriptionSeq_out::IR_ParDescriptionSeq_out (IR_ParDescriptionSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -15694,194 +14679,187 @@
+ }
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_out::ParDescriptionSeq_out (const ::IR::ParDescriptionSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ParDescriptionSeq_out&, p).ptr_)
++IR_ParDescriptionSeq_out::IR_ParDescriptionSeq_out (const ::IR_ParDescriptionSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ParDescriptionSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ParDescriptionSeq_out &
+-IR::ParDescriptionSeq_out::operator= (const ::IR::ParDescriptionSeq_out &p)
++ACE_INLINE ::IR_ParDescriptionSeq_out &
++IR_ParDescriptionSeq_out::operator= (const ::IR_ParDescriptionSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ParDescriptionSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ParDescriptionSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ParDescriptionSeq_out &
+-IR::ParDescriptionSeq_out::operator= (ParDescriptionSeq *p)
++ACE_INLINE ::IR_ParDescriptionSeq_out &
++IR_ParDescriptionSeq_out::operator= (IR_ParDescriptionSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ParDescriptionSeq_out::operator ::IR::ParDescriptionSeq *&() // cast
++IR_ParDescriptionSeq_out::operator ::IR_ParDescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParDescriptionSeq *&
+-IR::ParDescriptionSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ParDescriptionSeq *&
++IR_ParDescriptionSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ParDescriptionSeq *
+-IR::ParDescriptionSeq_out::operator-> (void)
++ACE_INLINE ::IR_ParDescriptionSeq *
++IR_ParDescriptionSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ParameterDescription &
+-IR::ParDescriptionSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_ParameterDescription &
++IR_ParDescriptionSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_CONTEXTIDSEQ_CI_)
+-#define _TAO_IR_CONTEXTIDSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ContextIdSeq_var
++// Inline operations for class IR_ContextIdSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ContextIdSeq_var::ContextIdSeq_var (void) // default constructor
++IR_ContextIdSeq_var::IR_ContextIdSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ContextIdSeq_var::ContextIdSeq_var (ContextIdSeq *p)
++IR_ContextIdSeq_var::IR_ContextIdSeq_var (IR_ContextIdSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ContextIdSeq_var::ContextIdSeq_var (const ::IR::ContextIdSeq_var &p) // copy constructor
++IR_ContextIdSeq_var::IR_ContextIdSeq_var (const ::IR_ContextIdSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ContextIdSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ContextIdSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ContextIdSeq_var::~ContextIdSeq_var (void) // destructor
++IR_ContextIdSeq_var::~IR_ContextIdSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ContextIdSeq_var &
+-IR::ContextIdSeq_var::operator= (ContextIdSeq *p)
++ACE_INLINE IR_ContextIdSeq_var &
++IR_ContextIdSeq_var::operator= (IR_ContextIdSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ContextIdSeq_var &
+-IR::ContextIdSeq_var::operator= (const ::IR::ContextIdSeq_var &p) // deep copy
++ACE_INLINE IR_ContextIdSeq_var &
++IR_ContextIdSeq_var::operator= (const ::IR_ContextIdSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ContextIdSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ContextIdSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ContextIdSeq *
+-IR::ContextIdSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ContextIdSeq *
++IR_ContextIdSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContextIdSeq *
+-IR::ContextIdSeq_var::operator-> (void)
++ACE_INLINE ::IR_ContextIdSeq *
++IR_ContextIdSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ContextIdSeq_var::operator const ::IR::ContextIdSeq &() const // cast
++IR_ContextIdSeq_var::operator const ::IR_ContextIdSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ContextIdSeq_var::operator ::IR::ContextIdSeq &() // cast
++IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ContextIdSeq_var::operator ::IR::ContextIdSeq &() const // cast
++IR_ContextIdSeq_var::operator ::IR_ContextIdSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ContextIdSeq_var::operator ::IR::ContextIdSeq *&() // cast
++IR_ContextIdSeq_var::operator ::IR_ContextIdSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE TAO_SeqElem_String_Manager
+-IR::ContextIdSeq_var::operator[] (CORBA::ULong index)
++IR_ContextIdSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::ContextIdSeq &
+-IR::ContextIdSeq_var::in (void) const
++ACE_INLINE const ::IR_ContextIdSeq &
++IR_ContextIdSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContextIdSeq &
+-IR::ContextIdSeq_var::inout (void)
++ACE_INLINE ::IR_ContextIdSeq &
++IR_ContextIdSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ContextIdSeq *&
+-IR::ContextIdSeq_var::out (void)
++ACE_INLINE ::IR_ContextIdSeq *&
++IR_ContextIdSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContextIdSeq *
+-IR::ContextIdSeq_var::_retn (void)
++ACE_INLINE ::IR_ContextIdSeq *
++IR_ContextIdSeq_var::_retn (void)
+ {
+- ::IR::ContextIdSeq *tmp = this->ptr_;
++ ::IR_ContextIdSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ContextIdSeq *
+-IR::ContextIdSeq_var::ptr (void) const
++ACE_INLINE ::IR_ContextIdSeq *
++IR_ContextIdSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ContextIdSeq_out
++// Inline operations for class IR_ContextIdSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ContextIdSeq_out::ContextIdSeq_out (ContextIdSeq *&p)
++IR_ContextIdSeq_out::IR_ContextIdSeq_out (IR_ContextIdSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ContextIdSeq_out::ContextIdSeq_out (ContextIdSeq_var &p) // constructor from _var
++IR_ContextIdSeq_out::IR_ContextIdSeq_out (IR_ContextIdSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -15889,57 +14867,50 @@
+ }
+
+ ACE_INLINE
+-IR::ContextIdSeq_out::ContextIdSeq_out (const ::IR::ContextIdSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ContextIdSeq_out&, p).ptr_)
++IR_ContextIdSeq_out::IR_ContextIdSeq_out (const ::IR_ContextIdSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ContextIdSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ContextIdSeq_out &
+-IR::ContextIdSeq_out::operator= (const ::IR::ContextIdSeq_out &p)
++ACE_INLINE ::IR_ContextIdSeq_out &
++IR_ContextIdSeq_out::operator= (const ::IR_ContextIdSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ContextIdSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ContextIdSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ContextIdSeq_out &
+-IR::ContextIdSeq_out::operator= (ContextIdSeq *p)
++ACE_INLINE ::IR_ContextIdSeq_out &
++IR_ContextIdSeq_out::operator= (IR_ContextIdSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ContextIdSeq_out::operator ::IR::ContextIdSeq *&() // cast
++IR_ContextIdSeq_out::operator ::IR_ContextIdSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContextIdSeq *&
+-IR::ContextIdSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ContextIdSeq *&
++IR_ContextIdSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ContextIdSeq *
+-IR::ContextIdSeq_out::operator-> (void)
++ACE_INLINE ::IR_ContextIdSeq *
++IR_ContextIdSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE TAO_SeqElem_String_Manager
+-IR::ContextIdSeq_out::operator[] (CORBA::ULong index)
++IR_ContextIdSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_OPERATIONDEF___CI_)
+-#define _TAO_IR_OPERATIONDEF___CI_
+-
+ ACE_INLINE
+-IR::OperationDef::OperationDef (
++IR_OperationDef::IR_OperationDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -15949,311 +14920,295 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_OPERATIONDEF___VAR_CI_)
+-#define _TAO_IR_OPERATIONDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::OperationDef_var
++// Inline operations for class IR_OperationDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::OperationDef_var::OperationDef_var (void) // default constructor
+- : ptr_ (OperationDef::_nil ())
++IR_OperationDef_var::IR_OperationDef_var (void) // default constructor
++ : ptr_ (IR_OperationDef::_nil ())
+ {}
+
+-ACE_INLINE ::IR::OperationDef_ptr
+-IR::OperationDef_var::ptr (void) const
++ACE_INLINE ::IR_OperationDef_ptr
++IR_OperationDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::OperationDef_var::OperationDef_var (const ::IR::OperationDef_var &p) // copy constructor
++IR_OperationDef_var::IR_OperationDef_var (const ::IR_OperationDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (OperationDef::_duplicate (p.ptr ()))
++ ptr_ (IR_OperationDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::OperationDef_var::~OperationDef_var (void) // destructor
++IR_OperationDef_var::~IR_OperationDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::OperationDef_var &
+-IR::OperationDef_var::operator= (OperationDef_ptr p)
++ACE_INLINE IR_OperationDef_var &
++IR_OperationDef_var::operator= (IR_OperationDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::OperationDef_var &
+-IR::OperationDef_var::operator= (const ::IR::OperationDef_var &p)
++ACE_INLINE IR_OperationDef_var &
++IR_OperationDef_var::operator= (const ::IR_OperationDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::OperationDef::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_OperationDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::OperationDef_var::operator const ::IR::OperationDef_ptr &() const // cast
++IR_OperationDef_var::operator const ::IR_OperationDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::OperationDef_var::operator ::IR::OperationDef_ptr &() // cast
++IR_OperationDef_var::operator ::IR_OperationDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDef_ptr
+-IR::OperationDef_var::operator-> (void) const
++ACE_INLINE ::IR_OperationDef_ptr
++IR_OperationDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDef_ptr
+-IR::OperationDef_var::in (void) const
++ACE_INLINE ::IR_OperationDef_ptr
++IR_OperationDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDef_ptr &
+-IR::OperationDef_var::inout (void)
++ACE_INLINE ::IR_OperationDef_ptr &
++IR_OperationDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDef_ptr &
+-IR::OperationDef_var::out (void)
++ACE_INLINE ::IR_OperationDef_ptr &
++IR_OperationDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::OperationDef::_nil ();
++ this->ptr_ = ::IR_OperationDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDef_ptr
+-IR::OperationDef_var::_retn (void)
++ACE_INLINE ::IR_OperationDef_ptr
++IR_OperationDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- ::IR::OperationDef_ptr val = this->ptr_;
+- this->ptr_ = ::IR::OperationDef::_nil ();
++ ::IR_OperationDef_ptr val = this->ptr_;
++ this->ptr_ = ::IR_OperationDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_OPERATIONDEF___OUT_CI_)
+-#define _TAO_IR_OPERATIONDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::OperationDef_out
++// Inline operations for class IR_OperationDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::OperationDef_out::OperationDef_out (OperationDef_ptr &p)
++IR_OperationDef_out::IR_OperationDef_out (IR_OperationDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = ::IR::OperationDef::_nil ();
++ this->ptr_ = ::IR_OperationDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::OperationDef_out::OperationDef_out (OperationDef_var &p) // constructor from _var
++IR_OperationDef_out::IR_OperationDef_out (IR_OperationDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::OperationDef::_nil ();
++ this->ptr_ = ::IR_OperationDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::OperationDef_out::OperationDef_out (const ::IR::OperationDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (OperationDef_out &, p).ptr_)
++IR_OperationDef_out::IR_OperationDef_out (const ::IR_OperationDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_OperationDef_out &, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::OperationDef_out &
+-IR::OperationDef_out::operator= (const ::IR::OperationDef_out &p)
++ACE_INLINE ::IR_OperationDef_out &
++IR_OperationDef_out::operator= (const ::IR_OperationDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (OperationDef_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_OperationDef_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::OperationDef_out &
+-IR::OperationDef_out::operator= (const ::IR::OperationDef_var &p)
++ACE_INLINE IR_OperationDef_out &
++IR_OperationDef_out::operator= (const ::IR_OperationDef_var &p)
+ {
+- this->ptr_ = ::IR::OperationDef::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_OperationDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::OperationDef_out &
+-IR::OperationDef_out::operator= (OperationDef_ptr p)
++ACE_INLINE IR_OperationDef_out &
++IR_OperationDef_out::operator= (IR_OperationDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::OperationDef_out::operator ::IR::OperationDef_ptr &() // cast
++IR_OperationDef_out::operator ::IR_OperationDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDef_ptr &
+-IR::OperationDef_out::ptr (void) // ptr
++ACE_INLINE ::IR_OperationDef_ptr &
++IR_OperationDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDef_ptr
+-IR::OperationDef_out::operator-> (void)
++ACE_INLINE ::IR_OperationDef_ptr
++IR_OperationDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::OperationDescription_var
++// Inline operations for class IR_OperationDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::OperationDescription_var::OperationDescription_var (void) // default constructor
++IR_OperationDescription_var::IR_OperationDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::OperationDescription_var::OperationDescription_var (OperationDescription *p)
++IR_OperationDescription_var::IR_OperationDescription_var (IR_OperationDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::OperationDescription_var::OperationDescription_var (const ::IR::OperationDescription_var &p) // copy constructor
++IR_OperationDescription_var::IR_OperationDescription_var (const ::IR_OperationDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::OperationDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_OperationDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::OperationDescription_var::~OperationDescription_var (void) // destructor
++IR_OperationDescription_var::~IR_OperationDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::OperationDescription_var &
+-IR::OperationDescription_var::operator= (OperationDescription *p)
++ACE_INLINE IR_OperationDescription_var &
++IR_OperationDescription_var::operator= (IR_OperationDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::OperationDescription_var &
+-IR::OperationDescription_var::operator= (const ::IR::OperationDescription_var &p)
++ACE_INLINE ::IR_OperationDescription_var &
++IR_OperationDescription_var::operator= (const ::IR_OperationDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::OperationDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_OperationDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::OperationDescription *
+-IR::OperationDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_OperationDescription *
++IR_OperationDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDescription *
+-IR::OperationDescription_var::operator-> (void)
++ACE_INLINE ::IR_OperationDescription *
++IR_OperationDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::OperationDescription_var::operator const ::IR::OperationDescription &() const // cast
++IR_OperationDescription_var::operator const ::IR_OperationDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::OperationDescription_var::operator ::IR::OperationDescription &() // cast
++IR_OperationDescription_var::operator ::IR_OperationDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::OperationDescription_var::operator ::IR::OperationDescription &() const // cast
++IR_OperationDescription_var::operator ::IR_OperationDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::OperationDescription_var::operator ::IR::OperationDescription *&() // cast
++IR_OperationDescription_var::operator ::IR_OperationDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::OperationDescription &
+-IR::OperationDescription_var::in (void) const
++ACE_INLINE const ::IR_OperationDescription &
++IR_OperationDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDescription &
+-IR::OperationDescription_var::inout (void)
++ACE_INLINE ::IR_OperationDescription &
++IR_OperationDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::OperationDescription *&
+-IR::OperationDescription_var::out (void)
++ACE_INLINE ::IR_OperationDescription *&
++IR_OperationDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDescription *
+-IR::OperationDescription_var::_retn (void)
++ACE_INLINE ::IR_OperationDescription *
++IR_OperationDescription_var::_retn (void)
+ {
+- ::IR::OperationDescription *tmp = this->ptr_;
++ ::IR_OperationDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::OperationDescription *
+-IR::OperationDescription_var::ptr (void) const
++ACE_INLINE ::IR_OperationDescription *
++IR_OperationDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::OperationDescription_out
++// Inline operations for class IR_OperationDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::OperationDescription_out::OperationDescription_out (::IR::OperationDescription *&p)
++IR_OperationDescription_out::IR_OperationDescription_out (::IR_OperationDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::OperationDescription_out::OperationDescription_out (OperationDescription_var &p) // constructor from _var
++IR_OperationDescription_out::IR_OperationDescription_out (IR_OperationDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -16261,185 +15216,181 @@
+ }
+
+ ACE_INLINE
+-IR::OperationDescription_out::OperationDescription_out (const ::IR::OperationDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (OperationDescription_out&, p).ptr_)
++IR_OperationDescription_out::IR_OperationDescription_out (const ::IR_OperationDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_OperationDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::OperationDescription_out &
+-IR::OperationDescription_out::operator= (const ::IR::OperationDescription_out &p)
++ACE_INLINE IR_OperationDescription_out &
++IR_OperationDescription_out::operator= (const ::IR_OperationDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (OperationDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_OperationDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::OperationDescription_out &
+-IR::OperationDescription_out::operator= (OperationDescription *p)
++ACE_INLINE IR_OperationDescription_out &
++IR_OperationDescription_out::operator= (IR_OperationDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::OperationDescription_out::operator ::IR::OperationDescription *&() // cast
++IR_OperationDescription_out::operator ::IR_OperationDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDescription *&
+-IR::OperationDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_OperationDescription *&
++IR_OperationDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OperationDescription *
+-IR::OperationDescription_out::operator-> (void)
++ACE_INLINE ::IR_OperationDescription *
++IR_OperationDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#if !defined (_TAO_IR_REPOSITORYIDSEQ_CI_)
+-#define _TAO_IR_REPOSITORYIDSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::RepositoryIdSeq_var
++// Inline operations for class IR_RepositoryIdSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_var::RepositoryIdSeq_var (void) // default constructor
++IR_RepositoryIdSeq_var::IR_RepositoryIdSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_var::RepositoryIdSeq_var (RepositoryIdSeq *p)
++IR_RepositoryIdSeq_var::IR_RepositoryIdSeq_var (IR_RepositoryIdSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_var::RepositoryIdSeq_var (const ::IR::RepositoryIdSeq_var &p) // copy constructor
++IR_RepositoryIdSeq_var::IR_RepositoryIdSeq_var (const ::IR_RepositoryIdSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::RepositoryIdSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_RepositoryIdSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_var::~RepositoryIdSeq_var (void) // destructor
++IR_RepositoryIdSeq_var::~IR_RepositoryIdSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::RepositoryIdSeq_var &
+-IR::RepositoryIdSeq_var::operator= (RepositoryIdSeq *p)
++ACE_INLINE IR_RepositoryIdSeq_var &
++IR_RepositoryIdSeq_var::operator= (IR_RepositoryIdSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::RepositoryIdSeq_var &
+-IR::RepositoryIdSeq_var::operator= (const ::IR::RepositoryIdSeq_var &p) // deep copy
++ACE_INLINE IR_RepositoryIdSeq_var &
++IR_RepositoryIdSeq_var::operator= (const ::IR_RepositoryIdSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::RepositoryIdSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_RepositoryIdSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::RepositoryIdSeq *
+-IR::RepositoryIdSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_RepositoryIdSeq *
++IR_RepositoryIdSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::RepositoryIdSeq *
+-IR::RepositoryIdSeq_var::operator-> (void)
++ACE_INLINE ::IR_RepositoryIdSeq *
++IR_RepositoryIdSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_var::operator const ::IR::RepositoryIdSeq &() const // cast
++IR_RepositoryIdSeq_var::operator const ::IR_RepositoryIdSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq &() // cast
++IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq &() const // cast
++IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::RepositoryIdSeq_var::operator ::IR::RepositoryIdSeq *&() // cast
++IR_RepositoryIdSeq_var::operator ::IR_RepositoryIdSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE TAO_SeqElem_String_Manager
+-IR::RepositoryIdSeq_var::operator[] (CORBA::ULong index)
++IR_RepositoryIdSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const ::IR::RepositoryIdSeq &
+-IR::RepositoryIdSeq_var::in (void) const
++ACE_INLINE const ::IR_RepositoryIdSeq &
++IR_RepositoryIdSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::RepositoryIdSeq &
+-IR::RepositoryIdSeq_var::inout (void)
++ACE_INLINE ::IR_RepositoryIdSeq &
++IR_RepositoryIdSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::RepositoryIdSeq *&
+-IR::RepositoryIdSeq_var::out (void)
++ACE_INLINE ::IR_RepositoryIdSeq *&
++IR_RepositoryIdSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::RepositoryIdSeq *
+-IR::RepositoryIdSeq_var::_retn (void)
++ACE_INLINE ::IR_RepositoryIdSeq *
++IR_RepositoryIdSeq_var::_retn (void)
+ {
+- ::IR::RepositoryIdSeq *tmp = this->ptr_;
++ ::IR_RepositoryIdSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::RepositoryIdSeq *
+-IR::RepositoryIdSeq_var::ptr (void) const
++ACE_INLINE ::IR_RepositoryIdSeq *
++IR_RepositoryIdSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::RepositoryIdSeq_out
++// Inline operations for class IR_RepositoryIdSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_out::RepositoryIdSeq_out (RepositoryIdSeq *&p)
++IR_RepositoryIdSeq_out::IR_RepositoryIdSeq_out (IR_RepositoryIdSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_out::RepositoryIdSeq_out (RepositoryIdSeq_var &p) // constructor from _var
++IR_RepositoryIdSeq_out::IR_RepositoryIdSeq_out (IR_RepositoryIdSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -16447,102 +15398,95 @@
+ }
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_out::RepositoryIdSeq_out (const ::IR::RepositoryIdSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (RepositoryIdSeq_out&, p).ptr_)
++IR_RepositoryIdSeq_out::IR_RepositoryIdSeq_out (const ::IR_RepositoryIdSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_RepositoryIdSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::RepositoryIdSeq_out &
+-IR::RepositoryIdSeq_out::operator= (const ::IR::RepositoryIdSeq_out &p)
++ACE_INLINE ::IR_RepositoryIdSeq_out &
++IR_RepositoryIdSeq_out::operator= (const ::IR_RepositoryIdSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (RepositoryIdSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_RepositoryIdSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::RepositoryIdSeq_out &
+-IR::RepositoryIdSeq_out::operator= (RepositoryIdSeq *p)
++ACE_INLINE ::IR_RepositoryIdSeq_out &
++IR_RepositoryIdSeq_out::operator= (IR_RepositoryIdSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::RepositoryIdSeq_out::operator ::IR::RepositoryIdSeq *&() // cast
++IR_RepositoryIdSeq_out::operator ::IR_RepositoryIdSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::RepositoryIdSeq *&
+-IR::RepositoryIdSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_RepositoryIdSeq *&
++IR_RepositoryIdSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::RepositoryIdSeq *
+-IR::RepositoryIdSeq_out::operator-> (void)
++ACE_INLINE ::IR_RepositoryIdSeq *
++IR_RepositoryIdSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE TAO_SeqElem_String_Manager
+-IR::RepositoryIdSeq_out::operator[] (CORBA::ULong index)
++IR_RepositoryIdSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_OPDESCRIPTIONSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::OperationDescription *
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_OperationDescription *
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::OperationDescription *retval = 0;
+- ACE_NEW_RETURN (retval, IR::OperationDescription[size], 0);
++ IR_OperationDescription *retval = 0;
++ ACE_NEW_RETURN (retval, IR_OperationDescription[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (IR::OperationDescription *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (IR_OperationDescription *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::OperationDescription *data,
++ IR_OperationDescription *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::OperationDescription *tmp1 = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (this->maximum_);
+- IR::OperationDescription * const tmp2 = ACE_reinterpret_cast (IR::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_OperationDescription *tmp1 = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (this->maximum_);
++ IR_OperationDescription * const tmp2 = ACE_reinterpret_cast (IR_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -16555,8 +15499,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq &
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq &
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_OpDescriptionSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -16567,7 +15511,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::OperationDescription *tmp = ACE_reinterpret_cast (IR::OperationDescription *, this->buffer_);
++ IR_OperationDescription *tmp = ACE_reinterpret_cast (IR_OperationDescription *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::allocbuf (rhs.maximum_);
+ }
+@@ -16577,8 +15521,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::OperationDescription *tmp1 = ACE_reinterpret_cast (IR::OperationDescription *, this->buffer_);
+- IR::OperationDescription * const tmp2 = ACE_reinterpret_cast (IR::OperationDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_OperationDescription *tmp1 = ACE_reinterpret_cast (IR_OperationDescription *, this->buffer_);
++ IR_OperationDescription * const tmp2 = ACE_reinterpret_cast (IR_OperationDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -16587,30 +15531,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::OperationDescription &
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_OperationDescription &
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::OperationDescription* tmp = ACE_reinterpret_cast(IR::OperationDescription*,this->buffer_);
++ IR_OperationDescription* tmp = ACE_reinterpret_cast(IR_OperationDescription*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::OperationDescription &
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_OperationDescription &
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::OperationDescription * const tmp = ACE_reinterpret_cast (IR::OperationDescription* ACE_CAST_CONST, this->buffer_);
++ IR_OperationDescription * const tmp = ACE_reinterpret_cast (IR_OperationDescription* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::OperationDescription *
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_OperationDescription *
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::OperationDescription *result = 0;
++ IR_OperationDescription *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -16622,7 +15566,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::OperationDescription*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_OperationDescription*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -16631,7 +15575,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::OperationDescription*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_OperationDescription*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -16641,182 +15585,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::OperationDescription *
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (void) const
++ ACE_INLINE const IR_OperationDescription *
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::OperationDescription * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_OperationDescription * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_OpDescriptionSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_OpDescriptionSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::OperationDescription *data,
++ IR_OperationDescription *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::OperationDescription *tmp = ACE_reinterpret_cast(IR::OperationDescription*,this->buffer_);
++ IR_OperationDescription *tmp = ACE_reinterpret_cast(IR_OperationDescription*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_OpDescriptionSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_OPDESCRIPTIONSEQ_CI_)
+-#define _TAO_IR_OPDESCRIPTIONSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::OpDescriptionSeq_var
++// Inline operations for class IR_OpDescriptionSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_var::OpDescriptionSeq_var (void) // default constructor
++IR_OpDescriptionSeq_var::IR_OpDescriptionSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_var::OpDescriptionSeq_var (OpDescriptionSeq *p)
++IR_OpDescriptionSeq_var::IR_OpDescriptionSeq_var (IR_OpDescriptionSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_var::OpDescriptionSeq_var (const ::IR::OpDescriptionSeq_var &p) // copy constructor
++IR_OpDescriptionSeq_var::IR_OpDescriptionSeq_var (const ::IR_OpDescriptionSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::OpDescriptionSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_OpDescriptionSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_var::~OpDescriptionSeq_var (void) // destructor
++IR_OpDescriptionSeq_var::~IR_OpDescriptionSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::OpDescriptionSeq_var &
+-IR::OpDescriptionSeq_var::operator= (OpDescriptionSeq *p)
++ACE_INLINE IR_OpDescriptionSeq_var &
++IR_OpDescriptionSeq_var::operator= (IR_OpDescriptionSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::OpDescriptionSeq_var &
+-IR::OpDescriptionSeq_var::operator= (const ::IR::OpDescriptionSeq_var &p) // deep copy
++ACE_INLINE IR_OpDescriptionSeq_var &
++IR_OpDescriptionSeq_var::operator= (const ::IR_OpDescriptionSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::OpDescriptionSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_OpDescriptionSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::OpDescriptionSeq *
+-IR::OpDescriptionSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_OpDescriptionSeq *
++IR_OpDescriptionSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OpDescriptionSeq *
+-IR::OpDescriptionSeq_var::operator-> (void)
++ACE_INLINE ::IR_OpDescriptionSeq *
++IR_OpDescriptionSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_var::operator const ::IR::OpDescriptionSeq &() const // cast
++IR_OpDescriptionSeq_var::operator const ::IR_OpDescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_var::operator ::IR::OpDescriptionSeq &() // cast
++IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_var::operator ::IR::OpDescriptionSeq &() const // cast
++IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::OpDescriptionSeq_var::operator ::IR::OpDescriptionSeq *&() // cast
++IR_OpDescriptionSeq_var::operator ::IR_OpDescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::OperationDescription &
+-IR::OpDescriptionSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_OperationDescription &
++IR_OpDescriptionSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::OperationDescription &
+-IR::OpDescriptionSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_OperationDescription &
++IR_OpDescriptionSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::OperationDescription &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_OperationDescription &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::OpDescriptionSeq &
+-IR::OpDescriptionSeq_var::in (void) const
++ACE_INLINE const ::IR_OpDescriptionSeq &
++IR_OpDescriptionSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OpDescriptionSeq &
+-IR::OpDescriptionSeq_var::inout (void)
++ACE_INLINE ::IR_OpDescriptionSeq &
++IR_OpDescriptionSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::OpDescriptionSeq *&
+-IR::OpDescriptionSeq_var::out (void)
++ACE_INLINE ::IR_OpDescriptionSeq *&
++IR_OpDescriptionSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OpDescriptionSeq *
+-IR::OpDescriptionSeq_var::_retn (void)
++ACE_INLINE ::IR_OpDescriptionSeq *
++IR_OpDescriptionSeq_var::_retn (void)
+ {
+- ::IR::OpDescriptionSeq *tmp = this->ptr_;
++ ::IR_OpDescriptionSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::OpDescriptionSeq *
+-IR::OpDescriptionSeq_var::ptr (void) const
++ACE_INLINE ::IR_OpDescriptionSeq *
++IR_OpDescriptionSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::OpDescriptionSeq_out
++// Inline operations for class IR_OpDescriptionSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_out::OpDescriptionSeq_out (OpDescriptionSeq *&p)
++IR_OpDescriptionSeq_out::IR_OpDescriptionSeq_out (IR_OpDescriptionSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_out::OpDescriptionSeq_out (OpDescriptionSeq_var &p) // constructor from _var
++IR_OpDescriptionSeq_out::IR_OpDescriptionSeq_out (IR_OpDescriptionSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -16824,102 +15762,95 @@
+ }
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_out::OpDescriptionSeq_out (const ::IR::OpDescriptionSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (OpDescriptionSeq_out&, p).ptr_)
++IR_OpDescriptionSeq_out::IR_OpDescriptionSeq_out (const ::IR_OpDescriptionSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_OpDescriptionSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::OpDescriptionSeq_out &
+-IR::OpDescriptionSeq_out::operator= (const ::IR::OpDescriptionSeq_out &p)
++ACE_INLINE ::IR_OpDescriptionSeq_out &
++IR_OpDescriptionSeq_out::operator= (const ::IR_OpDescriptionSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (OpDescriptionSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_OpDescriptionSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::OpDescriptionSeq_out &
+-IR::OpDescriptionSeq_out::operator= (OpDescriptionSeq *p)
++ACE_INLINE ::IR_OpDescriptionSeq_out &
++IR_OpDescriptionSeq_out::operator= (IR_OpDescriptionSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::OpDescriptionSeq_out::operator ::IR::OpDescriptionSeq *&() // cast
++IR_OpDescriptionSeq_out::operator ::IR_OpDescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OpDescriptionSeq *&
+-IR::OpDescriptionSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_OpDescriptionSeq *&
++IR_OpDescriptionSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::OpDescriptionSeq *
+-IR::OpDescriptionSeq_out::operator-> (void)
++ACE_INLINE ::IR_OpDescriptionSeq *
++IR_OpDescriptionSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::OperationDescription &
+-IR::OpDescriptionSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_OperationDescription &
++IR_OpDescriptionSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_ATTRDESCRIPTIONSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::AttributeDescription *
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_AttributeDescription *
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::AttributeDescription *retval = 0;
+- ACE_NEW_RETURN (retval, IR::AttributeDescription[size], 0);
++ IR_AttributeDescription *retval = 0;
++ ACE_NEW_RETURN (retval, IR_AttributeDescription[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (IR::AttributeDescription *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (IR_AttributeDescription *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::AttributeDescription *data,
++ IR_AttributeDescription *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (this->maximum_);
+- IR::AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_AttributeDescription *tmp1 = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (this->maximum_);
++ IR_AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -16932,8 +15863,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator= (const _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -16944,7 +15875,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::AttributeDescription *tmp = ACE_reinterpret_cast (IR::AttributeDescription *, this->buffer_);
++ IR_AttributeDescription *tmp = ACE_reinterpret_cast (IR_AttributeDescription *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::allocbuf (rhs.maximum_);
+ }
+@@ -16954,8 +15885,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::AttributeDescription *tmp1 = ACE_reinterpret_cast (IR::AttributeDescription *, this->buffer_);
+- IR::AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR::AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_AttributeDescription *tmp1 = ACE_reinterpret_cast (IR_AttributeDescription *, this->buffer_);
++ IR_AttributeDescription * const tmp2 = ACE_reinterpret_cast (IR_AttributeDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -16964,30 +15895,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::AttributeDescription &
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_AttributeDescription &
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::AttributeDescription* tmp = ACE_reinterpret_cast(IR::AttributeDescription*,this->buffer_);
++ IR_AttributeDescription* tmp = ACE_reinterpret_cast(IR_AttributeDescription*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::AttributeDescription &
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_AttributeDescription &
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::AttributeDescription * const tmp = ACE_reinterpret_cast (IR::AttributeDescription* ACE_CAST_CONST, this->buffer_);
++ IR_AttributeDescription * const tmp = ACE_reinterpret_cast (IR_AttributeDescription* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::AttributeDescription *
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_AttributeDescription *
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::AttributeDescription *result = 0;
++ IR_AttributeDescription *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -16999,7 +15930,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::AttributeDescription*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_AttributeDescription*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -17008,7 +15939,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::AttributeDescription*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_AttributeDescription*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -17018,182 +15949,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::AttributeDescription *
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (void) const
++ ACE_INLINE const IR_AttributeDescription *
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::AttributeDescription * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_AttributeDescription * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::AttributeDescription *data,
++ IR_AttributeDescription *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::AttributeDescription *tmp = ACE_reinterpret_cast(IR::AttributeDescription*,this->buffer_);
++ IR_AttributeDescription *tmp = ACE_reinterpret_cast(IR_AttributeDescription*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_AttrDescriptionSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_ATTRDESCRIPTIONSEQ_CI_)
+-#define _TAO_IR_ATTRDESCRIPTIONSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::AttrDescriptionSeq_var
++// Inline operations for class IR_AttrDescriptionSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_var::AttrDescriptionSeq_var (void) // default constructor
++IR_AttrDescriptionSeq_var::IR_AttrDescriptionSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_var::AttrDescriptionSeq_var (AttrDescriptionSeq *p)
++IR_AttrDescriptionSeq_var::IR_AttrDescriptionSeq_var (IR_AttrDescriptionSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_var::AttrDescriptionSeq_var (const ::IR::AttrDescriptionSeq_var &p) // copy constructor
++IR_AttrDescriptionSeq_var::IR_AttrDescriptionSeq_var (const ::IR_AttrDescriptionSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::AttrDescriptionSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_AttrDescriptionSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_var::~AttrDescriptionSeq_var (void) // destructor
++IR_AttrDescriptionSeq_var::~IR_AttrDescriptionSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::AttrDescriptionSeq_var &
+-IR::AttrDescriptionSeq_var::operator= (AttrDescriptionSeq *p)
++ACE_INLINE IR_AttrDescriptionSeq_var &
++IR_AttrDescriptionSeq_var::operator= (IR_AttrDescriptionSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::AttrDescriptionSeq_var &
+-IR::AttrDescriptionSeq_var::operator= (const ::IR::AttrDescriptionSeq_var &p) // deep copy
++ACE_INLINE IR_AttrDescriptionSeq_var &
++IR_AttrDescriptionSeq_var::operator= (const ::IR_AttrDescriptionSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::AttrDescriptionSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_AttrDescriptionSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::AttrDescriptionSeq *
+-IR::AttrDescriptionSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_AttrDescriptionSeq *
++IR_AttrDescriptionSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttrDescriptionSeq *
+-IR::AttrDescriptionSeq_var::operator-> (void)
++ACE_INLINE ::IR_AttrDescriptionSeq *
++IR_AttrDescriptionSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_var::operator const ::IR::AttrDescriptionSeq &() const // cast
++IR_AttrDescriptionSeq_var::operator const ::IR_AttrDescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_var::operator ::IR::AttrDescriptionSeq &() // cast
++IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_var::operator ::IR::AttrDescriptionSeq &() const // cast
++IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::AttrDescriptionSeq_var::operator ::IR::AttrDescriptionSeq *&() // cast
++IR_AttrDescriptionSeq_var::operator ::IR_AttrDescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AttributeDescription &
+-IR::AttrDescriptionSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_AttributeDescription &
++IR_AttrDescriptionSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::AttributeDescription &
+-IR::AttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_AttributeDescription &
++IR_AttrDescriptionSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::AttributeDescription &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_AttributeDescription &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::AttrDescriptionSeq &
+-IR::AttrDescriptionSeq_var::in (void) const
++ACE_INLINE const ::IR_AttrDescriptionSeq &
++IR_AttrDescriptionSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttrDescriptionSeq &
+-IR::AttrDescriptionSeq_var::inout (void)
++ACE_INLINE ::IR_AttrDescriptionSeq &
++IR_AttrDescriptionSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::AttrDescriptionSeq *&
+-IR::AttrDescriptionSeq_var::out (void)
++ACE_INLINE ::IR_AttrDescriptionSeq *&
++IR_AttrDescriptionSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttrDescriptionSeq *
+-IR::AttrDescriptionSeq_var::_retn (void)
++ACE_INLINE ::IR_AttrDescriptionSeq *
++IR_AttrDescriptionSeq_var::_retn (void)
+ {
+- ::IR::AttrDescriptionSeq *tmp = this->ptr_;
++ ::IR_AttrDescriptionSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::AttrDescriptionSeq *
+-IR::AttrDescriptionSeq_var::ptr (void) const
++ACE_INLINE ::IR_AttrDescriptionSeq *
++IR_AttrDescriptionSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::AttrDescriptionSeq_out
++// Inline operations for class IR_AttrDescriptionSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_out::AttrDescriptionSeq_out (AttrDescriptionSeq *&p)
++IR_AttrDescriptionSeq_out::IR_AttrDescriptionSeq_out (IR_AttrDescriptionSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_out::AttrDescriptionSeq_out (AttrDescriptionSeq_var &p) // constructor from _var
++IR_AttrDescriptionSeq_out::IR_AttrDescriptionSeq_out (IR_AttrDescriptionSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -17201,184 +16126,181 @@
+ }
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_out::AttrDescriptionSeq_out (const ::IR::AttrDescriptionSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (AttrDescriptionSeq_out&, p).ptr_)
++IR_AttrDescriptionSeq_out::IR_AttrDescriptionSeq_out (const ::IR_AttrDescriptionSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_AttrDescriptionSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::AttrDescriptionSeq_out &
+-IR::AttrDescriptionSeq_out::operator= (const ::IR::AttrDescriptionSeq_out &p)
++ACE_INLINE ::IR_AttrDescriptionSeq_out &
++IR_AttrDescriptionSeq_out::operator= (const ::IR_AttrDescriptionSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (AttrDescriptionSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_AttrDescriptionSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::AttrDescriptionSeq_out &
+-IR::AttrDescriptionSeq_out::operator= (AttrDescriptionSeq *p)
++ACE_INLINE ::IR_AttrDescriptionSeq_out &
++IR_AttrDescriptionSeq_out::operator= (IR_AttrDescriptionSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::AttrDescriptionSeq_out::operator ::IR::AttrDescriptionSeq *&() // cast
++IR_AttrDescriptionSeq_out::operator ::IR_AttrDescriptionSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttrDescriptionSeq *&
+-IR::AttrDescriptionSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_AttrDescriptionSeq *&
++IR_AttrDescriptionSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::AttrDescriptionSeq *
+-IR::AttrDescriptionSeq_out::operator-> (void)
++ACE_INLINE ::IR_AttrDescriptionSeq *
++IR_AttrDescriptionSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::AttributeDescription &
+-IR::AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_AttributeDescription &
++IR_AttrDescriptionSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::InterfaceDescription_var
++// Inline operations for class IR_InterfaceDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::InterfaceDescription_var::InterfaceDescription_var (void) // default constructor
++IR_InterfaceDescription_var::IR_InterfaceDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::InterfaceDescription_var::InterfaceDescription_var (InterfaceDescription *p)
++IR_InterfaceDescription_var::IR_InterfaceDescription_var (IR_InterfaceDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::InterfaceDescription_var::InterfaceDescription_var (const ::IR::InterfaceDescription_var &p) // copy constructor
++IR_InterfaceDescription_var::IR_InterfaceDescription_var (const ::IR_InterfaceDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::InterfaceDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_InterfaceDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDescription_var::~InterfaceDescription_var (void) // destructor
++IR_InterfaceDescription_var::~IR_InterfaceDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::InterfaceDescription_var &
+-IR::InterfaceDescription_var::operator= (InterfaceDescription *p)
++ACE_INLINE IR_InterfaceDescription_var &
++IR_InterfaceDescription_var::operator= (IR_InterfaceDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::InterfaceDescription_var &
+-IR::InterfaceDescription_var::operator= (const ::IR::InterfaceDescription_var &p)
++ACE_INLINE ::IR_InterfaceDescription_var &
++IR_InterfaceDescription_var::operator= (const ::IR_InterfaceDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::InterfaceDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_InterfaceDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::InterfaceDescription *
+-IR::InterfaceDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_InterfaceDescription *
++IR_InterfaceDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDescription *
+-IR::InterfaceDescription_var::operator-> (void)
++ACE_INLINE ::IR_InterfaceDescription *
++IR_InterfaceDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDescription_var::operator const ::IR::InterfaceDescription &() const // cast
++IR_InterfaceDescription_var::operator const ::IR_InterfaceDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDescription_var::operator ::IR::InterfaceDescription &() // cast
++IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDescription_var::operator ::IR::InterfaceDescription &() const // cast
++IR_InterfaceDescription_var::operator ::IR_InterfaceDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::InterfaceDescription_var::operator ::IR::InterfaceDescription *&() // cast
++IR_InterfaceDescription_var::operator ::IR_InterfaceDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::InterfaceDescription &
+-IR::InterfaceDescription_var::in (void) const
++ACE_INLINE const ::IR_InterfaceDescription &
++IR_InterfaceDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDescription &
+-IR::InterfaceDescription_var::inout (void)
++ACE_INLINE ::IR_InterfaceDescription &
++IR_InterfaceDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::InterfaceDescription *&
+-IR::InterfaceDescription_var::out (void)
++ACE_INLINE ::IR_InterfaceDescription *&
++IR_InterfaceDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDescription *
+-IR::InterfaceDescription_var::_retn (void)
++ACE_INLINE ::IR_InterfaceDescription *
++IR_InterfaceDescription_var::_retn (void)
+ {
+- ::IR::InterfaceDescription *tmp = this->ptr_;
++ ::IR_InterfaceDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::InterfaceDescription *
+-IR::InterfaceDescription_var::ptr (void) const
++ACE_INLINE ::IR_InterfaceDescription *
++IR_InterfaceDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::InterfaceDescription_out
++// Inline operations for class IR_InterfaceDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::InterfaceDescription_out::InterfaceDescription_out (::IR::InterfaceDescription *&p)
++IR_InterfaceDescription_out::IR_InterfaceDescription_out (::IR_InterfaceDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDescription_out::InterfaceDescription_out (InterfaceDescription_var &p) // constructor from _var
++IR_InterfaceDescription_out::IR_InterfaceDescription_out (IR_InterfaceDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -17386,175 +16308,175 @@
+ }
+
+ ACE_INLINE
+-IR::InterfaceDescription_out::InterfaceDescription_out (const ::IR::InterfaceDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (InterfaceDescription_out&, p).ptr_)
++IR_InterfaceDescription_out::IR_InterfaceDescription_out (const ::IR_InterfaceDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_InterfaceDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::InterfaceDescription_out &
+-IR::InterfaceDescription_out::operator= (const ::IR::InterfaceDescription_out &p)
++ACE_INLINE IR_InterfaceDescription_out &
++IR_InterfaceDescription_out::operator= (const ::IR_InterfaceDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (InterfaceDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_InterfaceDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::InterfaceDescription_out &
+-IR::InterfaceDescription_out::operator= (InterfaceDescription *p)
++ACE_INLINE IR_InterfaceDescription_out &
++IR_InterfaceDescription_out::operator= (IR_InterfaceDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::InterfaceDescription_out::operator ::IR::InterfaceDescription *&() // cast
++IR_InterfaceDescription_out::operator ::IR_InterfaceDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDescription *&
+-IR::InterfaceDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_InterfaceDescription *&
++IR_InterfaceDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::InterfaceDescription *
+-IR::InterfaceDescription_out::operator-> (void)
++ACE_INLINE ::IR_InterfaceDescription *
++IR_InterfaceDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ValueMember_var
++// Inline operations for class IR_ValueMember_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueMember_var::ValueMember_var (void) // default constructor
++IR_ValueMember_var::IR_ValueMember_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ValueMember_var::ValueMember_var (ValueMember *p)
++IR_ValueMember_var::IR_ValueMember_var (IR_ValueMember *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ValueMember_var::ValueMember_var (const ::IR::ValueMember_var &p) // copy constructor
++IR_ValueMember_var::IR_ValueMember_var (const ::IR_ValueMember_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ValueMember (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ValueMember (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ValueMember_var::~ValueMember_var (void) // destructor
++IR_ValueMember_var::~IR_ValueMember_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueMember_var &
+-IR::ValueMember_var::operator= (ValueMember *p)
++ACE_INLINE IR_ValueMember_var &
++IR_ValueMember_var::operator= (IR_ValueMember *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ValueMember_var &
+-IR::ValueMember_var::operator= (const ::IR::ValueMember_var &p)
++ACE_INLINE ::IR_ValueMember_var &
++IR_ValueMember_var::operator= (const ::IR_ValueMember_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ValueMember (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ValueMember (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ValueMember *
+-IR::ValueMember_var::operator-> (void) const
++ACE_INLINE const ::IR_ValueMember *
++IR_ValueMember_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMember *
+-IR::ValueMember_var::operator-> (void)
++ACE_INLINE ::IR_ValueMember *
++IR_ValueMember_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueMember_var::operator const ::IR::ValueMember &() const // cast
++IR_ValueMember_var::operator const ::IR_ValueMember &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueMember_var::operator ::IR::ValueMember &() // cast
++IR_ValueMember_var::operator ::IR_ValueMember &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueMember_var::operator ::IR::ValueMember &() const // cast
++IR_ValueMember_var::operator ::IR_ValueMember &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ValueMember_var::operator ::IR::ValueMember *&() // cast
++IR_ValueMember_var::operator ::IR_ValueMember *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::ValueMember &
+-IR::ValueMember_var::in (void) const
++ACE_INLINE const ::IR_ValueMember &
++IR_ValueMember_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMember &
+-IR::ValueMember_var::inout (void)
++ACE_INLINE ::IR_ValueMember &
++IR_ValueMember_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ValueMember *&
+-IR::ValueMember_var::out (void)
++ACE_INLINE ::IR_ValueMember *&
++IR_ValueMember_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMember *
+-IR::ValueMember_var::_retn (void)
++ACE_INLINE ::IR_ValueMember *
++IR_ValueMember_var::_retn (void)
+ {
+- ::IR::ValueMember *tmp = this->ptr_;
++ ::IR_ValueMember *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ValueMember *
+-IR::ValueMember_var::ptr (void) const
++ACE_INLINE ::IR_ValueMember *
++IR_ValueMember_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ValueMember_out
++// Inline operations for class IR_ValueMember_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueMember_out::ValueMember_out (::IR::ValueMember *&p)
++IR_ValueMember_out::IR_ValueMember_out (::IR_ValueMember *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ValueMember_out::ValueMember_out (ValueMember_var &p) // constructor from _var
++IR_ValueMember_out::IR_ValueMember_out (IR_ValueMember_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -17562,93 +16484,89 @@
+ }
+
+ ACE_INLINE
+-IR::ValueMember_out::ValueMember_out (const ::IR::ValueMember_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ValueMember_out&, p).ptr_)
++IR_ValueMember_out::IR_ValueMember_out (const ::IR_ValueMember_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ValueMember_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::ValueMember_out &
+-IR::ValueMember_out::operator= (const ::IR::ValueMember_out &p)
++ACE_INLINE IR_ValueMember_out &
++IR_ValueMember_out::operator= (const ::IR_ValueMember_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ValueMember_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ValueMember_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueMember_out &
+-IR::ValueMember_out::operator= (ValueMember *p)
++ACE_INLINE IR_ValueMember_out &
++IR_ValueMember_out::operator= (IR_ValueMember *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueMember_out::operator ::IR::ValueMember *&() // cast
++IR_ValueMember_out::operator ::IR_ValueMember *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMember *&
+-IR::ValueMember_out::ptr (void) // ptr
++ACE_INLINE ::IR_ValueMember *&
++IR_ValueMember_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMember *
+-IR::ValueMember_out::operator-> (void)
++ACE_INLINE ::IR_ValueMember *
++IR_ValueMember_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_VALUEMEMBERSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::ValueMember *
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_ValueMember *
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::ValueMember *retval = 0;
+- ACE_NEW_RETURN (retval, IR::ValueMember[size], 0);
++ IR_ValueMember *retval = 0;
++ ACE_NEW_RETURN (retval, IR_ValueMember[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (IR::ValueMember *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (IR_ValueMember *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ValueMember *data,
++ IR_ValueMember *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::_TAO_Unbounded_Sequence_IR_ValueMemberSeq (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ValueMember *tmp1 = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (this->maximum_);
+- IR::ValueMember * const tmp2 = ACE_reinterpret_cast (IR::ValueMember * ACE_CAST_CONST, rhs.buffer_);
++ IR_ValueMember *tmp1 = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (this->maximum_);
++ IR_ValueMember * const tmp2 = ACE_reinterpret_cast (IR_ValueMember * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -17661,8 +16579,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq &
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq &
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator= (const _TAO_Unbounded_Sequence_IR_ValueMemberSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -17673,7 +16591,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::ValueMember *tmp = ACE_reinterpret_cast (IR::ValueMember *, this->buffer_);
++ IR_ValueMember *tmp = ACE_reinterpret_cast (IR_ValueMember *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_ValueMemberSeq::allocbuf (rhs.maximum_);
+ }
+@@ -17683,8 +16601,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ValueMember *tmp1 = ACE_reinterpret_cast (IR::ValueMember *, this->buffer_);
+- IR::ValueMember * const tmp2 = ACE_reinterpret_cast (IR::ValueMember * ACE_CAST_CONST, rhs.buffer_);
++ IR_ValueMember *tmp1 = ACE_reinterpret_cast (IR_ValueMember *, this->buffer_);
++ IR_ValueMember * const tmp2 = ACE_reinterpret_cast (IR_ValueMember * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -17693,30 +16611,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::ValueMember &
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_ValueMember &
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::ValueMember* tmp = ACE_reinterpret_cast(IR::ValueMember*,this->buffer_);
++ IR_ValueMember* tmp = ACE_reinterpret_cast(IR_ValueMember*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::ValueMember &
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_ValueMember &
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::ValueMember * const tmp = ACE_reinterpret_cast (IR::ValueMember* ACE_CAST_CONST, this->buffer_);
++ IR_ValueMember * const tmp = ACE_reinterpret_cast (IR_ValueMember* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::ValueMember *
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ValueMember *
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ValueMember *result = 0;
++ IR_ValueMember *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -17728,7 +16646,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ValueMember*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ValueMember*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -17737,7 +16655,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ValueMember*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ValueMember*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -17747,182 +16665,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ValueMember *
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (void) const
++ ACE_INLINE const IR_ValueMember *
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ValueMember * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ValueMember * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_ValueMemberSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_ValueMemberSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::ValueMember *data,
++ IR_ValueMember *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::ValueMember *tmp = ACE_reinterpret_cast(IR::ValueMember*,this->buffer_);
++ IR_ValueMember *tmp = ACE_reinterpret_cast(IR_ValueMember*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_ValueMemberSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_VALUEMEMBERSEQ_CI_)
+-#define _TAO_IR_VALUEMEMBERSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueMemberSeq_var
++// Inline operations for class IR_ValueMemberSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueMemberSeq_var::ValueMemberSeq_var (void) // default constructor
++IR_ValueMemberSeq_var::IR_ValueMemberSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ValueMemberSeq_var::ValueMemberSeq_var (ValueMemberSeq *p)
++IR_ValueMemberSeq_var::IR_ValueMemberSeq_var (IR_ValueMemberSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ValueMemberSeq_var::ValueMemberSeq_var (const ::IR::ValueMemberSeq_var &p) // copy constructor
++IR_ValueMemberSeq_var::IR_ValueMemberSeq_var (const ::IR_ValueMemberSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ValueMemberSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ValueMemberSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberSeq_var::~ValueMemberSeq_var (void) // destructor
++IR_ValueMemberSeq_var::~IR_ValueMemberSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueMemberSeq_var &
+-IR::ValueMemberSeq_var::operator= (ValueMemberSeq *p)
++ACE_INLINE IR_ValueMemberSeq_var &
++IR_ValueMemberSeq_var::operator= (IR_ValueMemberSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueMemberSeq_var &
+-IR::ValueMemberSeq_var::operator= (const ::IR::ValueMemberSeq_var &p) // deep copy
++ACE_INLINE IR_ValueMemberSeq_var &
++IR_ValueMemberSeq_var::operator= (const ::IR_ValueMemberSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ValueMemberSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ValueMemberSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ValueMemberSeq *
+-IR::ValueMemberSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ValueMemberSeq *
++IR_ValueMemberSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberSeq *
+-IR::ValueMemberSeq_var::operator-> (void)
++ACE_INLINE ::IR_ValueMemberSeq *
++IR_ValueMemberSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberSeq_var::operator const ::IR::ValueMemberSeq &() const // cast
++IR_ValueMemberSeq_var::operator const ::IR_ValueMemberSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberSeq_var::operator ::IR::ValueMemberSeq &() // cast
++IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberSeq_var::operator ::IR::ValueMemberSeq &() const // cast
++IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ValueMemberSeq_var::operator ::IR::ValueMemberSeq *&() // cast
++IR_ValueMemberSeq_var::operator ::IR_ValueMemberSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueMember &
+-IR::ValueMemberSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_ValueMember &
++IR_ValueMemberSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::ValueMember &
+-IR::ValueMemberSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_ValueMember &
++IR_ValueMemberSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::ValueMember &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_ValueMember &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::ValueMemberSeq &
+-IR::ValueMemberSeq_var::in (void) const
++ACE_INLINE const ::IR_ValueMemberSeq &
++IR_ValueMemberSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberSeq &
+-IR::ValueMemberSeq_var::inout (void)
++ACE_INLINE ::IR_ValueMemberSeq &
++IR_ValueMemberSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ValueMemberSeq *&
+-IR::ValueMemberSeq_var::out (void)
++ACE_INLINE ::IR_ValueMemberSeq *&
++IR_ValueMemberSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberSeq *
+-IR::ValueMemberSeq_var::_retn (void)
++ACE_INLINE ::IR_ValueMemberSeq *
++IR_ValueMemberSeq_var::_retn (void)
+ {
+- ::IR::ValueMemberSeq *tmp = this->ptr_;
++ ::IR_ValueMemberSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ValueMemberSeq *
+-IR::ValueMemberSeq_var::ptr (void) const
++ACE_INLINE ::IR_ValueMemberSeq *
++IR_ValueMemberSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ValueMemberSeq_out
++// Inline operations for class IR_ValueMemberSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueMemberSeq_out::ValueMemberSeq_out (ValueMemberSeq *&p)
++IR_ValueMemberSeq_out::IR_ValueMemberSeq_out (IR_ValueMemberSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberSeq_out::ValueMemberSeq_out (ValueMemberSeq_var &p) // constructor from _var
++IR_ValueMemberSeq_out::IR_ValueMemberSeq_out (IR_ValueMemberSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -17930,57 +16842,50 @@
+ }
+
+ ACE_INLINE
+-IR::ValueMemberSeq_out::ValueMemberSeq_out (const ::IR::ValueMemberSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ValueMemberSeq_out&, p).ptr_)
++IR_ValueMemberSeq_out::IR_ValueMemberSeq_out (const ::IR_ValueMemberSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ValueMemberSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ValueMemberSeq_out &
+-IR::ValueMemberSeq_out::operator= (const ::IR::ValueMemberSeq_out &p)
++ACE_INLINE ::IR_ValueMemberSeq_out &
++IR_ValueMemberSeq_out::operator= (const ::IR_ValueMemberSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ValueMemberSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ValueMemberSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ValueMemberSeq_out &
+-IR::ValueMemberSeq_out::operator= (ValueMemberSeq *p)
++ACE_INLINE ::IR_ValueMemberSeq_out &
++IR_ValueMemberSeq_out::operator= (IR_ValueMemberSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberSeq_out::operator ::IR::ValueMemberSeq *&() // cast
++IR_ValueMemberSeq_out::operator ::IR_ValueMemberSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberSeq *&
+-IR::ValueMemberSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ValueMemberSeq *&
++IR_ValueMemberSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberSeq *
+-IR::ValueMemberSeq_out::operator-> (void)
++ACE_INLINE ::IR_ValueMemberSeq *
++IR_ValueMemberSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueMember &
+-IR::ValueMemberSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_ValueMember &
++IR_ValueMemberSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERDEF___CI_)
+-#define _TAO_IR_VALUEMEMBERDEF___CI_
+-
+ ACE_INLINE
+-IR::ValueMemberDef::ValueMemberDef (
++IR_ValueMemberDef::IR_ValueMemberDef (
+ TAO_Stub *objref,
+ CORBA::Boolean _tao_collocated,
+ TAO_Abstract_ServantBase *servant
+@@ -17990,311 +16895,295 @@
+ this->_tao_setup_collocation (_tao_collocated);
+ }
+
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERDEF___VAR_CI_)
+-#define _TAO_IR_VALUEMEMBERDEF___VAR_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueMemberDef_var
++// Inline operations for class IR_ValueMemberDef_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueMemberDef_var::ValueMemberDef_var (void) // default constructor
+- : ptr_ (ValueMemberDef::_nil ())
++IR_ValueMemberDef_var::IR_ValueMemberDef_var (void) // default constructor
++ : ptr_ (IR_ValueMemberDef::_nil ())
+ {}
+
+-ACE_INLINE ::IR::ValueMemberDef_ptr
+-IR::ValueMemberDef_var::ptr (void) const
++ACE_INLINE ::IR_ValueMemberDef_ptr
++IR_ValueMemberDef_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberDef_var::ValueMemberDef_var (const ::IR::ValueMemberDef_var &p) // copy constructor
++IR_ValueMemberDef_var::IR_ValueMemberDef_var (const ::IR_ValueMemberDef_var &p) // copy constructor
+ : TAO_Base_var (),
+- ptr_ (ValueMemberDef::_duplicate (p.ptr ()))
++ ptr_ (IR_ValueMemberDef::_duplicate (p.ptr ()))
+ {}
+
+ ACE_INLINE
+-IR::ValueMemberDef_var::~ValueMemberDef_var (void) // destructor
++IR_ValueMemberDef_var::~IR_ValueMemberDef_var (void) // destructor
+ {
+ CORBA::release (this->ptr_);
+ }
+
+-ACE_INLINE IR::ValueMemberDef_var &
+-IR::ValueMemberDef_var::operator= (ValueMemberDef_ptr p)
++ACE_INLINE IR_ValueMemberDef_var &
++IR_ValueMemberDef_var::operator= (IR_ValueMemberDef_ptr p)
+ {
+ CORBA::release (this->ptr_);
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueMemberDef_var &
+-IR::ValueMemberDef_var::operator= (const ::IR::ValueMemberDef_var &p)
++ACE_INLINE IR_ValueMemberDef_var &
++IR_ValueMemberDef_var::operator= (const ::IR_ValueMemberDef_var &p)
+ {
+ if (this != &p)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::ValueMemberDef::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_ValueMemberDef::_duplicate (p.ptr ());
+ }
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberDef_var::operator const ::IR::ValueMemberDef_ptr &() const // cast
++IR_ValueMemberDef_var::operator const ::IR_ValueMemberDef_ptr &() const // cast
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberDef_var::operator ::IR::ValueMemberDef_ptr &() // cast
++IR_ValueMemberDef_var::operator ::IR_ValueMemberDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberDef_ptr
+-IR::ValueMemberDef_var::operator-> (void) const
++ACE_INLINE ::IR_ValueMemberDef_ptr
++IR_ValueMemberDef_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberDef_ptr
+-IR::ValueMemberDef_var::in (void) const
++ACE_INLINE ::IR_ValueMemberDef_ptr
++IR_ValueMemberDef_var::in (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberDef_ptr &
+-IR::ValueMemberDef_var::inout (void)
++ACE_INLINE ::IR_ValueMemberDef_ptr &
++IR_ValueMemberDef_var::inout (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberDef_ptr &
+-IR::ValueMemberDef_var::out (void)
++ACE_INLINE ::IR_ValueMemberDef_ptr &
++IR_ValueMemberDef_var::out (void)
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::ValueMemberDef::_nil ();
++ this->ptr_ = ::IR_ValueMemberDef::_nil ();
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberDef_ptr
+-IR::ValueMemberDef_var::_retn (void)
++ACE_INLINE ::IR_ValueMemberDef_ptr
++IR_ValueMemberDef_var::_retn (void)
+ {
+ // yield ownership of managed obj reference
+- ::IR::ValueMemberDef_ptr val = this->ptr_;
+- this->ptr_ = ::IR::ValueMemberDef::_nil ();
++ ::IR_ValueMemberDef_ptr val = this->ptr_;
++ this->ptr_ = ::IR_ValueMemberDef::_nil ();
+ return val;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+-#if !defined (_TAO_IR_VALUEMEMBERDEF___OUT_CI_)
+-#define _TAO_IR_VALUEMEMBERDEF___OUT_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueMemberDef_out
++// Inline operations for class IR_ValueMemberDef_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueMemberDef_out::ValueMemberDef_out (ValueMemberDef_ptr &p)
++IR_ValueMemberDef_out::IR_ValueMemberDef_out (IR_ValueMemberDef_ptr &p)
+ : ptr_ (p)
+ {
+- this->ptr_ = ::IR::ValueMemberDef::_nil ();
++ this->ptr_ = ::IR_ValueMemberDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ValueMemberDef_out::ValueMemberDef_out (ValueMemberDef_var &p) // constructor from _var
++IR_ValueMemberDef_out::IR_ValueMemberDef_out (IR_ValueMemberDef_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ CORBA::release (this->ptr_);
+- this->ptr_ = ::IR::ValueMemberDef::_nil ();
++ this->ptr_ = ::IR_ValueMemberDef::_nil ();
+ }
+
+ ACE_INLINE
+-IR::ValueMemberDef_out::ValueMemberDef_out (const ::IR::ValueMemberDef_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ValueMemberDef_out &, p).ptr_)
++IR_ValueMemberDef_out::IR_ValueMemberDef_out (const ::IR_ValueMemberDef_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ValueMemberDef_out &, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ValueMemberDef_out &
+-IR::ValueMemberDef_out::operator= (const ::IR::ValueMemberDef_out &p)
++ACE_INLINE ::IR_ValueMemberDef_out &
++IR_ValueMemberDef_out::operator= (const ::IR_ValueMemberDef_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ValueMemberDef_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ValueMemberDef_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueMemberDef_out &
+-IR::ValueMemberDef_out::operator= (const ::IR::ValueMemberDef_var &p)
++ACE_INLINE IR_ValueMemberDef_out &
++IR_ValueMemberDef_out::operator= (const ::IR_ValueMemberDef_var &p)
+ {
+- this->ptr_ = ::IR::ValueMemberDef::_duplicate (p.ptr ());
++ this->ptr_ = ::IR_ValueMemberDef::_duplicate (p.ptr ());
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueMemberDef_out &
+-IR::ValueMemberDef_out::operator= (ValueMemberDef_ptr p)
++ACE_INLINE IR_ValueMemberDef_out &
++IR_ValueMemberDef_out::operator= (IR_ValueMemberDef_ptr p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueMemberDef_out::operator ::IR::ValueMemberDef_ptr &() // cast
++IR_ValueMemberDef_out::operator ::IR_ValueMemberDef_ptr &() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberDef_ptr &
+-IR::ValueMemberDef_out::ptr (void) // ptr
++ACE_INLINE ::IR_ValueMemberDef_ptr &
++IR_ValueMemberDef_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueMemberDef_ptr
+-IR::ValueMemberDef_out::operator-> (void)
++ACE_INLINE ::IR_ValueMemberDef_ptr
++IR_ValueMemberDef_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::ValueDescription_var
++// Inline operations for class IR_ValueDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueDescription_var::ValueDescription_var (void) // default constructor
++IR_ValueDescription_var::IR_ValueDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ValueDescription_var::ValueDescription_var (ValueDescription *p)
++IR_ValueDescription_var::IR_ValueDescription_var (IR_ValueDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ValueDescription_var::ValueDescription_var (const ::IR::ValueDescription_var &p) // copy constructor
++IR_ValueDescription_var::IR_ValueDescription_var (const ::IR_ValueDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ValueDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ValueDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ValueDescription_var::~ValueDescription_var (void) // destructor
++IR_ValueDescription_var::~IR_ValueDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ValueDescription_var &
+-IR::ValueDescription_var::operator= (ValueDescription *p)
++ACE_INLINE IR_ValueDescription_var &
++IR_ValueDescription_var::operator= (IR_ValueDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ValueDescription_var &
+-IR::ValueDescription_var::operator= (const ::IR::ValueDescription_var &p)
++ACE_INLINE ::IR_ValueDescription_var &
++IR_ValueDescription_var::operator= (const ::IR_ValueDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ValueDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ValueDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ValueDescription *
+-IR::ValueDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_ValueDescription *
++IR_ValueDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDescription *
+-IR::ValueDescription_var::operator-> (void)
++ACE_INLINE ::IR_ValueDescription *
++IR_ValueDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueDescription_var::operator const ::IR::ValueDescription &() const // cast
++IR_ValueDescription_var::operator const ::IR_ValueDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueDescription_var::operator ::IR::ValueDescription &() // cast
++IR_ValueDescription_var::operator ::IR_ValueDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ValueDescription_var::operator ::IR::ValueDescription &() const // cast
++IR_ValueDescription_var::operator ::IR_ValueDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ValueDescription_var::operator ::IR::ValueDescription *&() // cast
++IR_ValueDescription_var::operator ::IR_ValueDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::ValueDescription &
+-IR::ValueDescription_var::in (void) const
++ACE_INLINE const ::IR_ValueDescription &
++IR_ValueDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDescription &
+-IR::ValueDescription_var::inout (void)
++ACE_INLINE ::IR_ValueDescription &
++IR_ValueDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ValueDescription *&
+-IR::ValueDescription_var::out (void)
++ACE_INLINE ::IR_ValueDescription *&
++IR_ValueDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDescription *
+-IR::ValueDescription_var::_retn (void)
++ACE_INLINE ::IR_ValueDescription *
++IR_ValueDescription_var::_retn (void)
+ {
+- ::IR::ValueDescription *tmp = this->ptr_;
++ ::IR_ValueDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ValueDescription *
+-IR::ValueDescription_var::ptr (void) const
++ACE_INLINE ::IR_ValueDescription *
++IR_ValueDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ValueDescription_out
++// Inline operations for class IR_ValueDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ValueDescription_out::ValueDescription_out (::IR::ValueDescription *&p)
++IR_ValueDescription_out::IR_ValueDescription_out (::IR_ValueDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ValueDescription_out::ValueDescription_out (ValueDescription_var &p) // constructor from _var
++IR_ValueDescription_out::IR_ValueDescription_out (IR_ValueDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -18302,175 +17191,175 @@
+ }
+
+ ACE_INLINE
+-IR::ValueDescription_out::ValueDescription_out (const ::IR::ValueDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ValueDescription_out&, p).ptr_)
++IR_ValueDescription_out::IR_ValueDescription_out (const ::IR_ValueDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ValueDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::ValueDescription_out &
+-IR::ValueDescription_out::operator= (const ::IR::ValueDescription_out &p)
++ACE_INLINE IR_ValueDescription_out &
++IR_ValueDescription_out::operator= (const ::IR_ValueDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ValueDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ValueDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ValueDescription_out &
+-IR::ValueDescription_out::operator= (ValueDescription *p)
++ACE_INLINE IR_ValueDescription_out &
++IR_ValueDescription_out::operator= (IR_ValueDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ValueDescription_out::operator ::IR::ValueDescription *&() // cast
++IR_ValueDescription_out::operator ::IR_ValueDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDescription *&
+-IR::ValueDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_ValueDescription *&
++IR_ValueDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ValueDescription *
+-IR::ValueDescription_out::operator-> (void)
++ACE_INLINE ::IR_ValueDescription *
++IR_ValueDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ProvidesDescription_var
++// Inline operations for class IR_ProvidesDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ProvidesDescription_var::ProvidesDescription_var (void) // default constructor
++IR_ProvidesDescription_var::IR_ProvidesDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ProvidesDescription_var::ProvidesDescription_var (ProvidesDescription *p)
++IR_ProvidesDescription_var::IR_ProvidesDescription_var (IR_ProvidesDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ProvidesDescription_var::ProvidesDescription_var (const ::IR::ProvidesDescription_var &p) // copy constructor
++IR_ProvidesDescription_var::IR_ProvidesDescription_var (const ::IR_ProvidesDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ProvidesDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ProvidesDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescription_var::~ProvidesDescription_var (void) // destructor
++IR_ProvidesDescription_var::~IR_ProvidesDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDescription_var &
+-IR::ProvidesDescription_var::operator= (ProvidesDescription *p)
++ACE_INLINE IR_ProvidesDescription_var &
++IR_ProvidesDescription_var::operator= (IR_ProvidesDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescription_var &
+-IR::ProvidesDescription_var::operator= (const ::IR::ProvidesDescription_var &p)
++ACE_INLINE ::IR_ProvidesDescription_var &
++IR_ProvidesDescription_var::operator= (const ::IR_ProvidesDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ProvidesDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ProvidesDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ProvidesDescription *
+-IR::ProvidesDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_ProvidesDescription *
++IR_ProvidesDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescription *
+-IR::ProvidesDescription_var::operator-> (void)
++ACE_INLINE ::IR_ProvidesDescription *
++IR_ProvidesDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescription_var::operator const ::IR::ProvidesDescription &() const // cast
++IR_ProvidesDescription_var::operator const ::IR_ProvidesDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescription_var::operator ::IR::ProvidesDescription &() // cast
++IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescription_var::operator ::IR::ProvidesDescription &() const // cast
++IR_ProvidesDescription_var::operator ::IR_ProvidesDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ProvidesDescription_var::operator ::IR::ProvidesDescription *&() // cast
++IR_ProvidesDescription_var::operator ::IR_ProvidesDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::ProvidesDescription &
+-IR::ProvidesDescription_var::in (void) const
++ACE_INLINE const ::IR_ProvidesDescription &
++IR_ProvidesDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescription &
+-IR::ProvidesDescription_var::inout (void)
++ACE_INLINE ::IR_ProvidesDescription &
++IR_ProvidesDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ProvidesDescription *&
+-IR::ProvidesDescription_var::out (void)
++ACE_INLINE ::IR_ProvidesDescription *&
++IR_ProvidesDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescription *
+-IR::ProvidesDescription_var::_retn (void)
++ACE_INLINE ::IR_ProvidesDescription *
++IR_ProvidesDescription_var::_retn (void)
+ {
+- ::IR::ProvidesDescription *tmp = this->ptr_;
++ ::IR_ProvidesDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescription *
+-IR::ProvidesDescription_var::ptr (void) const
++ACE_INLINE ::IR_ProvidesDescription *
++IR_ProvidesDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ProvidesDescription_out
++// Inline operations for class IR_ProvidesDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ProvidesDescription_out::ProvidesDescription_out (::IR::ProvidesDescription *&p)
++IR_ProvidesDescription_out::IR_ProvidesDescription_out (::IR_ProvidesDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescription_out::ProvidesDescription_out (ProvidesDescription_var &p) // constructor from _var
++IR_ProvidesDescription_out::IR_ProvidesDescription_out (IR_ProvidesDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -18478,175 +17367,175 @@
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescription_out::ProvidesDescription_out (const ::IR::ProvidesDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ProvidesDescription_out&, p).ptr_)
++IR_ProvidesDescription_out::IR_ProvidesDescription_out (const ::IR_ProvidesDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ProvidesDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::ProvidesDescription_out &
+-IR::ProvidesDescription_out::operator= (const ::IR::ProvidesDescription_out &p)
++ACE_INLINE IR_ProvidesDescription_out &
++IR_ProvidesDescription_out::operator= (const ::IR_ProvidesDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ProvidesDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ProvidesDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ProvidesDescription_out &
+-IR::ProvidesDescription_out::operator= (ProvidesDescription *p)
++ACE_INLINE IR_ProvidesDescription_out &
++IR_ProvidesDescription_out::operator= (IR_ProvidesDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescription_out::operator ::IR::ProvidesDescription *&() // cast
++IR_ProvidesDescription_out::operator ::IR_ProvidesDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescription *&
+-IR::ProvidesDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_ProvidesDescription *&
++IR_ProvidesDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescription *
+-IR::ProvidesDescription_out::operator-> (void)
++ACE_INLINE ::IR_ProvidesDescription *
++IR_ProvidesDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::UsesDescription_var
++// Inline operations for class IR_UsesDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UsesDescription_var::UsesDescription_var (void) // default constructor
++IR_UsesDescription_var::IR_UsesDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::UsesDescription_var::UsesDescription_var (UsesDescription *p)
++IR_UsesDescription_var::IR_UsesDescription_var (IR_UsesDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::UsesDescription_var::UsesDescription_var (const ::IR::UsesDescription_var &p) // copy constructor
++IR_UsesDescription_var::IR_UsesDescription_var (const ::IR_UsesDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::UsesDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_UsesDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UsesDescription_var::~UsesDescription_var (void) // destructor
++IR_UsesDescription_var::~IR_UsesDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDescription_var &
+-IR::UsesDescription_var::operator= (UsesDescription *p)
++ACE_INLINE IR_UsesDescription_var &
++IR_UsesDescription_var::operator= (IR_UsesDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::UsesDescription_var &
+-IR::UsesDescription_var::operator= (const ::IR::UsesDescription_var &p)
++ACE_INLINE ::IR_UsesDescription_var &
++IR_UsesDescription_var::operator= (const ::IR_UsesDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::UsesDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_UsesDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::UsesDescription *
+-IR::UsesDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_UsesDescription *
++IR_UsesDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescription *
+-IR::UsesDescription_var::operator-> (void)
++ACE_INLINE ::IR_UsesDescription *
++IR_UsesDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDescription_var::operator const ::IR::UsesDescription &() const // cast
++IR_UsesDescription_var::operator const ::IR_UsesDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDescription_var::operator ::IR::UsesDescription &() // cast
++IR_UsesDescription_var::operator ::IR_UsesDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDescription_var::operator ::IR::UsesDescription &() const // cast
++IR_UsesDescription_var::operator ::IR_UsesDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::UsesDescription_var::operator ::IR::UsesDescription *&() // cast
++IR_UsesDescription_var::operator ::IR_UsesDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::UsesDescription &
+-IR::UsesDescription_var::in (void) const
++ACE_INLINE const ::IR_UsesDescription &
++IR_UsesDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescription &
+-IR::UsesDescription_var::inout (void)
++ACE_INLINE ::IR_UsesDescription &
++IR_UsesDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::UsesDescription *&
+-IR::UsesDescription_var::out (void)
++ACE_INLINE ::IR_UsesDescription *&
++IR_UsesDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescription *
+-IR::UsesDescription_var::_retn (void)
++ACE_INLINE ::IR_UsesDescription *
++IR_UsesDescription_var::_retn (void)
+ {
+- ::IR::UsesDescription *tmp = this->ptr_;
++ ::IR_UsesDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::UsesDescription *
+-IR::UsesDescription_var::ptr (void) const
++ACE_INLINE ::IR_UsesDescription *
++IR_UsesDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::UsesDescription_out
++// Inline operations for class IR_UsesDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UsesDescription_out::UsesDescription_out (::IR::UsesDescription *&p)
++IR_UsesDescription_out::IR_UsesDescription_out (::IR_UsesDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UsesDescription_out::UsesDescription_out (UsesDescription_var &p) // constructor from _var
++IR_UsesDescription_out::IR_UsesDescription_out (IR_UsesDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -18654,93 +17543,89 @@
+ }
+
+ ACE_INLINE
+-IR::UsesDescription_out::UsesDescription_out (const ::IR::UsesDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (UsesDescription_out&, p).ptr_)
++IR_UsesDescription_out::IR_UsesDescription_out (const ::IR_UsesDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_UsesDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::UsesDescription_out &
+-IR::UsesDescription_out::operator= (const ::IR::UsesDescription_out &p)
++ACE_INLINE IR_UsesDescription_out &
++IR_UsesDescription_out::operator= (const ::IR_UsesDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (UsesDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_UsesDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::UsesDescription_out &
+-IR::UsesDescription_out::operator= (UsesDescription *p)
++ACE_INLINE IR_UsesDescription_out &
++IR_UsesDescription_out::operator= (IR_UsesDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UsesDescription_out::operator ::IR::UsesDescription *&() // cast
++IR_UsesDescription_out::operator ::IR_UsesDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescription *&
+-IR::UsesDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_UsesDescription *&
++IR_UsesDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescription *
+-IR::UsesDescription_out::operator-> (void)
++ACE_INLINE ::IR_UsesDescription *
++IR_UsesDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_PROVIDESDESCSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::ProvidesDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_ProvidesDescription *
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::ProvidesDescription *retval = 0;
+- ACE_NEW_RETURN (retval, IR::ProvidesDescription[size], 0);
++ IR_ProvidesDescription *retval = 0;
++ ACE_NEW_RETURN (retval, IR_ProvidesDescription[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR::ProvidesDescription *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (IR_ProvidesDescription *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::ProvidesDescription *data,
++ IR_ProvidesDescription *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::ProvidesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
+- IR::ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_ProvidesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (this->maximum_);
++ IR_ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR_ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -18753,8 +17638,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq &
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_ProvidesDescSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -18765,7 +17650,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::ProvidesDescription *tmp = ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
++ IR_ProvidesDescription *tmp = ACE_reinterpret_cast (IR_ProvidesDescription *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::allocbuf (rhs.maximum_);
+ }
+@@ -18775,8 +17660,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::ProvidesDescription *tmp1 = ACE_reinterpret_cast (IR::ProvidesDescription *, this->buffer_);
+- IR::ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR::ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_ProvidesDescription *tmp1 = ACE_reinterpret_cast (IR_ProvidesDescription *, this->buffer_);
++ IR_ProvidesDescription * const tmp2 = ACE_reinterpret_cast (IR_ProvidesDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -18785,30 +17670,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::ProvidesDescription &
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_ProvidesDescription &
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::ProvidesDescription* tmp = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
++ IR_ProvidesDescription* tmp = ACE_reinterpret_cast(IR_ProvidesDescription*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::ProvidesDescription &
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_ProvidesDescription &
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::ProvidesDescription * const tmp = ACE_reinterpret_cast (IR::ProvidesDescription* ACE_CAST_CONST, this->buffer_);
++ IR_ProvidesDescription * const tmp = ACE_reinterpret_cast (IR_ProvidesDescription* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::ProvidesDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_ProvidesDescription *
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::ProvidesDescription *result = 0;
++ IR_ProvidesDescription *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -18820,7 +17705,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::ProvidesDescription*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_ProvidesDescription*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -18829,7 +17714,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_ProvidesDescription*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -18839,182 +17724,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::ProvidesDescription *
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
++ ACE_INLINE const IR_ProvidesDescription *
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::ProvidesDescription * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_ProvidesDescription * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_ProvidesDescSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::ProvidesDescription *data,
++ IR_ProvidesDescription *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::ProvidesDescription *tmp = ACE_reinterpret_cast(IR::ProvidesDescription*,this->buffer_);
++ IR_ProvidesDescription *tmp = ACE_reinterpret_cast(IR_ProvidesDescription*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_ProvidesDescSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_PROVIDESDESCSEQ_CI_)
+-#define _TAO_IR_PROVIDESDESCSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::ProvidesDescSeq_var
++// Inline operations for class IR_ProvidesDescSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_var::ProvidesDescSeq_var (void) // default constructor
++IR_ProvidesDescSeq_var::IR_ProvidesDescSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_var::ProvidesDescSeq_var (ProvidesDescSeq *p)
++IR_ProvidesDescSeq_var::IR_ProvidesDescSeq_var (IR_ProvidesDescSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_var::ProvidesDescSeq_var (const ::IR::ProvidesDescSeq_var &p) // copy constructor
++IR_ProvidesDescSeq_var::IR_ProvidesDescSeq_var (const ::IR_ProvidesDescSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ProvidesDescSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ProvidesDescSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_var::~ProvidesDescSeq_var (void) // destructor
++IR_ProvidesDescSeq_var::~IR_ProvidesDescSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDescSeq_var &
+-IR::ProvidesDescSeq_var::operator= (ProvidesDescSeq *p)
++ACE_INLINE IR_ProvidesDescSeq_var &
++IR_ProvidesDescSeq_var::operator= (IR_ProvidesDescSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::ProvidesDescSeq_var &
+-IR::ProvidesDescSeq_var::operator= (const ::IR::ProvidesDescSeq_var &p) // deep copy
++ACE_INLINE IR_ProvidesDescSeq_var &
++IR_ProvidesDescSeq_var::operator= (const ::IR_ProvidesDescSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ProvidesDescSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ProvidesDescSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ProvidesDescSeq *
+-IR::ProvidesDescSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_ProvidesDescSeq *
++IR_ProvidesDescSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescSeq *
+-IR::ProvidesDescSeq_var::operator-> (void)
++ACE_INLINE ::IR_ProvidesDescSeq *
++IR_ProvidesDescSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_var::operator const ::IR::ProvidesDescSeq &() const // cast
++IR_ProvidesDescSeq_var::operator const ::IR_ProvidesDescSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq &() // cast
++IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq &() const // cast
++IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ProvidesDescSeq_var::operator ::IR::ProvidesDescSeq *&() // cast
++IR_ProvidesDescSeq_var::operator ::IR_ProvidesDescSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDescription &
+-IR::ProvidesDescSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_ProvidesDescription &
++IR_ProvidesDescSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::ProvidesDescription &
+-IR::ProvidesDescSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_ProvidesDescription &
++IR_ProvidesDescSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::ProvidesDescription &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_ProvidesDescription &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::ProvidesDescSeq &
+-IR::ProvidesDescSeq_var::in (void) const
++ACE_INLINE const ::IR_ProvidesDescSeq &
++IR_ProvidesDescSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescSeq &
+-IR::ProvidesDescSeq_var::inout (void)
++ACE_INLINE ::IR_ProvidesDescSeq &
++IR_ProvidesDescSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ProvidesDescSeq *&
+-IR::ProvidesDescSeq_var::out (void)
++ACE_INLINE ::IR_ProvidesDescSeq *&
++IR_ProvidesDescSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescSeq *
+-IR::ProvidesDescSeq_var::_retn (void)
++ACE_INLINE ::IR_ProvidesDescSeq *
++IR_ProvidesDescSeq_var::_retn (void)
+ {
+- ::IR::ProvidesDescSeq *tmp = this->ptr_;
++ ::IR_ProvidesDescSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescSeq *
+-IR::ProvidesDescSeq_var::ptr (void) const
++ACE_INLINE ::IR_ProvidesDescSeq *
++IR_ProvidesDescSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ProvidesDescSeq_out
++// Inline operations for class IR_ProvidesDescSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_out::ProvidesDescSeq_out (ProvidesDescSeq *&p)
++IR_ProvidesDescSeq_out::IR_ProvidesDescSeq_out (IR_ProvidesDescSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_out::ProvidesDescSeq_out (ProvidesDescSeq_var &p) // constructor from _var
++IR_ProvidesDescSeq_out::IR_ProvidesDescSeq_out (IR_ProvidesDescSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -19022,102 +17901,95 @@
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_out::ProvidesDescSeq_out (const ::IR::ProvidesDescSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ProvidesDescSeq_out&, p).ptr_)
++IR_ProvidesDescSeq_out::IR_ProvidesDescSeq_out (const ::IR_ProvidesDescSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ProvidesDescSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::ProvidesDescSeq_out &
+-IR::ProvidesDescSeq_out::operator= (const ::IR::ProvidesDescSeq_out &p)
++ACE_INLINE ::IR_ProvidesDescSeq_out &
++IR_ProvidesDescSeq_out::operator= (const ::IR_ProvidesDescSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ProvidesDescSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ProvidesDescSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescSeq_out &
+-IR::ProvidesDescSeq_out::operator= (ProvidesDescSeq *p)
++ACE_INLINE ::IR_ProvidesDescSeq_out &
++IR_ProvidesDescSeq_out::operator= (IR_ProvidesDescSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ProvidesDescSeq_out::operator ::IR::ProvidesDescSeq *&() // cast
++IR_ProvidesDescSeq_out::operator ::IR_ProvidesDescSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescSeq *&
+-IR::ProvidesDescSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_ProvidesDescSeq *&
++IR_ProvidesDescSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ProvidesDescSeq *
+-IR::ProvidesDescSeq_out::operator-> (void)
++ACE_INLINE ::IR_ProvidesDescSeq *
++IR_ProvidesDescSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::ProvidesDescription &
+-IR::ProvidesDescSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_ProvidesDescription &
++IR_ProvidesDescSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+
+-#if !defined (_TAO__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_)
+-#define _TAO__TAO_UNBOUNDED_SEQUENCE_IR_USESDESCSEQ_CI_
+-
+ // = Static operations.
+- ACE_INLINE IR::UsesDescription *
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
++ ACE_INLINE IR_UsesDescription *
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (CORBA::ULong size)
+ // Allocate storage for the sequence.
+ {
+- IR::UsesDescription *retval = 0;
+- ACE_NEW_RETURN (retval, IR::UsesDescription[size], 0);
++ IR_UsesDescription *retval = 0;
++ ACE_NEW_RETURN (retval, IR_UsesDescription[size], 0);
+ return retval;
+ }
+
+- ACE_INLINE void IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR::UsesDescription *buffer)
++ ACE_INLINE void IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (IR_UsesDescription *buffer)
+ // Free the sequence.
+ {
+ delete [] buffer;
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (void) // Default constructor.
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum) // Constructor using a maximum length value.
+ : TAO_Unbounded_Base_Sequence (maximum, _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (maximum))
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (CORBA::ULong maximum,
+ CORBA::ULong length,
+- IR::UsesDescription *data,
++ IR_UsesDescription *data,
+ CORBA::Boolean release)
+ : TAO_Unbounded_Base_Sequence (maximum, length, data, release)
+ {
+ }
+
+ ACE_INLINE
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::_TAO_Unbounded_Sequence_IR_UsesDescSeq (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
+ // Copy constructor.
+ : TAO_Unbounded_Base_Sequence (rhs)
+ {
+ if (rhs.buffer_ != 0)
+ {
+- IR::UsesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
+- IR::UsesDescription * const tmp2 = ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_UsesDescription *tmp1 = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (this->maximum_);
++ IR_UsesDescription * const tmp2 = ACE_reinterpret_cast (IR_UsesDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -19130,8 +18002,8 @@
+ }
+ }
+
+- ACE_INLINE IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq &
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
++ ACE_INLINE IR__TAO_Unbounded_Sequence_IR_UsesDescSeq &
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::operator= (const _TAO_Unbounded_Sequence_IR_UsesDescSeq &rhs)
+ // Assignment operator.
+ {
+ if (this == &rhs)
+@@ -19142,7 +18014,7 @@
+ if (this->maximum_ < rhs.maximum_)
+ {
+ // free the old buffer
+- IR::UsesDescription *tmp = ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
++ IR_UsesDescription *tmp = ACE_reinterpret_cast (IR_UsesDescription *, this->buffer_);
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+ this->buffer_ = _TAO_Unbounded_Sequence_IR_UsesDescSeq::allocbuf (rhs.maximum_);
+ }
+@@ -19152,8 +18024,8 @@
+
+ TAO_Unbounded_Base_Sequence::operator= (rhs);
+
+- IR::UsesDescription *tmp1 = ACE_reinterpret_cast (IR::UsesDescription *, this->buffer_);
+- IR::UsesDescription * const tmp2 = ACE_reinterpret_cast (IR::UsesDescription * ACE_CAST_CONST, rhs.buffer_);
++ IR_UsesDescription *tmp1 = ACE_reinterpret_cast (IR_UsesDescription *, this->buffer_);
++ IR_UsesDescription * const tmp2 = ACE_reinterpret_cast (IR_UsesDescription * ACE_CAST_CONST, rhs.buffer_);
+
+ for (CORBA::ULong i = 0; i < this->length_; ++i)
+ tmp1[i] = tmp2[i];
+@@ -19162,30 +18034,30 @@
+ }
+
+ // = Accessors.
+- ACE_INLINE IR::UsesDescription &
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
++ ACE_INLINE IR_UsesDescription &
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i)
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::UsesDescription* tmp = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
++ IR_UsesDescription* tmp = ACE_reinterpret_cast(IR_UsesDescription*,this->buffer_);
+ return tmp[i];
+ }
+
+- ACE_INLINE const IR::UsesDescription &
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
++ ACE_INLINE const IR_UsesDescription &
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::operator[] (CORBA::ULong i) const
+ // operator []
+ {
+ ACE_ASSERT (i < this->maximum_);
+- IR::UsesDescription * const tmp = ACE_reinterpret_cast (IR::UsesDescription* ACE_CAST_CONST, this->buffer_);
++ IR_UsesDescription * const tmp = ACE_reinterpret_cast (IR_UsesDescription* ACE_CAST_CONST, this->buffer_);
+ return tmp[i];
+ }
+
+ // Implement the TAO_Base_Sequence methods (see Sequence.h)
+
+- ACE_INLINE IR::UsesDescription *
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
++ ACE_INLINE IR_UsesDescription *
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (CORBA::Boolean orphan)
+ {
+- IR::UsesDescription *result = 0;
++ IR_UsesDescription *result = 0;
+ if (orphan == 0)
+ {
+ // We retain ownership.
+@@ -19197,7 +18069,7 @@
+ }
+ else
+ {
+- result = ACE_reinterpret_cast (IR::UsesDescription*, this->buffer_);
++ result = ACE_reinterpret_cast (IR_UsesDescription*, this->buffer_);
+ }
+ }
+ else // if (orphan == 1)
+@@ -19206,7 +18078,7 @@
+ {
+ // We set the state back to default and relinquish
+ // ownership.
+- result = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
++ result = ACE_reinterpret_cast(IR_UsesDescription*,this->buffer_);
+ this->maximum_ = 0;
+ this->length_ = 0;
+ this->buffer_ = 0;
+@@ -19216,182 +18088,176 @@
+ return result;
+ }
+
+- ACE_INLINE const IR::UsesDescription *
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
++ ACE_INLINE const IR_UsesDescription *
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::get_buffer (void) const
+ {
+- return ACE_reinterpret_cast(const IR::UsesDescription * ACE_CAST_CONST, this->buffer_);
++ return ACE_reinterpret_cast(const IR_UsesDescription * ACE_CAST_CONST, this->buffer_);
+ }
+
+ ACE_INLINE void
+- IR::_TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
++ IR__TAO_Unbounded_Sequence_IR_UsesDescSeq::replace (CORBA::ULong max,
+ CORBA::ULong length,
+- IR::UsesDescription *data,
++ IR_UsesDescription *data,
+ CORBA::Boolean release)
+ {
+ this->maximum_ = max;
+ this->length_ = length;
+ if (this->buffer_ && this->release_ == 1)
+ {
+- IR::UsesDescription *tmp = ACE_reinterpret_cast(IR::UsesDescription*,this->buffer_);
++ IR_UsesDescription *tmp = ACE_reinterpret_cast(IR_UsesDescription*,this->buffer_);
+ _TAO_Unbounded_Sequence_IR_UsesDescSeq::freebuf (tmp);
+ }
+ this->buffer_ = data;
+ this->release_ = release;
+ }
+
+-#endif /* end #if !defined */
+-
+-
+ #endif /* !TAO_USE_SEQUENCE_TEMPLATES */
+
+-#if !defined (_TAO_IR_USESDESCSEQ_CI_)
+-#define _TAO_IR_USESDESCSEQ_CI_
+-
+ // *************************************************************
+-// Inline operations for class IR::UsesDescSeq_var
++// Inline operations for class IR_UsesDescSeq_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UsesDescSeq_var::UsesDescSeq_var (void) // default constructor
++IR_UsesDescSeq_var::IR_UsesDescSeq_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::UsesDescSeq_var::UsesDescSeq_var (UsesDescSeq *p)
++IR_UsesDescSeq_var::IR_UsesDescSeq_var (IR_UsesDescSeq *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::UsesDescSeq_var::UsesDescSeq_var (const ::IR::UsesDescSeq_var &p) // copy constructor
++IR_UsesDescSeq_var::IR_UsesDescSeq_var (const ::IR_UsesDescSeq_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::UsesDescSeq (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_UsesDescSeq (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UsesDescSeq_var::~UsesDescSeq_var (void) // destructor
++IR_UsesDescSeq_var::~IR_UsesDescSeq_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDescSeq_var &
+-IR::UsesDescSeq_var::operator= (UsesDescSeq *p)
++ACE_INLINE IR_UsesDescSeq_var &
++IR_UsesDescSeq_var::operator= (IR_UsesDescSeq *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE IR::UsesDescSeq_var &
+-IR::UsesDescSeq_var::operator= (const ::IR::UsesDescSeq_var &p) // deep copy
++ACE_INLINE IR_UsesDescSeq_var &
++IR_UsesDescSeq_var::operator= (const ::IR_UsesDescSeq_var &p) // deep copy
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::UsesDescSeq (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_UsesDescSeq (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::UsesDescSeq *
+-IR::UsesDescSeq_var::operator-> (void) const
++ACE_INLINE const ::IR_UsesDescSeq *
++IR_UsesDescSeq_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescSeq *
+-IR::UsesDescSeq_var::operator-> (void)
++ACE_INLINE ::IR_UsesDescSeq *
++IR_UsesDescSeq_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDescSeq_var::operator const ::IR::UsesDescSeq &() const // cast
++IR_UsesDescSeq_var::operator const ::IR_UsesDescSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDescSeq_var::operator ::IR::UsesDescSeq &() // cast
++IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::UsesDescSeq_var::operator ::IR::UsesDescSeq &() const // cast
++IR_UsesDescSeq_var::operator ::IR_UsesDescSeq &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::UsesDescSeq_var::operator ::IR::UsesDescSeq *&() // cast
++IR_UsesDescSeq_var::operator ::IR_UsesDescSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDescription &
+-IR::UsesDescSeq_var::operator[] (CORBA::ULong index)
++ACE_INLINE IR_UsesDescription &
++IR_UsesDescSeq_var::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-ACE_INLINE const IR::UsesDescription &
+-IR::UsesDescSeq_var::operator[] (CORBA::ULong index) const
++ACE_INLINE const IR_UsesDescription &
++IR_UsesDescSeq_var::operator[] (CORBA::ULong index) const
+ {
+- return ACE_const_cast (const IR::UsesDescription &, this->ptr_->operator[] (index));
++ return ACE_const_cast (const IR_UsesDescription &, this->ptr_->operator[] (index));
+ }
+
+-ACE_INLINE const ::IR::UsesDescSeq &
+-IR::UsesDescSeq_var::in (void) const
++ACE_INLINE const ::IR_UsesDescSeq &
++IR_UsesDescSeq_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescSeq &
+-IR::UsesDescSeq_var::inout (void)
++ACE_INLINE ::IR_UsesDescSeq &
++IR_UsesDescSeq_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::UsesDescSeq *&
+-IR::UsesDescSeq_var::out (void)
++ACE_INLINE ::IR_UsesDescSeq *&
++IR_UsesDescSeq_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescSeq *
+-IR::UsesDescSeq_var::_retn (void)
++ACE_INLINE ::IR_UsesDescSeq *
++IR_UsesDescSeq_var::_retn (void)
+ {
+- ::IR::UsesDescSeq *tmp = this->ptr_;
++ ::IR_UsesDescSeq *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::UsesDescSeq *
+-IR::UsesDescSeq_var::ptr (void) const
++ACE_INLINE ::IR_UsesDescSeq *
++IR_UsesDescSeq_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::UsesDescSeq_out
++// Inline operations for class IR_UsesDescSeq_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::UsesDescSeq_out::UsesDescSeq_out (UsesDescSeq *&p)
++IR_UsesDescSeq_out::IR_UsesDescSeq_out (IR_UsesDescSeq *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::UsesDescSeq_out::UsesDescSeq_out (UsesDescSeq_var &p) // constructor from _var
++IR_UsesDescSeq_out::IR_UsesDescSeq_out (IR_UsesDescSeq_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -19399,184 +18265,181 @@
+ }
+
+ ACE_INLINE
+-IR::UsesDescSeq_out::UsesDescSeq_out (const ::IR::UsesDescSeq_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (UsesDescSeq_out&, p).ptr_)
++IR_UsesDescSeq_out::IR_UsesDescSeq_out (const ::IR_UsesDescSeq_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_UsesDescSeq_out&, p).ptr_)
+ {}
+
+-ACE_INLINE ::IR::UsesDescSeq_out &
+-IR::UsesDescSeq_out::operator= (const ::IR::UsesDescSeq_out &p)
++ACE_INLINE ::IR_UsesDescSeq_out &
++IR_UsesDescSeq_out::operator= (const ::IR_UsesDescSeq_out &p)
+ {
+- this->ptr_ = ACE_const_cast (UsesDescSeq_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_UsesDescSeq_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::UsesDescSeq_out &
+-IR::UsesDescSeq_out::operator= (UsesDescSeq *p)
++ACE_INLINE ::IR_UsesDescSeq_out &
++IR_UsesDescSeq_out::operator= (IR_UsesDescSeq *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::UsesDescSeq_out::operator ::IR::UsesDescSeq *&() // cast
++IR_UsesDescSeq_out::operator ::IR_UsesDescSeq *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescSeq *&
+-IR::UsesDescSeq_out::ptr (void) // ptr
++ACE_INLINE ::IR_UsesDescSeq *&
++IR_UsesDescSeq_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::UsesDescSeq *
+-IR::UsesDescSeq_out::operator-> (void)
++ACE_INLINE ::IR_UsesDescSeq *
++IR_UsesDescSeq_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE IR::UsesDescription &
+-IR::UsesDescSeq_out::operator[] (CORBA::ULong index)
++ACE_INLINE IR_UsesDescription &
++IR_UsesDescSeq_out::operator[] (CORBA::ULong index)
+ {
+ return this->ptr_->operator[] (index);
+ }
+
+-
+-#endif /* end #if !defined */
+-
+ // *************************************************************
+-// Inline operations for class IR::EventDescription_var
++// Inline operations for class IR_EventDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EventDescription_var::EventDescription_var (void) // default constructor
++IR_EventDescription_var::IR_EventDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::EventDescription_var::EventDescription_var (EventDescription *p)
++IR_EventDescription_var::IR_EventDescription_var (IR_EventDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::EventDescription_var::EventDescription_var (const ::IR::EventDescription_var &p) // copy constructor
++IR_EventDescription_var::IR_EventDescription_var (const ::IR_EventDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::EventDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_EventDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::EventDescription_var::~EventDescription_var (void) // destructor
++IR_EventDescription_var::~IR_EventDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::EventDescription_var &
+-IR::EventDescription_var::operator= (EventDescription *p)
++ACE_INLINE IR_EventDescription_var &
++IR_EventDescription_var::operator= (IR_EventDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::EventDescription_var &
+-IR::EventDescription_var::operator= (const ::IR::EventDescription_var &p)
++ACE_INLINE ::IR_EventDescription_var &
++IR_EventDescription_var::operator= (const ::IR_EventDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::EventDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_EventDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::EventDescription *
+-IR::EventDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_EventDescription *
++IR_EventDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EventDescription *
+-IR::EventDescription_var::operator-> (void)
++ACE_INLINE ::IR_EventDescription *
++IR_EventDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EventDescription_var::operator const ::IR::EventDescription &() const // cast
++IR_EventDescription_var::operator const ::IR_EventDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EventDescription_var::operator ::IR::EventDescription &() // cast
++IR_EventDescription_var::operator ::IR_EventDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::EventDescription_var::operator ::IR::EventDescription &() const // cast
++IR_EventDescription_var::operator ::IR_EventDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::EventDescription_var::operator ::IR::EventDescription *&() // cast
++IR_EventDescription_var::operator ::IR_EventDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::EventDescription &
+-IR::EventDescription_var::in (void) const
++ACE_INLINE const ::IR_EventDescription &
++IR_EventDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EventDescription &
+-IR::EventDescription_var::inout (void)
++ACE_INLINE ::IR_EventDescription &
++IR_EventDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::EventDescription *&
+-IR::EventDescription_var::out (void)
++ACE_INLINE ::IR_EventDescription *&
++IR_EventDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EventDescription *
+-IR::EventDescription_var::_retn (void)
++ACE_INLINE ::IR_EventDescription *
++IR_EventDescription_var::_retn (void)
+ {
+- ::IR::EventDescription *tmp = this->ptr_;
++ ::IR_EventDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::EventDescription *
+-IR::EventDescription_var::ptr (void) const
++ACE_INLINE ::IR_EventDescription *
++IR_EventDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::EventDescription_out
++// Inline operations for class IR_EventDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::EventDescription_out::EventDescription_out (::IR::EventDescription *&p)
++IR_EventDescription_out::IR_EventDescription_out (::IR_EventDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::EventDescription_out::EventDescription_out (EventDescription_var &p) // constructor from _var
++IR_EventDescription_out::IR_EventDescription_out (IR_EventDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -19584,175 +18447,175 @@
+ }
+
+ ACE_INLINE
+-IR::EventDescription_out::EventDescription_out (const ::IR::EventDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (EventDescription_out&, p).ptr_)
++IR_EventDescription_out::IR_EventDescription_out (const ::IR_EventDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_EventDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::EventDescription_out &
+-IR::EventDescription_out::operator= (const ::IR::EventDescription_out &p)
++ACE_INLINE IR_EventDescription_out &
++IR_EventDescription_out::operator= (const ::IR_EventDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (EventDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_EventDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::EventDescription_out &
+-IR::EventDescription_out::operator= (EventDescription *p)
++ACE_INLINE IR_EventDescription_out &
++IR_EventDescription_out::operator= (IR_EventDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::EventDescription_out::operator ::IR::EventDescription *&() // cast
++IR_EventDescription_out::operator ::IR_EventDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EventDescription *&
+-IR::EventDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_EventDescription *&
++IR_EventDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::EventDescription *
+-IR::EventDescription_out::operator-> (void)
++ACE_INLINE ::IR_EventDescription *
++IR_EventDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ComponentDescription_var
++// Inline operations for class IR_ComponentDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ComponentDescription_var::ComponentDescription_var (void) // default constructor
++IR_ComponentDescription_var::IR_ComponentDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::ComponentDescription_var::ComponentDescription_var (ComponentDescription *p)
++IR_ComponentDescription_var::IR_ComponentDescription_var (IR_ComponentDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::ComponentDescription_var::ComponentDescription_var (const ::IR::ComponentDescription_var &p) // copy constructor
++IR_ComponentDescription_var::IR_ComponentDescription_var (const ::IR_ComponentDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::ComponentDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_ComponentDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ComponentDescription_var::~ComponentDescription_var (void) // destructor
++IR_ComponentDescription_var::~IR_ComponentDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::ComponentDescription_var &
+-IR::ComponentDescription_var::operator= (ComponentDescription *p)
++ACE_INLINE IR_ComponentDescription_var &
++IR_ComponentDescription_var::operator= (IR_ComponentDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::ComponentDescription_var &
+-IR::ComponentDescription_var::operator= (const ::IR::ComponentDescription_var &p)
++ACE_INLINE ::IR_ComponentDescription_var &
++IR_ComponentDescription_var::operator= (const ::IR_ComponentDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::ComponentDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_ComponentDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::ComponentDescription *
+-IR::ComponentDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_ComponentDescription *
++IR_ComponentDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDescription *
+-IR::ComponentDescription_var::operator-> (void)
++ACE_INLINE ::IR_ComponentDescription *
++IR_ComponentDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentDescription_var::operator const ::IR::ComponentDescription &() const // cast
++IR_ComponentDescription_var::operator const ::IR_ComponentDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentDescription_var::operator ::IR::ComponentDescription &() // cast
++IR_ComponentDescription_var::operator ::IR_ComponentDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::ComponentDescription_var::operator ::IR::ComponentDescription &() const // cast
++IR_ComponentDescription_var::operator ::IR_ComponentDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::ComponentDescription_var::operator ::IR::ComponentDescription *&() // cast
++IR_ComponentDescription_var::operator ::IR_ComponentDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::ComponentDescription &
+-IR::ComponentDescription_var::in (void) const
++ACE_INLINE const ::IR_ComponentDescription &
++IR_ComponentDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDescription &
+-IR::ComponentDescription_var::inout (void)
++ACE_INLINE ::IR_ComponentDescription &
++IR_ComponentDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::ComponentDescription *&
+-IR::ComponentDescription_var::out (void)
++ACE_INLINE ::IR_ComponentDescription *&
++IR_ComponentDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDescription *
+-IR::ComponentDescription_var::_retn (void)
++ACE_INLINE ::IR_ComponentDescription *
++IR_ComponentDescription_var::_retn (void)
+ {
+- ::IR::ComponentDescription *tmp = this->ptr_;
++ ::IR_ComponentDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::ComponentDescription *
+-IR::ComponentDescription_var::ptr (void) const
++ACE_INLINE ::IR_ComponentDescription *
++IR_ComponentDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::ComponentDescription_out
++// Inline operations for class IR_ComponentDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::ComponentDescription_out::ComponentDescription_out (::IR::ComponentDescription *&p)
++IR_ComponentDescription_out::IR_ComponentDescription_out (::IR_ComponentDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::ComponentDescription_out::ComponentDescription_out (ComponentDescription_var &p) // constructor from _var
++IR_ComponentDescription_out::IR_ComponentDescription_out (IR_ComponentDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -19760,175 +18623,175 @@
+ }
+
+ ACE_INLINE
+-IR::ComponentDescription_out::ComponentDescription_out (const ::IR::ComponentDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (ComponentDescription_out&, p).ptr_)
++IR_ComponentDescription_out::IR_ComponentDescription_out (const ::IR_ComponentDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_ComponentDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::ComponentDescription_out &
+-IR::ComponentDescription_out::operator= (const ::IR::ComponentDescription_out &p)
++ACE_INLINE IR_ComponentDescription_out &
++IR_ComponentDescription_out::operator= (const ::IR_ComponentDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (ComponentDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_ComponentDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::ComponentDescription_out &
+-IR::ComponentDescription_out::operator= (ComponentDescription *p)
++ACE_INLINE IR_ComponentDescription_out &
++IR_ComponentDescription_out::operator= (IR_ComponentDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::ComponentDescription_out::operator ::IR::ComponentDescription *&() // cast
++IR_ComponentDescription_out::operator ::IR_ComponentDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDescription *&
+-IR::ComponentDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_ComponentDescription *&
++IR_ComponentDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::ComponentDescription *
+-IR::ComponentDescription_out::operator-> (void)
++ACE_INLINE ::IR_ComponentDescription *
++IR_ComponentDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::PrimaryKeyDescription_var
++// Inline operations for class IR_PrimaryKeyDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (void) // default constructor
++IR_PrimaryKeyDescription_var::IR_PrimaryKeyDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (PrimaryKeyDescription *p)
++IR_PrimaryKeyDescription_var::IR_PrimaryKeyDescription_var (IR_PrimaryKeyDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_var::PrimaryKeyDescription_var (const ::IR::PrimaryKeyDescription_var &p) // copy constructor
++IR_PrimaryKeyDescription_var::IR_PrimaryKeyDescription_var (const ::IR_PrimaryKeyDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::PrimaryKeyDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_PrimaryKeyDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_var::~PrimaryKeyDescription_var (void) // destructor
++IR_PrimaryKeyDescription_var::~IR_PrimaryKeyDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDescription_var &
+-IR::PrimaryKeyDescription_var::operator= (PrimaryKeyDescription *p)
++ACE_INLINE IR_PrimaryKeyDescription_var &
++IR_PrimaryKeyDescription_var::operator= (IR_PrimaryKeyDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::PrimaryKeyDescription_var &
+-IR::PrimaryKeyDescription_var::operator= (const ::IR::PrimaryKeyDescription_var &p)
++ACE_INLINE ::IR_PrimaryKeyDescription_var &
++IR_PrimaryKeyDescription_var::operator= (const ::IR_PrimaryKeyDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::PrimaryKeyDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_PrimaryKeyDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::PrimaryKeyDescription *
+-IR::PrimaryKeyDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_PrimaryKeyDescription *
++IR_PrimaryKeyDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PrimaryKeyDescription *
+-IR::PrimaryKeyDescription_var::operator-> (void)
++ACE_INLINE ::IR_PrimaryKeyDescription *
++IR_PrimaryKeyDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_var::operator const ::IR::PrimaryKeyDescription &() const // cast
++IR_PrimaryKeyDescription_var::operator const ::IR_PrimaryKeyDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription &() // cast
++IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription &() const // cast
++IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::PrimaryKeyDescription_var::operator ::IR::PrimaryKeyDescription *&() // cast
++IR_PrimaryKeyDescription_var::operator ::IR_PrimaryKeyDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::PrimaryKeyDescription &
+-IR::PrimaryKeyDescription_var::in (void) const
++ACE_INLINE const ::IR_PrimaryKeyDescription &
++IR_PrimaryKeyDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PrimaryKeyDescription &
+-IR::PrimaryKeyDescription_var::inout (void)
++ACE_INLINE ::IR_PrimaryKeyDescription &
++IR_PrimaryKeyDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::PrimaryKeyDescription *&
+-IR::PrimaryKeyDescription_var::out (void)
++ACE_INLINE ::IR_PrimaryKeyDescription *&
++IR_PrimaryKeyDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PrimaryKeyDescription *
+-IR::PrimaryKeyDescription_var::_retn (void)
++ACE_INLINE ::IR_PrimaryKeyDescription *
++IR_PrimaryKeyDescription_var::_retn (void)
+ {
+- ::IR::PrimaryKeyDescription *tmp = this->ptr_;
++ ::IR_PrimaryKeyDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::PrimaryKeyDescription *
+-IR::PrimaryKeyDescription_var::ptr (void) const
++ACE_INLINE ::IR_PrimaryKeyDescription *
++IR_PrimaryKeyDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::PrimaryKeyDescription_out
++// Inline operations for class IR_PrimaryKeyDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (::IR::PrimaryKeyDescription *&p)
++IR_PrimaryKeyDescription_out::IR_PrimaryKeyDescription_out (::IR_PrimaryKeyDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (PrimaryKeyDescription_var &p) // constructor from _var
++IR_PrimaryKeyDescription_out::IR_PrimaryKeyDescription_out (IR_PrimaryKeyDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -19936,175 +18799,175 @@
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_out::PrimaryKeyDescription_out (const ::IR::PrimaryKeyDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (PrimaryKeyDescription_out&, p).ptr_)
++IR_PrimaryKeyDescription_out::IR_PrimaryKeyDescription_out (const ::IR_PrimaryKeyDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_PrimaryKeyDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::PrimaryKeyDescription_out &
+-IR::PrimaryKeyDescription_out::operator= (const ::IR::PrimaryKeyDescription_out &p)
++ACE_INLINE IR_PrimaryKeyDescription_out &
++IR_PrimaryKeyDescription_out::operator= (const ::IR_PrimaryKeyDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (PrimaryKeyDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_PrimaryKeyDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::PrimaryKeyDescription_out &
+-IR::PrimaryKeyDescription_out::operator= (PrimaryKeyDescription *p)
++ACE_INLINE IR_PrimaryKeyDescription_out &
++IR_PrimaryKeyDescription_out::operator= (IR_PrimaryKeyDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::PrimaryKeyDescription_out::operator ::IR::PrimaryKeyDescription *&() // cast
++IR_PrimaryKeyDescription_out::operator ::IR_PrimaryKeyDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PrimaryKeyDescription *&
+-IR::PrimaryKeyDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_PrimaryKeyDescription *&
++IR_PrimaryKeyDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::PrimaryKeyDescription *
+-IR::PrimaryKeyDescription_out::operator-> (void)
++ACE_INLINE ::IR_PrimaryKeyDescription *
++IR_PrimaryKeyDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::HomeDescription_var
++// Inline operations for class IR_HomeDescription_var
+ // *************************************************************
+
+ ACE_INLINE
+-IR::HomeDescription_var::HomeDescription_var (void) // default constructor
++IR_HomeDescription_var::IR_HomeDescription_var (void) // default constructor
+ : ptr_ (0)
+ {}
+
+ ACE_INLINE
+-IR::HomeDescription_var::HomeDescription_var (HomeDescription *p)
++IR_HomeDescription_var::IR_HomeDescription_var (IR_HomeDescription *p)
+ : ptr_ (p)
+ {}
+
+ ACE_INLINE
+-IR::HomeDescription_var::HomeDescription_var (const ::IR::HomeDescription_var &p) // copy constructor
++IR_HomeDescription_var::IR_HomeDescription_var (const ::IR_HomeDescription_var &p) // copy constructor
+ {
+ if (p.ptr_)
+- ACE_NEW (this->ptr_, ::IR::HomeDescription (*p.ptr_));
++ ACE_NEW (this->ptr_, ::IR_HomeDescription (*p.ptr_));
+ else
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::HomeDescription_var::~HomeDescription_var (void) // destructor
++IR_HomeDescription_var::~IR_HomeDescription_var (void) // destructor
+ {
+ delete this->ptr_;
+ }
+
+-ACE_INLINE IR::HomeDescription_var &
+-IR::HomeDescription_var::operator= (HomeDescription *p)
++ACE_INLINE IR_HomeDescription_var &
++IR_HomeDescription_var::operator= (IR_HomeDescription *p)
+ {
+ delete this->ptr_;
+ this->ptr_ = p;
+ return *this;
+ }
+
+-ACE_INLINE ::IR::HomeDescription_var &
+-IR::HomeDescription_var::operator= (const ::IR::HomeDescription_var &p)
++ACE_INLINE ::IR_HomeDescription_var &
++IR_HomeDescription_var::operator= (const ::IR_HomeDescription_var &p)
+ {
+ if (this != &p)
+ {
+ delete this->ptr_;
+- ACE_NEW_RETURN (this->ptr_, ::IR::HomeDescription (*p.ptr_), *this);
++ ACE_NEW_RETURN (this->ptr_, ::IR_HomeDescription (*p.ptr_), *this);
+ }
+ return *this;
+ }
+
+-ACE_INLINE const ::IR::HomeDescription *
+-IR::HomeDescription_var::operator-> (void) const
++ACE_INLINE const ::IR_HomeDescription *
++IR_HomeDescription_var::operator-> (void) const
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDescription *
+-IR::HomeDescription_var::operator-> (void)
++ACE_INLINE ::IR_HomeDescription *
++IR_HomeDescription_var::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::HomeDescription_var::operator const ::IR::HomeDescription &() const // cast
++IR_HomeDescription_var::operator const ::IR_HomeDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::HomeDescription_var::operator ::IR::HomeDescription &() // cast
++IR_HomeDescription_var::operator ::IR_HomeDescription &() // cast
+ {
+ return *this->ptr_;
+ }
+
+ ACE_INLINE
+-IR::HomeDescription_var::operator ::IR::HomeDescription &() const // cast
++IR_HomeDescription_var::operator ::IR_HomeDescription &() const // cast
+ {
+ return *this->ptr_;
+ }
+
+ // variable-size types only
+ ACE_INLINE
+-IR::HomeDescription_var::operator ::IR::HomeDescription *&() // cast
++IR_HomeDescription_var::operator ::IR_HomeDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE const ::IR::HomeDescription &
+-IR::HomeDescription_var::in (void) const
++ACE_INLINE const ::IR_HomeDescription &
++IR_HomeDescription_var::in (void) const
+ {
+ return *this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDescription &
+-IR::HomeDescription_var::inout (void)
++ACE_INLINE ::IR_HomeDescription &
++IR_HomeDescription_var::inout (void)
+ {
+ return *this->ptr_;
+ }
+
+ // mapping for variable size
+-ACE_INLINE ::IR::HomeDescription *&
+-IR::HomeDescription_var::out (void)
++ACE_INLINE ::IR_HomeDescription *&
++IR_HomeDescription_var::out (void)
+ {
+ delete this->ptr_;
+ this->ptr_ = 0;
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDescription *
+-IR::HomeDescription_var::_retn (void)
++ACE_INLINE ::IR_HomeDescription *
++IR_HomeDescription_var::_retn (void)
+ {
+- ::IR::HomeDescription *tmp = this->ptr_;
++ ::IR_HomeDescription *tmp = this->ptr_;
+ this->ptr_ = 0;
+ return tmp;
+ }
+
+-ACE_INLINE ::IR::HomeDescription *
+-IR::HomeDescription_var::ptr (void) const
++ACE_INLINE ::IR_HomeDescription *
++IR_HomeDescription_var::ptr (void) const
+ {
+ return this->ptr_;
+ }
+
+ // *************************************************************
+-// Inline operations for class IR::HomeDescription_out
++// Inline operations for class IR_HomeDescription_out
+ // *************************************************************
+
+ ACE_INLINE
+-IR::HomeDescription_out::HomeDescription_out (::IR::HomeDescription *&p)
++IR_HomeDescription_out::IR_HomeDescription_out (::IR_HomeDescription *&p)
+ : ptr_ (p)
+ {
+ this->ptr_ = 0;
+ }
+
+ ACE_INLINE
+-IR::HomeDescription_out::HomeDescription_out (HomeDescription_var &p) // constructor from _var
++IR_HomeDescription_out::IR_HomeDescription_out (IR_HomeDescription_var &p) // constructor from _var
+ : ptr_ (p.out ())
+ {
+ delete this->ptr_;
+@@ -20112,56 +18975,56 @@
+ }
+
+ ACE_INLINE
+-IR::HomeDescription_out::HomeDescription_out (const ::IR::HomeDescription_out &p) // copy constructor
+- : ptr_ (ACE_const_cast (HomeDescription_out&, p).ptr_)
++IR_HomeDescription_out::IR_HomeDescription_out (const ::IR_HomeDescription_out &p) // copy constructor
++ : ptr_ (ACE_const_cast (IR_HomeDescription_out&, p).ptr_)
+ {}
+
+-ACE_INLINE IR::HomeDescription_out &
+-IR::HomeDescription_out::operator= (const ::IR::HomeDescription_out &p)
++ACE_INLINE IR_HomeDescription_out &
++IR_HomeDescription_out::operator= (const ::IR_HomeDescription_out &p)
+ {
+- this->ptr_ = ACE_const_cast (HomeDescription_out&, p).ptr_;
++ this->ptr_ = ACE_const_cast (IR_HomeDescription_out&, p).ptr_;
+ return *this;
+ }
+
+-ACE_INLINE IR::HomeDescription_out &
+-IR::HomeDescription_out::operator= (HomeDescription *p)
++ACE_INLINE IR_HomeDescription_out &
++IR_HomeDescription_out::operator= (IR_HomeDescription *p)
+ {
+ this->ptr_ = p;
+ return *this;
+ }
+
+ ACE_INLINE
+-IR::HomeDescription_out::operator ::IR::HomeDescription *&() // cast
++IR_HomeDescription_out::operator ::IR_HomeDescription *&() // cast
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDescription *&
+-IR::HomeDescription_out::ptr (void) // ptr
++ACE_INLINE ::IR_HomeDescription *&
++IR_HomeDescription_out::ptr (void) // ptr
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE ::IR::HomeDescription *
+-IR::HomeDescription_out::operator-> (void)
++ACE_INLINE ::IR_HomeDescription *
++IR_HomeDescription_out::operator-> (void)
+ {
+ return this->ptr_;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::DefinitionKind &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_DefinitionKind &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = _tao_enumval;
+ return strm << _tao_temp;
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::DefinitionKind &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_DefinitionKind &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = 0;
+ CORBA::Boolean _tao_result = strm >> _tao_temp;
+
+ if (_tao_result == 1)
+ {
+- _tao_enumval = ACE_static_cast (IR::DefinitionKind, _tao_temp);
++ _tao_enumval = ACE_static_cast (IR_DefinitionKind, _tao_temp);
+ }
+
+ return _tao_result;
+@@ -20219,45 +19082,45 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::Contained_ptr
++ const IR_Contained_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::Contained_ptr &
++ IR_Contained_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::Repository_ptr
++ const IR_Repository_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::Repository_ptr &
++ IR_Repository_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::Container_ptr
++ const IR_Container_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::Container_ptr &
++ IR_Container_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::Contained_ptr
++ const IR_Contained_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::Contained_ptr &
++ IR_Contained_ptr &
+ );
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Contained::Description &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Contained::Description &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.kind) &&
+@@ -20269,7 +19132,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::Contained::Description &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Contained::Description &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.kind) &&
+@@ -20284,7 +19147,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::Contained_ptr _tao_objref
++ const IR_Contained_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -20294,7 +19157,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::Contained_ptr &_tao_objref
++ IR_Contained_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -20304,7 +19167,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::Contained::_unchecked_narrow (
++ IR_Contained::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -20322,114 +19185,114 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ModuleDef_ptr
++ const IR_ModuleDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ModuleDef_ptr &
++ IR_ModuleDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ConstantDef_ptr
++ const IR_ConstantDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ConstantDef_ptr &
++ IR_ConstantDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::IDLType_ptr
++ const IR_IDLType_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::IDLType_ptr &
++ IR_IDLType_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::StructDef_ptr
++ const IR_StructDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::StructDef_ptr &
++ IR_StructDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::UnionDef_ptr
++ const IR_UnionDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::UnionDef_ptr &
++ IR_UnionDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::EnumDef_ptr
++ const IR_EnumDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::EnumDef_ptr &
++ IR_EnumDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::AliasDef_ptr
++ const IR_AliasDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::AliasDef_ptr &
++ IR_AliasDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::InterfaceDef_ptr
++ const IR_InterfaceDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::InterfaceDef_ptr &
++ IR_InterfaceDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ExceptionDef_ptr
++ const IR_ExceptionDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ExceptionDef_ptr &
++ IR_ExceptionDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::NativeDef_ptr
++ const IR_NativeDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::NativeDef_ptr &
++ IR_NativeDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_InterfaceDefSeq_I_
+ #define _TAO_CDR_OP_IR_InterfaceDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::InterfaceDefSeq &
++ const IR_InterfaceDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::InterfaceDefSeq &
++ IR_InterfaceDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_InterfaceDefSeq_I_ */
+@@ -20437,24 +19300,24 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueDef_ptr
++ const IR_ValueDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ValueDef_ptr &
++ IR_ValueDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_ValueDefSeq_I_
+ #define _TAO_CDR_OP_IR_ValueDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueDefSeq &
++ const IR_ValueDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ValueDefSeq &
++ IR_ValueDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ValueDefSeq_I_ */
+@@ -20462,34 +19325,34 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueBoxDef_ptr
++ const IR_ValueBoxDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ValueBoxDef_ptr &
++ IR_ValueBoxDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ComponentDef_ptr
++ const IR_ComponentDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ComponentDef_ptr &
++ IR_ComponentDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_ComponentDefSeq_I_
+ #define _TAO_CDR_OP_IR_ComponentDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ComponentDefSeq &
++ const IR_ComponentDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ComponentDefSeq &
++ IR_ComponentDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ComponentDefSeq_I_ */
+@@ -20497,24 +19360,24 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ProvidesDef_ptr
++ const IR_ProvidesDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ProvidesDef_ptr &
++ IR_ProvidesDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_ProvidesDefSeq_I_
+ #define _TAO_CDR_OP_IR_ProvidesDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ProvidesDefSeq &
++ const IR_ProvidesDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ProvidesDefSeq &
++ IR_ProvidesDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ProvidesDefSeq_I_ */
+@@ -20522,24 +19385,24 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::UsesDef_ptr
++ const IR_UsesDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::UsesDef_ptr &
++ IR_UsesDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_UsesDefSeq_I_
+ #define _TAO_CDR_OP_IR_UsesDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::UsesDefSeq &
++ const IR_UsesDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::UsesDefSeq &
++ IR_UsesDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_UsesDefSeq_I_ */
+@@ -20547,24 +19410,24 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::HomeDef_ptr
++ const IR_HomeDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::HomeDef_ptr &
++ IR_HomeDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_HomeDefSeq_I_
+ #define _TAO_CDR_OP_IR_HomeDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::HomeDefSeq &
++ const IR_HomeDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::HomeDefSeq &
++ IR_HomeDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_HomeDefSeq_I_ */
+@@ -20572,34 +19435,34 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::EventDef_ptr
++ const IR_EventDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::EventDef_ptr &
++ IR_EventDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::EmitsDef_ptr
++ const IR_EmitsDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::EmitsDef_ptr &
++ IR_EmitsDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_EmitsDefSeq_I_
+ #define _TAO_CDR_OP_IR_EmitsDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::EmitsDefSeq &
++ const IR_EmitsDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::EmitsDefSeq &
++ IR_EmitsDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_EmitsDefSeq_I_ */
+@@ -20607,24 +19470,24 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::PublishesDef_ptr
++ const IR_PublishesDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::PublishesDef_ptr &
++ IR_PublishesDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_PublishesDefSeq_I_
+ #define _TAO_CDR_OP_IR_PublishesDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::PublishesDefSeq &
++ const IR_PublishesDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::PublishesDefSeq &
++ IR_PublishesDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_PublishesDefSeq_I_ */
+@@ -20632,24 +19495,24 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ConsumesDef_ptr
++ const IR_ConsumesDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ConsumesDef_ptr &
++ IR_ConsumesDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_ConsumesDefSeq_I_
+ #define _TAO_CDR_OP_IR_ConsumesDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ConsumesDefSeq &
++ const IR_ConsumesDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ConsumesDefSeq &
++ IR_ConsumesDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ConsumesDefSeq_I_ */
+@@ -20657,24 +19520,24 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::FactoryDef_ptr
++ const IR_FactoryDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::FactoryDef_ptr &
++ IR_FactoryDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_FactoryDefSeq_I_
+ #define _TAO_CDR_OP_IR_FactoryDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::FactoryDefSeq &
++ const IR_FactoryDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::FactoryDefSeq &
++ IR_FactoryDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_FactoryDefSeq_I_ */
+@@ -20682,24 +19545,24 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::FinderDef_ptr
++ const IR_FinderDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::FinderDef_ptr &
++ IR_FinderDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_FinderDefSeq_I_
+ #define _TAO_CDR_OP_IR_FinderDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::FinderDefSeq &
++ const IR_FinderDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::FinderDefSeq &
++ IR_FinderDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_FinderDefSeq_I_ */
+@@ -20707,29 +19570,29 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::PrimaryKeyDef_ptr
++ const IR_PrimaryKeyDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::PrimaryKeyDef_ptr &
++ IR_PrimaryKeyDef_ptr &
+ );
+
+ #if !defined _TAO_CDR_OP_IR_ContainedSeq_I_
+ #define _TAO_CDR_OP_IR_ContainedSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ContainedSeq &
++ const IR_ContainedSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ContainedSeq &
++ IR_ContainedSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ContainedSeq_I_ */
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::StructMember &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_StructMember &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -20742,7 +19605,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::StructMember &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_StructMember &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -20759,18 +19622,18 @@
+ #if !defined _TAO_CDR_OP_IR_StructMemberSeq_I_
+ #define _TAO_CDR_OP_IR_StructMemberSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::StructMemberSeq &
++ const IR_StructMemberSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::StructMemberSeq &
++ IR_StructMemberSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_StructMemberSeq_I_ */
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Initializer &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Initializer &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.members) &&
+@@ -20782,7 +19645,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::Initializer &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Initializer &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.members) &&
+@@ -20798,18 +19661,18 @@
+ #if !defined _TAO_CDR_OP_IR_InitializerSeq_I_
+ #define _TAO_CDR_OP_IR_InitializerSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::InitializerSeq &
++ const IR_InitializerSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::InitializerSeq &
++ IR_InitializerSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_InitializerSeq_I_ */
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::UnionMember &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UnionMember &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -20823,7 +19686,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::UnionMember &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UnionMember &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -20841,13 +19704,13 @@
+ #if !defined _TAO_CDR_OP_IR_UnionMemberSeq_I_
+ #define _TAO_CDR_OP_IR_UnionMemberSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::UnionMemberSeq &
++ const IR_UnionMemberSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::UnionMemberSeq &
++ IR_UnionMemberSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_UnionMemberSeq_I_ */
+@@ -20856,13 +19719,13 @@
+ #if !defined _TAO_CDR_OP_IR_EnumMemberSeq_I_
+ #define _TAO_CDR_OP_IR_EnumMemberSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::EnumMemberSeq &
++ const IR_EnumMemberSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::EnumMemberSeq &
++ IR_EnumMemberSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_EnumMemberSeq_I_ */
+@@ -20870,15 +19733,15 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::Container_ptr
++ const IR_Container_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::Container_ptr &
++ IR_Container_ptr &
+ );
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::Container::Description &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_Container::Description &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.contained_object.in ()) &&
+@@ -20891,7 +19754,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::Container::Description &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_Container::Description &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.contained_object.out ()) &&
+@@ -20908,13 +19771,13 @@
+ #if !defined _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
+ #define _TAO_CDR_OP_IR_Container_DescriptionSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::Container::DescriptionSeq &
++ const IR_Container::DescriptionSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::Container::DescriptionSeq &
++ IR_Container::DescriptionSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_Container_DescriptionSeq_I_ */
+@@ -20922,7 +19785,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::Container_ptr _tao_objref
++ const IR_Container_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -20932,7 +19795,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::Container_ptr &_tao_objref
++ IR_Container_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -20942,7 +19805,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::Container::_unchecked_narrow (
++ IR_Container::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -20960,18 +19823,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::IDLType_ptr
++ const IR_IDLType_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::IDLType_ptr &
++ IR_IDLType_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::IDLType_ptr _tao_objref
++ const IR_IDLType_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -20981,7 +19844,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::IDLType_ptr &_tao_objref
++ IR_IDLType_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -20991,7 +19854,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::IDLType::_unchecked_narrow (
++ IR_IDLType::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21009,77 +19872,77 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::PrimitiveDef_ptr
++ const IR_PrimitiveDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::PrimitiveDef_ptr &
++ IR_PrimitiveDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::StringDef_ptr
++ const IR_StringDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::StringDef_ptr &
++ IR_StringDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::SequenceDef_ptr
++ const IR_SequenceDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::SequenceDef_ptr &
++ IR_SequenceDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ArrayDef_ptr
++ const IR_ArrayDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ArrayDef_ptr &
++ IR_ArrayDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::WstringDef_ptr
++ const IR_WstringDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::WstringDef_ptr &
++ IR_WstringDef_ptr &
+ );
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::FixedDef_ptr
++ const IR_FixedDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::FixedDef_ptr &
++ IR_FixedDef_ptr &
+ );
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::PrimitiveKind &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_PrimitiveKind &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = _tao_enumval;
+ return strm << _tao_temp;
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::PrimitiveKind &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimitiveKind &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = 0;
+ CORBA::Boolean _tao_result = strm >> _tao_temp;
+
+ if (_tao_result == 1)
+ {
+- _tao_enumval = ACE_static_cast (IR::PrimitiveKind, _tao_temp);
++ _tao_enumval = ACE_static_cast (IR_PrimitiveKind, _tao_temp);
+ }
+
+ return _tao_result;
+@@ -21088,18 +19951,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::Repository_ptr
++ const IR_Repository_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::Repository_ptr &
++ IR_Repository_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::Repository_ptr _tao_objref
++ const IR_Repository_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21109,7 +19972,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::Repository_ptr &_tao_objref
++ IR_Repository_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21119,7 +19982,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::Repository::_unchecked_narrow (
++ IR_Repository::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21137,18 +20000,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ComponentRepository_ptr
++ const IR_ComponentRepository_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ComponentRepository_ptr &
++ IR_ComponentRepository_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ComponentRepository_ptr _tao_objref
++ const IR_ComponentRepository_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21158,7 +20021,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ComponentRepository_ptr &_tao_objref
++ IR_ComponentRepository_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21168,7 +20031,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ComponentRepository::_unchecked_narrow (
++ IR_ComponentRepository::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21186,18 +20049,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ModuleDef_ptr
++ const IR_ModuleDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ModuleDef_ptr &
++ IR_ModuleDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ModuleDef_ptr _tao_objref
++ const IR_ModuleDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21207,7 +20070,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ModuleDef_ptr &_tao_objref
++ IR_ModuleDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21217,7 +20080,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ModuleDef::_unchecked_narrow (
++ IR_ModuleDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21232,7 +20095,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ModuleDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ModuleDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -21246,7 +20109,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ModuleDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ModuleDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -21263,18 +20126,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ConstantDef_ptr
++ const IR_ConstantDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ConstantDef_ptr &
++ IR_ConstantDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ConstantDef_ptr _tao_objref
++ const IR_ConstantDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21284,7 +20147,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ConstantDef_ptr &_tao_objref
++ IR_ConstantDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21294,7 +20157,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ConstantDef::_unchecked_narrow (
++ IR_ConstantDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21309,7 +20172,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ConstantDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ConstantDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -21325,7 +20188,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ConstantDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ConstantDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -21344,18 +20207,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::TypedefDef_ptr
++ const IR_TypedefDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::TypedefDef_ptr &
++ IR_TypedefDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::TypedefDef_ptr _tao_objref
++ const IR_TypedefDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21365,7 +20228,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::TypedefDef_ptr &_tao_objref
++ IR_TypedefDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21375,7 +20238,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::TypedefDef::_unchecked_narrow (
++ IR_TypedefDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21390,7 +20253,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::TypeDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_TypeDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -21405,7 +20268,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::TypeDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_TypeDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -21423,18 +20286,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::StructDef_ptr
++ const IR_StructDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::StructDef_ptr &
++ IR_StructDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::StructDef_ptr _tao_objref
++ const IR_StructDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21444,7 +20307,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::StructDef_ptr &_tao_objref
++ IR_StructDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21454,7 +20317,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::StructDef::_unchecked_narrow (
++ IR_StructDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21472,18 +20335,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::UnionDef_ptr
++ const IR_UnionDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::UnionDef_ptr &
++ IR_UnionDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::UnionDef_ptr _tao_objref
++ const IR_UnionDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21493,7 +20356,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::UnionDef_ptr &_tao_objref
++ IR_UnionDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21503,7 +20366,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::UnionDef::_unchecked_narrow (
++ IR_UnionDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21521,18 +20384,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::EnumDef_ptr
++ const IR_EnumDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::EnumDef_ptr &
++ IR_EnumDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::EnumDef_ptr _tao_objref
++ const IR_EnumDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21542,7 +20405,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::EnumDef_ptr &_tao_objref
++ IR_EnumDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21552,7 +20415,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::EnumDef::_unchecked_narrow (
++ IR_EnumDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21570,18 +20433,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::AliasDef_ptr
++ const IR_AliasDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::AliasDef_ptr &
++ IR_AliasDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::AliasDef_ptr _tao_objref
++ const IR_AliasDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21591,7 +20454,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::AliasDef_ptr &_tao_objref
++ IR_AliasDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21601,7 +20464,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::AliasDef::_unchecked_narrow (
++ IR_AliasDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21619,18 +20482,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::NativeDef_ptr
++ const IR_NativeDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::NativeDef_ptr &
++ IR_NativeDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::NativeDef_ptr _tao_objref
++ const IR_NativeDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21640,7 +20503,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::NativeDef_ptr &_tao_objref
++ IR_NativeDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21650,7 +20513,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::NativeDef::_unchecked_narrow (
++ IR_NativeDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21668,18 +20531,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::PrimitiveDef_ptr
++ const IR_PrimitiveDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::PrimitiveDef_ptr &
++ IR_PrimitiveDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::PrimitiveDef_ptr _tao_objref
++ const IR_PrimitiveDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21689,7 +20552,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::PrimitiveDef_ptr &_tao_objref
++ IR_PrimitiveDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21699,7 +20562,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::PrimitiveDef::_unchecked_narrow (
++ IR_PrimitiveDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21717,18 +20580,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::StringDef_ptr
++ const IR_StringDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::StringDef_ptr &
++ IR_StringDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::StringDef_ptr _tao_objref
++ const IR_StringDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21738,7 +20601,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::StringDef_ptr &_tao_objref
++ IR_StringDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21748,7 +20611,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::StringDef::_unchecked_narrow (
++ IR_StringDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21766,18 +20629,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::WstringDef_ptr
++ const IR_WstringDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::WstringDef_ptr &
++ IR_WstringDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::WstringDef_ptr _tao_objref
++ const IR_WstringDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21787,7 +20650,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::WstringDef_ptr &_tao_objref
++ IR_WstringDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21797,7 +20660,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::WstringDef::_unchecked_narrow (
++ IR_WstringDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21815,18 +20678,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::FixedDef_ptr
++ const IR_FixedDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::FixedDef_ptr &
++ IR_FixedDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::FixedDef_ptr _tao_objref
++ const IR_FixedDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21836,7 +20699,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::FixedDef_ptr &_tao_objref
++ IR_FixedDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21846,7 +20709,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::FixedDef::_unchecked_narrow (
++ IR_FixedDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21864,18 +20727,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::SequenceDef_ptr
++ const IR_SequenceDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::SequenceDef_ptr &
++ IR_SequenceDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::SequenceDef_ptr _tao_objref
++ const IR_SequenceDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21885,7 +20748,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::SequenceDef_ptr &_tao_objref
++ IR_SequenceDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21895,7 +20758,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::SequenceDef::_unchecked_narrow (
++ IR_SequenceDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21913,18 +20776,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ArrayDef_ptr
++ const IR_ArrayDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ArrayDef_ptr &
++ IR_ArrayDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ArrayDef_ptr _tao_objref
++ const IR_ArrayDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21934,7 +20797,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ArrayDef_ptr &_tao_objref
++ IR_ArrayDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21944,7 +20807,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ArrayDef::_unchecked_narrow (
++ IR_ArrayDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -21962,18 +20825,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ExceptionDef_ptr
++ const IR_ExceptionDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ExceptionDef_ptr &
++ IR_ExceptionDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ExceptionDef_ptr _tao_objref
++ const IR_ExceptionDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -21983,7 +20846,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ExceptionDef_ptr &_tao_objref
++ IR_ExceptionDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -21993,7 +20856,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ExceptionDef::_unchecked_narrow (
++ IR_ExceptionDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22008,7 +20871,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ExceptionDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ExceptionDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22023,7 +20886,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ExceptionDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ExceptionDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22042,13 +20905,13 @@
+ #if !defined _TAO_CDR_OP_IR_ExceptionDefSeq_I_
+ #define _TAO_CDR_OP_IR_ExceptionDefSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ExceptionDefSeq &
++ const IR_ExceptionDefSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ExceptionDefSeq &
++ IR_ExceptionDefSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ExceptionDefSeq_I_ */
+@@ -22057,31 +20920,31 @@
+ #if !defined _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
+ #define _TAO_CDR_OP_IR_ExcDescriptionSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ExcDescriptionSeq &
++ const IR_ExcDescriptionSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ExcDescriptionSeq &
++ IR_ExcDescriptionSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ExcDescriptionSeq_I_ */
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::AttributeMode &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_AttributeMode &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = _tao_enumval;
+ return strm << _tao_temp;
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::AttributeMode &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeMode &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = 0;
+ CORBA::Boolean _tao_result = strm >> _tao_temp;
+
+ if (_tao_result == 1)
+ {
+- _tao_enumval = ACE_static_cast (IR::AttributeMode, _tao_temp);
++ _tao_enumval = ACE_static_cast (IR_AttributeMode, _tao_temp);
+ }
+
+ return _tao_result;
+@@ -22090,18 +20953,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::AttributeDef_ptr
++ const IR_AttributeDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::AttributeDef_ptr &
++ IR_AttributeDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::AttributeDef_ptr _tao_objref
++ const IR_AttributeDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22111,7 +20974,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::AttributeDef_ptr &_tao_objref
++ IR_AttributeDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22121,7 +20984,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::AttributeDef::_unchecked_narrow (
++ IR_AttributeDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22136,7 +20999,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::AttributeDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_AttributeDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22154,7 +21017,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::AttributeDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_AttributeDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22172,45 +21035,45 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::OperationMode &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_OperationMode &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = _tao_enumval;
+ return strm << _tao_temp;
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::OperationMode &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationMode &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = 0;
+ CORBA::Boolean _tao_result = strm >> _tao_temp;
+
+ if (_tao_result == 1)
+ {
+- _tao_enumval = ACE_static_cast (IR::OperationMode, _tao_temp);
++ _tao_enumval = ACE_static_cast (IR_OperationMode, _tao_temp);
+ }
+
+ return _tao_result;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ParameterMode &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ParameterMode &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = _tao_enumval;
+ return strm << _tao_temp;
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ParameterMode &_tao_enumval)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterMode &_tao_enumval)
+ {
+ CORBA::ULong _tao_temp = 0;
+ CORBA::Boolean _tao_result = strm >> _tao_temp;
+
+ if (_tao_result == 1)
+ {
+- _tao_enumval = ACE_static_cast (IR::ParameterMode, _tao_temp);
++ _tao_enumval = ACE_static_cast (IR_ParameterMode, _tao_temp);
+ }
+
+ return _tao_result;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ParameterDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ParameterDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22224,7 +21087,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ParameterDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ParameterDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22242,13 +21105,13 @@
+ #if !defined _TAO_CDR_OP_IR_ParDescriptionSeq_I_
+ #define _TAO_CDR_OP_IR_ParDescriptionSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ParDescriptionSeq &
++ const IR_ParDescriptionSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ParDescriptionSeq &
++ IR_ParDescriptionSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ParDescriptionSeq_I_ */
+@@ -22257,13 +21120,13 @@
+ #if !defined _TAO_CDR_OP_IR_ContextIdSeq_I_
+ #define _TAO_CDR_OP_IR_ContextIdSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ContextIdSeq &
++ const IR_ContextIdSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ContextIdSeq &
++ IR_ContextIdSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ContextIdSeq_I_ */
+@@ -22271,18 +21134,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::OperationDef_ptr
++ const IR_OperationDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::OperationDef_ptr &
++ IR_OperationDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::OperationDef_ptr _tao_objref
++ const IR_OperationDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22292,7 +21155,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::OperationDef_ptr &_tao_objref
++ IR_OperationDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22302,7 +21165,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::OperationDef::_unchecked_narrow (
++ IR_OperationDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22317,7 +21180,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::OperationDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_OperationDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22336,7 +21199,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::OperationDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_OperationDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22359,13 +21222,13 @@
+ #if !defined _TAO_CDR_OP_IR_RepositoryIdSeq_I_
+ #define _TAO_CDR_OP_IR_RepositoryIdSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::RepositoryIdSeq &
++ const IR_RepositoryIdSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::RepositoryIdSeq &
++ IR_RepositoryIdSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_RepositoryIdSeq_I_ */
+@@ -22374,13 +21237,13 @@
+ #if !defined _TAO_CDR_OP_IR_OpDescriptionSeq_I_
+ #define _TAO_CDR_OP_IR_OpDescriptionSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::OpDescriptionSeq &
++ const IR_OpDescriptionSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::OpDescriptionSeq &
++ IR_OpDescriptionSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_OpDescriptionSeq_I_ */
+@@ -22389,13 +21252,13 @@
+ #if !defined _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
+ #define _TAO_CDR_OP_IR_AttrDescriptionSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::AttrDescriptionSeq &
++ const IR_AttrDescriptionSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::AttrDescriptionSeq &
++ IR_AttrDescriptionSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_AttrDescriptionSeq_I_ */
+@@ -22403,18 +21266,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::InterfaceDef_ptr
++ const IR_InterfaceDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::InterfaceDef_ptr &
++ IR_InterfaceDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::InterfaceDef_ptr _tao_objref
++ const IR_InterfaceDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22424,7 +21287,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::InterfaceDef_ptr &_tao_objref
++ IR_InterfaceDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22434,7 +21297,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::InterfaceDef::_unchecked_narrow (
++ IR_InterfaceDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22449,7 +21312,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::InterfaceDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_InterfaceDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22469,7 +21332,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::InterfaceDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_InterfaceDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22489,7 +21352,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ValueMember &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueMember &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22506,7 +21369,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ValueMember &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueMember &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22527,13 +21390,13 @@
+ #if !defined _TAO_CDR_OP_IR_ValueMemberSeq_I_
+ #define _TAO_CDR_OP_IR_ValueMemberSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueMemberSeq &
++ const IR_ValueMemberSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ValueMemberSeq &
++ IR_ValueMemberSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ValueMemberSeq_I_ */
+@@ -22541,18 +21404,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueMemberDef_ptr
++ const IR_ValueMemberDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ValueMemberDef_ptr &
++ IR_ValueMemberDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ValueMemberDef_ptr _tao_objref
++ const IR_ValueMemberDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22562,7 +21425,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ValueMemberDef_ptr &_tao_objref
++ IR_ValueMemberDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22572,7 +21435,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ValueMemberDef::_unchecked_narrow (
++ IR_ValueMemberDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22590,18 +21453,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueDef_ptr
++ const IR_ValueDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ValueDef_ptr &
++ IR_ValueDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ValueDef_ptr _tao_objref
++ const IR_ValueDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22611,7 +21474,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ValueDef_ptr &_tao_objref
++ IR_ValueDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22621,7 +21484,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ValueDef::_unchecked_narrow (
++ IR_ValueDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22636,7 +21499,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ValueDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ValueDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22661,7 +21524,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ValueDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ValueDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22689,18 +21552,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ValueBoxDef_ptr
++ const IR_ValueBoxDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ValueBoxDef_ptr &
++ IR_ValueBoxDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ValueBoxDef_ptr _tao_objref
++ const IR_ValueBoxDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22710,7 +21573,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ValueBoxDef_ptr &_tao_objref
++ IR_ValueBoxDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22720,7 +21583,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ValueBoxDef::_unchecked_narrow (
++ IR_ValueBoxDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22738,18 +21601,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ProvidesDef_ptr
++ const IR_ProvidesDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ProvidesDef_ptr &
++ IR_ProvidesDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ProvidesDef_ptr _tao_objref
++ const IR_ProvidesDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22759,7 +21622,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ProvidesDef_ptr &_tao_objref
++ IR_ProvidesDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22769,7 +21632,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ProvidesDef::_unchecked_narrow (
++ IR_ProvidesDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22784,7 +21647,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ProvidesDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ProvidesDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22799,7 +21662,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ProvidesDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ProvidesDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22817,18 +21680,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::UsesDef_ptr
++ const IR_UsesDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::UsesDef_ptr &
++ IR_UsesDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::UsesDef_ptr _tao_objref
++ const IR_UsesDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22838,7 +21701,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::UsesDef_ptr &_tao_objref
++ IR_UsesDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22848,7 +21711,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::UsesDef::_unchecked_narrow (
++ IR_UsesDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22863,7 +21726,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::UsesDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_UsesDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22879,7 +21742,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::UsesDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_UsesDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -22899,13 +21762,13 @@
+ #if !defined _TAO_CDR_OP_IR_ProvidesDescSeq_I_
+ #define _TAO_CDR_OP_IR_ProvidesDescSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::ProvidesDescSeq &
++ const IR_ProvidesDescSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::ProvidesDescSeq &
++ IR_ProvidesDescSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_ProvidesDescSeq_I_ */
+@@ -22914,13 +21777,13 @@
+ #if !defined _TAO_CDR_OP_IR_UsesDescSeq_I_
+ #define _TAO_CDR_OP_IR_UsesDescSeq_I_
+
+-CORBA::Boolean TAO_Export operator<< (
++CORBA::Boolean operator<< (
+ TAO_OutputCDR &,
+- const IR::UsesDescSeq &
++ const IR_UsesDescSeq &
+ );
+-CORBA::Boolean TAO_Export operator>> (
++CORBA::Boolean operator>> (
+ TAO_InputCDR &,
+- IR::UsesDescSeq &
++ IR_UsesDescSeq &
+ );
+
+ #endif /* _TAO_CDR_OP_IR_UsesDescSeq_I_ */
+@@ -22928,18 +21791,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::EventDef_ptr
++ const IR_EventDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::EventDef_ptr &
++ IR_EventDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::EventDef_ptr _tao_objref
++ const IR_EventDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -22949,7 +21812,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::EventDef_ptr &_tao_objref
++ IR_EventDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -22959,7 +21822,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::EventDef::_unchecked_narrow (
++ IR_EventDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -22974,7 +21837,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::EventDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_EventDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -22989,7 +21852,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::EventDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_EventDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -23007,18 +21870,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::EmitsDef_ptr
++ const IR_EmitsDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::EmitsDef_ptr &
++ IR_EmitsDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::EmitsDef_ptr _tao_objref
++ const IR_EmitsDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -23028,7 +21891,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::EmitsDef_ptr &_tao_objref
++ IR_EmitsDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -23038,7 +21901,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::EmitsDef::_unchecked_narrow (
++ IR_EmitsDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -23056,18 +21919,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::PublishesDef_ptr
++ const IR_PublishesDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::PublishesDef_ptr &
++ IR_PublishesDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::PublishesDef_ptr _tao_objref
++ const IR_PublishesDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -23077,7 +21940,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::PublishesDef_ptr &_tao_objref
++ IR_PublishesDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -23087,7 +21950,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::PublishesDef::_unchecked_narrow (
++ IR_PublishesDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -23105,18 +21968,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ConsumesDef_ptr
++ const IR_ConsumesDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ConsumesDef_ptr &
++ IR_ConsumesDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ConsumesDef_ptr _tao_objref
++ const IR_ConsumesDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -23126,7 +21989,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ConsumesDef_ptr &_tao_objref
++ IR_ConsumesDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -23136,7 +21999,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ConsumesDef::_unchecked_narrow (
++ IR_ConsumesDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -23154,18 +22017,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::ComponentDef_ptr
++ const IR_ComponentDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::ComponentDef_ptr &
++ IR_ComponentDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::ComponentDef_ptr _tao_objref
++ const IR_ComponentDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -23175,7 +22038,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::ComponentDef_ptr &_tao_objref
++ IR_ComponentDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -23185,7 +22048,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::ComponentDef::_unchecked_narrow (
++ IR_ComponentDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -23200,7 +22063,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::ComponentDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_ComponentDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -23223,7 +22086,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::ComponentDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_ComponentDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -23249,18 +22112,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::PrimaryKeyDef_ptr
++ const IR_PrimaryKeyDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::PrimaryKeyDef_ptr &
++ IR_PrimaryKeyDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::PrimaryKeyDef_ptr _tao_objref
++ const IR_PrimaryKeyDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -23270,7 +22133,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::PrimaryKeyDef_ptr &_tao_objref
++ IR_PrimaryKeyDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -23280,7 +22143,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::PrimaryKeyDef::_unchecked_narrow (
++ IR_PrimaryKeyDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -23295,7 +22158,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::PrimaryKeyDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_PrimaryKeyDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -23310,7 +22173,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::PrimaryKeyDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_PrimaryKeyDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
+@@ -23328,18 +22191,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::FactoryDef_ptr
++ const IR_FactoryDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::FactoryDef_ptr &
++ IR_FactoryDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::FactoryDef_ptr _tao_objref
++ const IR_FactoryDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -23349,7 +22212,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::FactoryDef_ptr &_tao_objref
++ IR_FactoryDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -23359,7 +22222,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::FactoryDef::_unchecked_narrow (
++ IR_FactoryDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -23377,18 +22240,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::FinderDef_ptr
++ const IR_FinderDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::FinderDef_ptr &
++ IR_FinderDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::FinderDef_ptr _tao_objref
++ const IR_FinderDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -23398,7 +22261,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::FinderDef_ptr &_tao_objref
++ IR_FinderDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -23408,7 +22271,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::FinderDef::_unchecked_narrow (
++ IR_FinderDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -23426,18 +22289,18 @@
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &,
+- const IR::HomeDef_ptr
++ const IR_HomeDef_ptr
+ );
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &,
+- IR::HomeDef_ptr &
++ IR_HomeDef_ptr &
+ );
+
+ ACE_INLINE CORBA::Boolean
+ operator<< (
+ TAO_OutputCDR &strm,
+- const IR::HomeDef_ptr _tao_objref
++ const IR_HomeDef_ptr _tao_objref
+ )
+ {
+ CORBA::Object_ptr _tao_corba_obj = _tao_objref;
+@@ -23447,7 +22310,7 @@
+ ACE_INLINE CORBA::Boolean
+ operator>> (
+ TAO_InputCDR &strm,
+- IR::HomeDef_ptr &_tao_objref
++ IR_HomeDef_ptr &_tao_objref
+ )
+ {
+ ACE_TRY_NEW_ENV
+@@ -23457,7 +22320,7 @@
+ return 0;
+ // narrow to the right type
+ _tao_objref =
+- IR::HomeDef::_unchecked_narrow (
++ IR_HomeDef::_unchecked_narrow (
+ obj.in (),
+ ACE_TRY_ENV
+ );
+@@ -23472,7 +22335,7 @@
+ return 0;
+ }
+
+-ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR::HomeDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const IR_HomeDescription &_tao_aggregate)
+ {
+ if (
+ (strm << _tao_aggregate.name.in ()) &&
+@@ -23494,7 +22357,7 @@
+
+ }
+
+-ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR::HomeDescription &_tao_aggregate)
++ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, IR_HomeDescription &_tao_aggregate)
+ {
+ if (
+ (strm >> _tao_aggregate.name.out ()) &&
diff --git a/TAO/tao/ifrfwd.h b/TAO/tao/ifrfwd.h
index 6124799f184..3e8a50f20d2 100644
--- a/TAO/tao/ifrfwd.h
+++ b/TAO/tao/ifrfwd.h
@@ -43,6 +43,8 @@
#endif /* _MSC_VER */
// Forward declarations of some data types are needed.
+enum IR_DefinitionKind;
+
class IR_Contained;
class IR_Contained_var;
class IR_Contained_out;
@@ -318,10 +320,16 @@ class IR_AttributeDef_var;
class IR_AttributeDef_out;
typedef IR_AttributeDef *IR_AttributeDef_ptr;
+enum IR_AttributeMode;
+
struct IR_AttributeDescription;
class IR_AttributeDescription_var;
class IR_AttributeDescription_out;
+enum IR_PrimitiveKind;
+
+enum IR_ParameterMode;
+
struct IR_ParameterDescription;
class IR_ParameterDescription_var;
class IR_ParameterDescription_out;
@@ -339,6 +347,8 @@ class IR_OperationDef_var;
class IR_OperationDef_out;
typedef IR_OperationDef *IR_OperationDef_ptr;
+enum IR_OperationMode;
+
struct IR_OperationDescription;
class IR_OperationDescription_var;
class IR_OperationDescription_out;
@@ -450,46 +460,11 @@ TAO_NAMESPACE IR
typedef CORBA::String_out ContextIdentifier_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdentifier;
- enum DefinitionKind
- {
- dk_none,
- dk_all,
- dk_Attribute,
- dk_Constant,
- dk_Exception,
- dk_Interface,
- dk_Module,
- dk_Operation,
- dk_Typedef,
- dk_Alias,
- dk_Struct,
- dk_Union,
- dk_Enum,
- dk_Primitive,
- dk_String,
- dk_Sequence,
- dk_Array,
- dk_Repository,
- dk_Wstring,
- dk_Fixed,
- dk_Value,
- dk_ValueBox,
- dk_ValueMember,
- dk_Native,
- dk_Component,
- dk_Home,
- dk_Factory,
- dk_Finder,
- dk_PrimaryKey,
- dk_Emits,
- dk_Publishes,
- dk_Consumes,
- dk_Provides,
- dk_Uses
- };
- typedef DefinitionKind &DefinitionKind_out;
+ typedef IR_DefinitionKind DefinitionKind;
+ typedef IR_DefinitionKind &DefinitionKind_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DefinitionKind;
+
typedef IR_Contained Contained;
typedef IR_Contained *Contained_ptr;
typedef IR_Contained_var Contained_var;
@@ -819,12 +794,8 @@ TAO_NAMESPACE IR
typedef IR_ExcDescriptionSeq_out ExcDescriptionSeq_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
- enum AttributeMode
- {
- ATTR_NORMAL,
- ATTR_READONLY
- };
- typedef AttributeMode &AttributeMode_out;
+ typedef IR_AttributeMode AttributeMode;
+ typedef IR_AttributeMode &AttributeMode_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeMode;
typedef IR_AttributeDef AttributeDef;
@@ -838,49 +809,12 @@ TAO_NAMESPACE IR
typedef IR_AttributeDescription_out AttributeDescription_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDescription;
- enum PrimitiveKind
- {
- pk_null,
- pk_void,
- pk_short,
- pk_long,
- pk_ushort,
- pk_ulong,
- pk_float,
- pk_double,
- pk_boolean,
- pk_char,
- pk_octet,
- pk_any,
- pk_TypeCode,
- pk_Principal,
- pk_string,
- pk_objref,
- pk_longlong,
- pk_ulonglong,
- pk_longdouble,
- pk_wchar,
- pk_wstring,
- pk_value_base
- };
- typedef PrimitiveKind &PrimitiveKind_out;
+ typedef IR_PrimitiveKind PrimitiveKind;
+ typedef IR_PrimitiveKind &PrimitiveKind_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveKind;
- enum OperationMode
- {
- OP_NORMAL,
- OP_ONEWAY
- };
- typedef OperationMode &OperationMode_out;
- TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
-
- enum ParameterMode
- {
- PARAM_IN,
- PARAM_OUT,
- PARAM_INOUT
- };
- typedef ParameterMode &ParameterMode_out;
+ typedef IR_ParameterMode ParameterMode;
+ typedef IR_ParameterMode &ParameterMode_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
typedef IR_ParameterDescription ParameterDescription;
@@ -904,6 +838,10 @@ TAO_NAMESPACE IR
typedef IR_OperationDef_out OperationDef_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDef;
+ typedef IR_OperationMode OperationMode;
+ typedef IR_OperationMode &OperationMode_out;
+ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
+
typedef IR_OperationDescription OperationDescription;
typedef IR_OperationDescription_var OperationDescription_var;
typedef IR_OperationDescription_out OperationDescription_out;
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index aed263cf512..bc8824c5359 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -878,15 +878,6 @@ enum MCAST_SERVICEID
#define TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT "5000"
#endif /* TAO_DEFAULT_THREAD_PER_CONNECTION_TIMEOUT */
-// By default SMART_PROXIES is disabled.
-# if !defined (TAO_HAS_SMART_PROXIES)
-# define TAO_HAS_SMART_PROXIES 0
-#endif /*TAO_HAS_SMART_PROXIES*/
-
-// SMART PROXIES support is disabled by default.
-// To explicitly enable SMART_PROXIES support uncomment the following
-// #define TAO_HAS_SMART_PROXIES 1
-
// This is the version of the FT_CORBA spec that TAO supports. The
// exact use of this version has not been emphasised. But TAO would
// get TaggedComponents for a group with version number. So, for the
View Lorry Controller Status